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

Init ccipReader e2e tests #1203

Closed
wants to merge 4 commits into from
Closed

Init ccipReader e2e tests #1203

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54defa6
init
dimkouv Jul 17, 2024
2e516fa
add msgsBetweenSeqNums (atm failing) test
dimkouv Jul 18, 2024
93f469b
Bump chainlink-ccip with ccip reader fix
asoliman92 Jul 18, 2024
6b0e1e3
exec state changes
dimkouv Jul 19, 2024
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
1 change: 1 addition & 0 deletions contracts/scripts/native_solc_compile_all_ccip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ compileContract ccip/NonceManager.sol
# Test helpers
compileContract ccip/test/helpers/BurnMintERC677Helper.sol
compileContract ccip/test/helpers/CommitStoreHelper.sol
compileContract ccip/test/helpers/CCIPReaderTester.sol
compileContract ccip/test/helpers/MessageHasher.sol
compileContract ccip/test/helpers/ReportCodec.sol
compileContract ccip/test/helpers/receivers/MaybeRevertMessageReceiver.sol
Expand Down
39 changes: 39 additions & 0 deletions contracts/src/v0.8/ccip/test/helpers/CCIPReaderTester.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.24;

contract CCIPReaderTester {
struct SourceChainConfig {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: we can use the struct directly:

import {EVM2EVMMultiOffRamp} from "../../offRamp/EVM2EVMMultiOffRamp.sol";

Usage:

EVM2EVMMultiOffRamp.SourceChainConfig

bool isEnabled;
uint64 minSeqNr;
bytes onRamp;
}

struct EVM2AnyRampMessage {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: we can use the structs directly, they are already defined:

import {Internal} from "../../libraries/Internal.sol";

Would it cause issues off-chain if we use the full EVM2AnyRampMessage struct? (for the header - the struct is exactly as you've defined it in L16-22 so we can definitely de-dupe it)

RampMessageHeader header;
address sender;
}

struct RampMessageHeader {
bytes32 messageId;
uint64 sourceChainSelector;
uint64 destChainSelector;
uint64 sequenceNumber;
uint64 nonce;
}

mapping(uint64 sourceChainSelector => SourceChainConfig sourceChainConfig) internal s_sourceChainConfigs;

function getSourceChainConfig(uint64 sourceChainSelector) external view returns (SourceChainConfig memory) {
return s_sourceChainConfigs[sourceChainSelector];
}

function setSourceChainConfig(uint64 sourceChainSelector, SourceChainConfig memory sourceChainConfig) external {
s_sourceChainConfigs[sourceChainSelector] = sourceChainConfig;
}

event CCIPSendRequested(uint64 indexed destChainSelector, EVM2AnyRampMessage message);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: I think you might also be able to use the event directly without re-defining it: EVM2EVMMultiOffRamp.CCIPSendRequested

Though this might be limited to test files


function EmitCCIPSendRequested(uint64 destChainSelector, EVM2AnyRampMessage memory message) external {
emit CCIPSendRequested(destChainSelector, message);
}
}
222 changes: 222 additions & 0 deletions core/gethwrappers/ccip/generated/ccip_reader_test/ccip_reader_test.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