-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
Implement extra args codec #16016
base: solana-offchain-plugin
Are you sure you want to change the base?
Implement extra args codec #16016
Conversation
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
AER Report: CI Coreaer_workflow , commit , Detect Changes , Scheduled Run Frequency , Clean Go Tidy & Generate , Core Tests (go_core_tests) , GolangCI Lint (core/scripts) , Core Tests (go_core_tests_integration) , GolangCI Lint (.) , Core Tests (go_core_ccip_deployment_tests) , test-scripts , GolangCI Lint (integration-tests/load) , Core Tests (go_core_fuzz) , GolangCI Lint (integration-tests) , Core Tests (go_core_race_tests) , GolangCI Lint (deployment) , lint , SonarQube Scan 1. File is not
|
@@ -43,6 +50,61 @@ func decodeExtraArgsV1V2(extraArgs []byte) (gasLimit *big.Int, err error) { | |||
return ifaces[0].(*big.Int), nil | |||
} | |||
|
|||
func decodeExtraArgsSVMV1(extraArgs []byte) (*message_hasher.ClientSVMExtraArgsV1, error) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a method to decode from an EVM source chain right?
EVMExtraArgsKey: gas, | ||
}, nil | ||
|
||
case chainsel.FamilySolana: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The switch on family here is on the source chain selector, meaning this case applies when source was Solana chain.
Thus decoding this requires Solana decoder.
But the implementation is using EVM decoder.
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
case chainsel.FamilyEVM: | ||
gas, err1 := decodeExtraArgsV1V2(extraArgs) | ||
if err1 != nil { | ||
return nil, fmt.Errorf("failed to decode EVM extra data, %w", err) | ||
} | ||
|
||
return map[string]any{ | ||
EVMExtraArgsKey: gas, | ||
}, nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be tempted to do some minor refactoring here so you can write it like this:
case chainsel.FamilyEVM: | |
gas, err1 := decodeExtraArgsV1V2(extraArgs) | |
if err1 != nil { | |
return nil, fmt.Errorf("failed to decode EVM extra data, %w", err) | |
} | |
return map[string]any{ | |
EVMExtraArgsKey: gas, | |
}, nil | |
case chainsel.FamilyEVM: | |
return decodeExtraArgsV1V2(extraArgs) |
Maybe even some moderate refactoring to avoid having SVM code in the EVM package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
decodeExtraArgsV1V2
returns *big.int
. The return type needs to be map[string]any
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The way I understand, the SVMExtraArgsv1 is defined for EVM onchain, and requires abi decoding, which is all EVM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I said there would be minor refactoring.
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
case chainsel.FamilyEVM: | ||
gas, err1 := decodeExtraArgsV1V2(extraArgs) | ||
if err1 != nil { | ||
return nil, fmt.Errorf("failed to decode EVM extra data, %w", err) | ||
} | ||
|
||
return map[string]any{ | ||
EVMExtraArgsKey: gas, | ||
}, nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The way I understand, the SVMExtraArgsv1 is defined for EVM onchain, and requires abi decoding, which is all EVM
|
||
func DecodeExtraArgsToMap(extraArgs []byte) (map[string]any, error) { | ||
outputMap := make(map[string]any) | ||
var args ccip_router.SVMExtraArgs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This type is wrong.
This is used in the Any2SVMRampMessage, where SVM is a target family. The SVMExtraArgs will be provided by source chain, when SVM is the destination.
However this is ccipsolana codec, which should be decoding the message when SVM is the source chain.
The right type here should be AnyExtraArgs, which is used inside SVM2AnyRampMessage, here:
https://github.com/smartcontractkit/chainlink-ccip/blob/6b09016243f66e494499e8bac9947706908d1497/chains/solana/gobindings/ccip_router/types.go#L510
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Although I don't think AnyExtraArgs is the right structure. Instead it should be EVMExtraArgsv1 or EVMExtraArgsv2. But that is something we should talk to onchain folks about.
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
solana.SystemProgramID, | ||
}, | ||
extraArgs := ccip_router.AnyExtraArgs{ | ||
// TODO wait for onchain team fix this AnyExtraArgs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the source chain here is SVM, we won't need these SVM specific fields here, since you will not go from SVM -> SVM.
Atleast not until CCIP supports another SVM chain apart from Solana.
For testing right now, we should be good with just EVM specific fields in this struct.
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
t.Run("decode extra args into map svm", func(t *testing.T) { | ||
key, err := solana.NewRandomPrivateKey() | ||
require.NoError(t, err) | ||
encoded, err := d.contract.EncodeSVMExtraArgsV1(nil, message_hasher.ClientSVMExtraArgsV1{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@prashantkumar1982 This is the failing test I was talking about. By inspecting the encoded bytes, I suspect this EncodeSVMExtraArgsV1
is not working properly.
Flakeguard SummaryRan new or updated tests between View Flaky Detector Details | Compare Changes Found Flaky Tests ❌
ArtifactsFor detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json. |
Quality Gate passedIssues Measures |
Jira
extra args codec for OCR message. Convert []byte into map[string]any format depends on the source chain.