Skip to content

Commit

Permalink
Include logBlockHash in trigger and workID (#10476)
Browse files Browse the repository at this point in the history 
* Include logBlockHash in trigger and workID

* update ocr2keepers ref

* update wrappers

* update packer

* fix merge in event provider.go

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* fix reorg protection for log upkeeps in pipeline and recoverer

* fix test

* fix test

* update comment

* update dependency

* fix test

* fix tests

* fix another test

* fix test

* update log struct

* update bytecode

* update ocr2keepers to tag
  • Loading branch information
@infiloop2
infiloop2 authored Sep 7, 2023
1 parent f3ff316 commit c325f96
Show file tree
Hide file tree
Showing 26 changed files with 224 additions and 89 deletions.
3 changes: 2 additions & 1 deletion contracts/src/v0.8/dev/automation/2_1/KeeperRegistryBase2_1.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
* not necessarily the block number that the log was emitted in!!!!
*/
struct LogTrigger {
bytes32 logBlockHash;
bytes32 txHash;
uint32 logIndex;
uint32 blockNum;
Expand Down Expand Up @@ -794,7 +795,7 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
UpkeepTransmitInfo memory transmitInfo
) internal returns (bool, bytes32) {
LogTrigger memory trigger = abi.decode(rawTrigger, (LogTrigger));
bytes32 dedupID = keccak256(abi.encodePacked(upkeepId, trigger.txHash, trigger.logIndex));
bytes32 dedupID = keccak256(abi.encodePacked(upkeepId, trigger.logBlockHash, trigger.txHash, trigger.logIndex));
if (
(trigger.blockHash != bytes32("") && _blockHash(trigger.blockNum) != trigger.blockHash) ||
trigger.blockNum >= _blockNum()
Expand Down
12 changes: 8 additions & 4 deletions contracts/test/v0.8/automation/KeeperRegistry2_1.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('KeeperRegistry2_1 - Frozen [ @skip-coverage ]', () => {
it('has not changed', () => {
assert.equal(
ethers.utils.id(KeeperRegistryFactory.bytecode),
'0xd94f351a1cd64aa81dd7238301f680f4bfc2a0f84c4b5451525f3f879488f033',
'0xd8dfe20e746039e8420349326becc0a15dcd8fa3cd6aa0924d214328a7c45206',
'KeeperRegistry bytecode has changed',
)
assert.equal(
Expand Down Expand Up @@ -741,6 +741,7 @@ describe('KeeperRegistry2_1', () => {
performData?: string
checkBlockNum?: number
checkBlockHash?: string
logBlockHash?: BytesLike
txHash?: BytesLike
logIndex?: number
timestamp?: number
Expand All @@ -763,6 +764,7 @@ describe('KeeperRegistry2_1', () => {
checkBlockHash: latestBlock.hash,
logIndex: 0,
txHash: undefined, // assigned uniquely below
logBlockHash: undefined, // assigned uniquely below
timestamp: now(),
gasLimit: undefined,
gasPrice: undefined,
Expand All @@ -780,6 +782,7 @@ describe('KeeperRegistry2_1', () => {
break
case Trigger.LOG:
trigger = encodeLogTrigger({
logBlockHash: config.logBlockHash || ethers.utils.randomBytes(32),
txHash: config.txHash || ethers.utils.randomBytes(32),
logIndex: config.logIndex,
blockNum: config.checkBlockNum,
Expand Down Expand Up @@ -1238,18 +1241,19 @@ describe('KeeperRegistry2_1', () => {
})

it('handles duplicate log triggers', async () => {
const logBlockHash = ethers.utils.randomBytes(32)
const txHash = ethers.utils.randomBytes(32)
const logIndex = 0
const expectedDedupKey = ethers.utils.solidityKeccak256(
['uint256', 'bytes32', 'uint32'],
[logUpkeepId, txHash, logIndex],
['uint256', 'bytes32', 'bytes32', 'uint32'],
[logUpkeepId, logBlockHash, txHash, logIndex],
)
assert.isFalse(await registry.hasDedupKey(expectedDedupKey))
const tx = await getTransmitTx(
registry,
keeper1,
[logUpkeepId, logUpkeepId],
{ txHash, logIndex }, // will result in the same dedup key
{ logBlockHash, txHash, logIndex }, // will result in the same dedup key
)
const receipt = await tx.wait()
const staleUpkeepReport = parseStaleUpkeepReportLogs(receipt)
Expand Down
13 changes: 7 additions & 6 deletions core/gethwrappers/generated/automation_utils_2_1/automation_utils_2_1.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/gethwrappers/generated/keeper_registry_wrapper_2_1/keeper_registry_wrapper_2_1.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authorized_receiver: ../../contracts/solc/v0.7/AuthorizedReceiver.abi ../../cont
automation_consumer_benchmark: ../../contracts/solc/v0.8.16/AutomationConsumerBenchmark.abi ../../contracts/solc/v0.8.16/AutomationConsumerBenchmark.bin f52c76f1aaed4be541d82d97189d70f5aa027fc9838037dd7a7d21910c8c488e
automation_forwarder_logic: ../../contracts/solc/v0.8.16/AutomationForwarderLogic.abi ../../contracts/solc/v0.8.16/AutomationForwarderLogic.bin 15ae0c367297955fdab4b552dbb10e1f2be80a8fde0efec4a4d398693e9d72b5
automation_registrar_wrapper2_1: ../../contracts/solc/v0.8.16/AutomationRegistrar2_1.abi ../../contracts/solc/v0.8.16/AutomationRegistrar2_1.bin eb06d853aab39d3196c593b03e555851cbe8386e0fe54a74c2479f62d14b3c42
automation_utils_2_1: ../../contracts/solc/v0.8.16/AutomationUtils2_1.abi ../../contracts/solc/v0.8.16/AutomationUtils2_1.bin 0b3006a2a1588916d22bf1ae5429bd3bce24a58904588d5ed3fe1026d64616cf
automation_utils_2_1: ../../contracts/solc/v0.8.16/AutomationUtils2_1.abi ../../contracts/solc/v0.8.16/AutomationUtils2_1.bin f7e675941621528e03fab1487e38a2d9ecef94694035fb51c1bc16561f3d2cea
batch_blockhash_store: ../../contracts/solc/v0.8.6/BatchBlockhashStore.abi ../../contracts/solc/v0.8.6/BatchBlockhashStore.bin c5ab26709a01050402615659403f32d5cd1b85f3ad6bb6bfe021692f4233cf19
batch_vrf_coordinator_v2: ../../contracts/solc/v0.8.6/BatchVRFCoordinatorV2.abi ../../contracts/solc/v0.8.6/BatchVRFCoordinatorV2.bin d0a54963260d8c1f1bbd984b758285e6027cfb5a7e42701bcb562ab123219332
batch_vrf_coordinator_v2plus: ../../contracts/solc/v0.8.6/BatchVRFCoordinatorV2Plus.abi ../../contracts/solc/v0.8.6/BatchVRFCoordinatorV2Plus.bin 7bb76ae241cf1b37b41920830b836cb99f1ad33efd7435ca2398ff6cd2fe5d48
Expand Down Expand Up @@ -36,7 +36,7 @@ keeper_registry_wrapper1_1_mock: ../../contracts/solc/v0.7/KeeperRegistry1_1Mock
keeper_registry_wrapper1_2: ../../contracts/solc/v0.8.6/KeeperRegistry1_2.abi ../../contracts/solc/v0.8.6/KeeperRegistry1_2.bin c08f903e7ecbdf89bbfea32c6dd334d3bf908ac809ebf63545890798a5f7a4a7
keeper_registry_wrapper1_3: ../../contracts/solc/v0.8.6/KeeperRegistry1_3.abi ../../contracts/solc/v0.8.6/KeeperRegistry1_3.bin 5e1414eacbc1880b7349a4f253b7eca176f7f6300ef3cd834c493ce795a17e25
keeper_registry_wrapper2_0: ../../contracts/solc/v0.8.6/KeeperRegistry2_0.abi ../../contracts/solc/v0.8.6/KeeperRegistry2_0.bin c32dea7d5ef66b7c58ddc84ddf69aa44df1b3ae8601fbc271c95be4ff5853056
keeper_registry_wrapper_2_1: ../../contracts/solc/v0.8.16/KeeperRegistry2_1.abi ../../contracts/solc/v0.8.16/KeeperRegistry2_1.bin 6406f37de79d3d2efa86fb961e1462b62a5a2fff4aeb408bbdb4bc7272d91638
keeper_registry_wrapper_2_1: ../../contracts/solc/v0.8.16/KeeperRegistry2_1.abi ../../contracts/solc/v0.8.16/KeeperRegistry2_1.bin 604e4a0cd980c713929b523b999462a3aa0ed06f96ff563a4c8566cf59c8445b
keepers_vrf_consumer: ../../contracts/solc/v0.8.6/KeepersVRFConsumer.abi ../../contracts/solc/v0.8.6/KeepersVRFConsumer.bin fa75572e689c9e84705c63e8dbe1b7b8aa1a8fe82d66356c4873d024bb9166e8
log_emitter: ../../contracts/solc/v0.8.19/LogEmitter.abi ../../contracts/solc/v0.8.19/LogEmitter.bin 244ba13730c036de0b02beef4e3d9c9a96946ce353c27f366baecc7f5be5a6fd
log_triggered_feed_lookup_wrapper: ../../contracts/solc/v0.8.16/LogTriggeredStreamsLookup.abi ../../contracts/solc/v0.8.16/LogTriggeredStreamsLookup.bin b3c01ce82842c6be4aceba218c78c1e4958803eab3abe5b0cdbe6fb0464c4a5a
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/shopspring/decimal v1.3.1
github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
github.com/smartcontractkit/libocr v0.0.0-20230816220705-665e93233ae5
github.com/smartcontractkit/ocr2keepers v0.7.20
github.com/smartcontractkit/ocr2keepers v0.7.21
github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb
github.com/spf13/cobra v1.6.1
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1389,8 +1389,8 @@ github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJ
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
github.com/smartcontractkit/libocr v0.0.0-20230816220705-665e93233ae5 h1:rzbqGoScs9VHGnyCKF7AoQEuUfwJnzcKmGIfaczeanA=
github.com/smartcontractkit/libocr v0.0.0-20230816220705-665e93233ae5/go.mod h1:2lyRkw/qLQgUWlrWWmq5nj0y90rWeO6Y+v+fCakRgb0=
github.com/smartcontractkit/ocr2keepers v0.7.20 h1:1FOeJ0p4mWHqJiX01v/J2S1C1LhU8iqJM1hDcD38aZU=
github.com/smartcontractkit/ocr2keepers v0.7.20/go.mod h1:AjcIEKeNnU7NRlvnuMCTjBIQ1kpW0YHhlFdeDa/3hs0=
github.com/smartcontractkit/ocr2keepers v0.7.21 h1:64CNFoUYVpoJqhQ39WTPIEKVKB5Z/wderX0pIsv/tbA=
github.com/smartcontractkit/ocr2keepers v0.7.21/go.mod h1:AjcIEKeNnU7NRlvnuMCTjBIQ1kpW0YHhlFdeDa/3hs0=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 h1:NwC3SOc25noBTe1KUQjt45fyTIuInhoE2UfgcHAdihM=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687/go.mod h1:YYZq52t4wcHoMQeITksYsorD+tZcOyuVU5+lvot3VFM=
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A=
Expand Down
16 changes: 9 additions & 7 deletions core/services/ocr2/plugins/ocr2keeper/evm21/core/payload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ func TestWorkID(t *testing.T) {
BlockNumber: 123,
BlockHash: common.HexToHash("0xabcdef"),
LogTriggerExtension: &ocr2keepers.LogTriggerExtension{
Index: 1,
TxHash: common.HexToHash("0x12345"),
Index: 1,
TxHash: common.HexToHash("0x12345"),
BlockHash: common.HexToHash("0xabcdef"),
},
},
expected: "db0e245ff4e7551d6c862d9a0eb5466624e1439ad1db262a7a3d6137d892d0a3",
expected: "aaa208331dfafff7a681e3358d082a2e78633dd05c8fb2817c391888cadb2912",
},
{
name: "happy path example from an actual tx",
Expand All @@ -53,11 +54,12 @@ func TestWorkID(t *testing.T) {
BlockNumber: 39344455,
BlockHash: common.HexToHash("0xb41258d18cd44ebf7a0d70de011f2bc4a67c9b68e8b6dada864045d8543bb020"),
LogTriggerExtension: &ocr2keepers.LogTriggerExtension{
Index: 41,
TxHash: common.HexToHash("0x44079b1b33aff337dbf17b9e12c5724ecab979c50c8201a9814a488ff3e22384"),
Index: 41,
TxHash: common.HexToHash("0x44079b1b33aff337dbf17b9e12c5724ecab979c50c8201a9814a488ff3e22384"),
BlockHash: common.HexToHash("0xb41258d18cd44ebf7a0d70de011f2bc4a67c9b68e8b6dada864045d8543bb020"),
},
},
expected: "cdb4cfd9b4855b28d243d099c41b832da6b2d99dda3e7d09b900899afd09328f",
expected: "ef1b6acac8aa3682a8a08f666a13cfa165f7e811a16ea9fa0817f437fc4d110d",
},
{
name: "empty upkeepID",
Expand Down Expand Up @@ -124,7 +126,7 @@ func TestNewUpkeepPayload(t *testing.T) {
},
},
check: []byte("check-data-111"),
workID: "d2fc1c0d626b480a4180f30b89142ae727c85e0b4dc0a82645bcef8062ff932a",
workID: "d8e7c8907a0b60b637ce71ff4f757edf076e270d52c51f6e4d46a3b0696e0a39",
},
}

Expand Down
10 changes: 6 additions & 4 deletions core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ func PackTrigger(id *big.Int, trig triggerWrapper) ([]byte, error) {
trigger, err = utilsABI.Pack("_conditionalTrigger", &trig)
case ocr2keepers.LogTrigger:
logTrig := automation_utils_2_1.KeeperRegistryBase21LogTrigger{
BlockNum: trig.BlockNum,
BlockHash: trig.BlockHash,
LogIndex: trig.LogIndex,
TxHash: trig.TxHash,
BlockNum: trig.BlockNum,
BlockHash: trig.BlockHash,
LogBlockHash: trig.LogBlockHash,
LogIndex: trig.LogIndex,
TxHash: trig.TxHash,
}
trigger, err = utilsABI.Pack("_logTrigger", &logTrig)
default:
Expand Down Expand Up @@ -98,6 +99,7 @@ func UnpackTrigger(id *big.Int, raw []byte) (triggerWrapper, error) {
}
copy(triggerW.BlockHash[:], converted.BlockHash[:])
copy(triggerW.TxHash[:], converted.TxHash[:])
copy(triggerW.LogBlockHash[:], converted.LogBlockHash[:])
return triggerW, nil
default:
return triggerWrapper{}, fmt.Errorf("unknown trigger type: %d", upkeepType)
Expand Down
11 changes: 6 additions & 5 deletions core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ func TestPackUnpackTrigger(t *testing.T) {
"happy flow log trigger",
append([]byte{1}, common.LeftPadBytes([]byte{1}, 15)...),
triggerWrapper{
BlockNum: 1,
BlockHash: common.HexToHash("0x01111111"),
LogIndex: 1,
TxHash: common.HexToHash("0x01111111"),
BlockNum: 1,
BlockHash: common.HexToHash("0x01111111"),
LogIndex: 1,
TxHash: common.HexToHash("0x01111111"),
LogBlockHash: common.HexToHash("0x01111abc"),
},
func() []byte {
b, _ := hexutil.Decode("0x0000000000000000000000000000000000000000000000000000000001111111000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000001111111")
b, _ := hexutil.Decode("0x0000000000000000000000000000000000000000000000000000000001111abc0000000000000000000000000000000000000000000000000000000001111111000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000001111111")
return b
}(),
nil,
Expand Down
2 changes: 2 additions & 0 deletions core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func (e reportEncoder) Encode(results ...ocr2keepers.CheckResult) ([]byte, error
case ocr2keepers.LogTrigger:
triggerW.TxHash = result.Trigger.LogTriggerExtension.TxHash
triggerW.LogIndex = result.Trigger.LogTriggerExtension.Index
triggerW.LogBlockHash = result.Trigger.LogTriggerExtension.BlockHash
default:
// no special handling here for conditional triggers
}
Expand Down Expand Up @@ -110,6 +111,7 @@ func (e reportEncoder) Extract(raw []byte) ([]ocr2keepers.ReportedUpkeep, error)
trigger.LogTriggerExtension = &ocr2keepers.LogTriggerExtension{}
trigger.LogTriggerExtension.TxHash = triggerW.TxHash
trigger.LogTriggerExtension.Index = triggerW.LogIndex
trigger.LogTriggerExtension.BlockHash = triggerW.LogBlockHash
default:
}
workID := core.UpkeepWorkID(*id, trigger)
Expand Down
11 changes: 6 additions & 5 deletions core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestReportEncoder_EncodeExtract(t *testing.T) {
[]ocr2keepers.CheckResult{
newResult(1, 1, core.GenUpkeepID(ocr2keepers.LogTrigger, "123"), 1, 1),
},
704,
736,
1,
1,
nil,
Expand All @@ -49,7 +49,7 @@ func TestReportEncoder_EncodeExtract(t *testing.T) {
newResult(1, 1, core.GenUpkeepID(ocr2keepers.ConditionTrigger, "20"), 1, 1),
newResult(1, 1, core.GenUpkeepID(ocr2keepers.ConditionTrigger, "30"), 1, 1),
},
1280,
1312,
3,
3,
nil,
Expand All @@ -61,7 +61,7 @@ func TestReportEncoder_EncodeExtract(t *testing.T) {
newResult(1, 1, core.GenUpkeepID(ocr2keepers.ConditionTrigger, "20"), 1, 1),
newResult(1, 1, core.GenUpkeepID(ocr2keepers.LogTrigger, "10"), 1, 1),
},
1280,
1312,
1000,
2000,
nil,
Expand Down Expand Up @@ -110,8 +110,9 @@ func newResult(block int64, checkBlock ocr2keepers.BlockNumber, id ocr2keepers.U

if tp == ocr2keepers.LogTrigger {
trig.LogTriggerExtension = &ocr2keepers.LogTriggerExtension{
Index: 1,
TxHash: common.HexToHash("0x1234567890123456789012345678901234567890123456789012345678901234"),
Index: 1,
TxHash: common.HexToHash("0x1234567890123456789012345678901234567890123456789012345678901234"),
BlockHash: common.HexToHash("0xaaaaaaaa90123456789012345678901234567890123456789012345678901234"),
}
}

Expand Down
1 change: 1 addition & 0 deletions core/services/ocr2/plugins/ocr2keeper/evm21/encoding/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
UpkeepFailureReasonTxHashNoLongerExists UpkeepFailureReason = 33
UpkeepFailureReasonInvalidRevertDataInput UpkeepFailureReason = 34
UpkeepFailureReasonSimulationFailed UpkeepFailureReason = 35
UpkeepFailureReasonTxHashReorged UpkeepFailureReason = 36

// pipeline execution error
NoPipelineError PipelineExecutionState = 0
Expand Down
2 changes: 1 addition & 1 deletion core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (b fetchedBlock) has(id *big.Int, log logpoller.Log) (bool, int) {
continue
}
upkeepLogs++
if l.log.BlockNumber == log.BlockNumber && l.log.TxHash == log.TxHash && l.log.LogIndex == log.LogIndex {
if l.log.BlockHash == log.BlockHash && l.log.TxHash == log.TxHash && l.log.LogIndex == log.LogIndex {
return true, upkeepLogs
}
}
Expand Down
36 changes: 18 additions & 18 deletions core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,10 @@ func TestLogEventBuffer_FetchedBlock_Sort(t *testing.T) {
},
},
beforeSort: []string{
"000000000000000000000000000000000000000000000000000000000000000100000000",
"0000000000000000000000000000000000000000000000000000000000000111000000000000000000000000000000000000000000000000000000000000000100000000",
},
afterSort: []string{
"000000000000000000000000000000000000000000000000000000000000000100000000",
"0000000000000000000000000000000000000000000000000000000000000111000000000000000000000000000000000000000000000000000000000000000100000000",
},
},
{
Expand Down Expand Up @@ -742,24 +742,24 @@ func TestLogEventBuffer_FetchedBlock_Sort(t *testing.T) {
},
},
beforeSort: []string{
"00000000000000000000000000000b711bd1103927611ee41152aa8ae27f333000000000",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000000",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000004",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000002",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000005",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000001",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000b711bd1103927611ee41152aa8ae27f333000000000",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000000",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000004",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000002",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000005",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000001",
},
afterSort: []string{
"00000000000000000000000000000b711bd1103927611ee41152aa8ae27f333000000000",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000000",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000001",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000002",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000004",
"00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000005",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000b711bd1103927611ee41152aa8ae27f333000000000",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000000",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000001",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000002",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000003",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000004",
"00000000000000000000000000000a25ebae1099f3fbae2525ebae279f3ae25e00000000000000000000000000000a651bd1109922111ee411525ebae27f3fb600000005",
},
iterations: 10,
},
Expand Down
2 changes: 1 addition & 1 deletion core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/log_packer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (p *logEventsPacker) PackLogData(log logpoller.Log) ([]byte, error) {
}
b, err := p.abi.Pack("_log", &automation_utils_2_1.Log{
Index: big.NewInt(log.LogIndex),
TxIndex: big.NewInt(0), // TODO: Add this to the logpoller
TxIndex: big.NewInt(0), // Exploratory: Add this to the logpoller and pass correct value
TxHash: log.TxHash,
BlockNumber: big.NewInt(log.BlockNumber),
BlockHash: log.BlockHash,
Expand Down
Loading

0 comments on commit c325f96

Please sign in to comment.