Merge branch 'release/2.5.1-automation' into bugfix/auto-5628/v2-fixes

smartcontractkit · Sep 21, 2023 · e283e39 · e283e39
2 parents 30a2f1c + 5129a99
commit e283e39
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 22 deletions.
diff --git a/contracts/src/v0.8/dev/automation/2_1/interfaces/ILogAutomation.sol b/contracts/src/v0.8/dev/automation/2_1/interfaces/ILogAutomation.sol
@@ -1,9 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+/**
+ * @member index the index of the log in the block. 0 for the first log
+ * @member timestamp the timestamp of the block containing the log
+ * @member txHash the hash of the transaction containing the log
+ * @member blockNumber the number of the block containing the log
+ * @member blockHash the hash of the block containing the log
+ * @member source the address of the contract that emitted the log
+ * @member topics the indexed topics of the log
+ * @member data the data of the log
+ */
 struct Log {
   uint256 index;
-  uint256 txIndex;
+  uint256 timestamp;
   bytes32 txHash;
   uint256 blockNumber;
   bytes32 blockHash;

diff --git a/contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts b/contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts
@@ -3238,7 +3238,7 @@ describe('KeeperRegistry2_1', () => {
       it('calls checkLog for log-trigger upkeeps', async () => {
         const log: Log = {
           index: 0,
-          txIndex: 0,
+          timestamp: 0,
           txHash: ethers.utils.randomBytes(32),
           blockNumber: 100,
           blockHash: ethers.utils.randomBytes(32),

diff --git a/core/gethwrappers/generated/automation_utils_2_1/automation_utils_2_1.go b/core/gethwrappers/generated/automation_utils_2_1/automation_utils_2_1.go
diff --git a/core/gethwrappers/generated/i_log_automation/i_log_automation.go b/core/gethwrappers/generated/i_log_automation/i_log_automation.go