Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

swap txIndex for timestamp #10720

Merged
merged 2 commits into from
Sep 20, 2023
Merged

swap txIndex for timestamp #10720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a31b6a
swap txIndex for timestamp
RyanRHall Sep 18, 2023
5dfe1a5
Merge branch 'release/2.5.1-automation' into 2.5.1-automation-timestamp
infiloop2 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion contracts/src/v0.8/dev/automation/2_1/interfaces/ILogAutomation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions core/gethwrappers/generated/automation_utils_2_1/automation_utils_2_1.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/gethwrappers/generated/i_log_automation/i_log_automation.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading