This repository has been archived by the owner on Oct 19, 2024. It is now read-only.
Fix ContractRevert::decode_with_selector #2637
Merged
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
aakoshh
force-pushed
the
fix-contract-revert
branch
from
9dba133
to
4889337
Compare
aakoshh
force-pushed
the
fix-contract-revert
branch
from
914d81d
to
702ed12
Compare
mattsse
approved these changes
Oct 17, 2023
Comment on lines
+38
to
+45
| if selector == String::selector() { | ||
| <Self as AbiDecode>::decode(&data[4..]).ok() | ||
| } else { | ||
| // Try with and without a prefix, just in case. | ||
| <Self as AbiDecode>::decode(data) | ||
| .or_else(|_| <Self as AbiDecode>::decode(&data[4..])) | ||
| .ok() | ||
| } |
There was a problem hiding this comment.
I see, for the string case, we expect that Self is String,
if not we try without prefix and with
There was a problem hiding this comment.
Yes, the String decoder doesn't expect the prefix. I thought everything else did, but some example tests failed without the fallback approach. I don't know why, the tests just timed out waiting for Anvil to start, twice - could be unrelated.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
I tried decoding an error returned by one of our contracts by calling
ContractRevert::decode_with_selectorusing theenumthatAbigengenerates for the errors that the contract can revert with, but it kept turning intoNone. During debugging I noticed that while the selector is correctly accepted, it is not made available to the actual decode functions which try each possible error type, so they all fail trying to decode empty data.Solution
Unless the error data prefix is the one corresponding to the
Stringtype, pass the data to the generatedAbiDecode::decodeas-is, so that it can be inspected by the independent decoders of the types that make up theenum.PR Checklist