feat: CCIP-1451 Offramp gasExecution data in event #1297
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
defistar
requested review from
makramkd,
elatoskinas,
RayXpub and
a team
as code owners
LCOV of commit
|
RensR
reviewed
Aug 15, 2024
| @@ -464,8 +466,13 @@ contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base { | |||
| } | |||
| } | |||
|
|
|||
| uint256 gasUsed; | |||
| unchecked { | |||
RensR
reviewed
Aug 15, 2024
| @@ -27,6 +27,8 @@ import {MaybeRevertMessageReceiver} from "../helpers/receivers/MaybeRevertMessag | |||
| import {MockCommitStore} from "../mocks/MockCommitStore.sol"; | |||
| import {MultiOCR3BaseSetup} from "../ocr/MultiOCR3BaseSetup.t.sol"; | |||
| import {PriceRegistrySetup} from "../priceRegistry/PriceRegistry.t.sol"; | |||
| import {Vm} from "forge-std/Test.sol"; | |||
| import "forge-std/console.sol"; | |||
There was a problem hiding this comment.
We only allow explicit imports
There was a problem hiding this comment.
console logging import removed
RensR
reviewed
Aug 15, 2024
| @@ -489,4 +491,15 @@ contract EVM2EVMMultiOffRampSetup is TokenSetup, PriceRegistrySetup, MultiOCR3Ba | |||
| vm.startPrank(s_validTransmitters[0]); | |||
| s_offRamp.execute(reportContext, abi.encode(reports)); | |||
| } | |||
|
|
|||
| function printExecutionStateChangedEventLogs() public { | |||
There was a problem hiding this comment.
why do we need this? Could you rework this function to assert on all things except gas and use it instead of the expectEmit with hard coded values
There was a problem hiding this comment.
+1 on this, hard coded values will be difficult to maintain. We can maybe have 1 or 2 tests using them and ignore the field for the rest, wdyt?
There was a problem hiding this comment.
@RensR this is helper function to extract the Execution event from eventLogs
There was a problem hiding this comment.
assertion function added
…ertion for EVM2EVMMultiOffRamp test
defistar
force-pushed
the
feature/CCIP-1451-OffRamp-Execution-Emit-GasUsed
branch
from
26bf845 to
c2905b6
Compare
|
defistar
added a commit
that referenced
this pull request
Aug 19, 2024
#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: #1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>
asoliman92
pushed a commit
to smartcontractkit/chainlink
that referenced
this pull request
Aug 27, 2024
#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: smartcontractkit/ccip#1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>
asoliman92
pushed a commit
to smartcontractkit/chainlink
that referenced
this pull request
Aug 28, 2024
#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: smartcontractkit/ccip#1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>
asoliman92
pushed a commit
to smartcontractkit/chainlink
that referenced
this pull request
Aug 28, 2024
#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: smartcontractkit/ccip#1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>
asoliman92
pushed a commit
to smartcontractkit/chainlink
that referenced
this pull request
Aug 28, 2024
#1310) ## Motivation gasUsed for Execution to be emitted along with ExecutionStateChangedEvent ## Solution compute `gasUsed` for execution of a message in EVM2EVMMultiOffRamp this change is applicable to only 1.6 version Test Assertion must be added to assert the event body parameters (excluding the gasUsed as it cant be hardcoded in tests) ** This is extension of the closed PR: smartcontractkit/ccip#1297 got signature verification issue with other PR. so moving all changes over here --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Co-authored-by: Ryan <80392855+RayXpub@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Include execution gas cost in event emission ->
ExecutionStateChangedeventJIRA: https://smartcontract-it.atlassian.net/browse/CCIP-1451
Solution