This repository has been archived by the owner on Oct 19, 2024. It is now read-only.
fix(middleware): use signer chain when tx is None #1377
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
gakonst
suggested changes
Jun 14, 2022
ethers-middleware/src/signer.rs
Outdated
| @@ -131,12 +131,12 @@ where | |||
| // compare chain_id and use signer's chain_id if the tranasaction's chain_id is None, | |||
| // return an error if they are not consistent | |||
| let chain_id = self.signer.chain_id(); | |||
| let mut tx = tx.clone(); | |||
There was a problem hiding this comment.
do we need to clone? let's just make mut tx instead in the function declaration?
There was a problem hiding this comment.
oh right, yeah we can do that, that makes more sense
| @@ -382,6 +382,42 @@ mod tests { | |||
| assert_eq!(tx, expected_rlp); | |||
| } | |||
|
|
|||
| #[tokio::test] | |||
Rjected
force-pushed
the
fix-tx-chainid-scope
branch
from
2cadbad to
7d03827
Compare
gakonst
approved these changes
Jun 14, 2022
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
The previous behavior never changes the tx chain id if it is
None, since the tx is cloned inside the match statement.Solution
Move the tx clone outside the match statement.
Adds a test setting the tx chain id to
None, with a1337chain id on the signer, ensuring that the transaction encoding and signature are changed properly.PR Checklist