diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol index 47d3cb91cb8..cb66d9fe803 100644 --- a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol +++ b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol @@ -117,15 +117,7 @@ contract AutomationRegistry2_2 is AutomationRegistryBase2_2, OCR2Abstract, Chain for (uint256 i = 0; i < report.upkeepIds.length; i++) { upkeepTransmitInfo[i].upkeep = s_upkeep[report.upkeepIds[i]]; upkeepTransmitInfo[i].triggerType = _getTriggerType(report.upkeepIds[i]); - upkeepTransmitInfo[i].maxLinkPayment = _getMaxLinkPayment( - hotVars, - upkeepTransmitInfo[i].triggerType, - uint32(report.gasLimits[i]), - report.fastGasWei, - report.linkNative, - l1Fee, - true - ); + (upkeepTransmitInfo[i].earlyChecksPassed, upkeepTransmitInfo[i].dedupID) = _prePerformChecks( report.upkeepIds[i], blocknumber, diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol index d5d6c49bca2..a1ed743e0e0 100644 --- a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol +++ b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol @@ -402,7 +402,6 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner { struct UpkeepTransmitInfo { Upkeep upkeep; bool earlyChecksPassed; - uint96 maxLinkPayment; bool performSuccess; Trigger triggerType; uint256 gasUsed; @@ -636,7 +635,7 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner { uint256 l1CostWei, bool isExecution // Whether this is an actual perform execution or just a simulation ) internal view returns (uint96) { - + uint256 gasOverhead; if (triggerType == Trigger.CONDITION) { gasOverhead = REGISTRY_CONDITIONAL_OVERHEAD; @@ -766,11 +765,6 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner { emit CancelledUpkeepReport(upkeepId, rawTrigger); return (false, dedupID); } - if (transmitInfo.upkeep.balance < transmitInfo.maxLinkPayment) { - // Can happen due to fluctuations in gas / link prices - emit InsufficientFundsUpkeepReport(upkeepId, rawTrigger); - return (false, dedupID); - } return (true, dedupID); }