[action] use correct signer for web3 action #3937
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
dustinxie
requested review from
CoderZhi,
Liuhaai,
envestcc,
millken and
a team
as code owners
|
SonarCloud Quality Gate failed.
|
Codecov Report
@@ Coverage Diff @@
## master #3937 +/- ##
==========================================
+ Coverage 75.38% 76.09% +0.71%
==========================================
Files 303 328 +25
Lines 25923 27968 +2045
==========================================
+ Hits 19541 21283 +1742
- Misses 5360 5588 +228
- Partials 1022 1097 +75
... and 3 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
CoderZhi
reviewed
Oct 15, 2023
Comment on lines
+18
to
+22
| if useLondontSigner { | ||
| signer = types.NewLondonSigner(big.NewInt(int64(chainID))) | ||
| } else { | ||
| signer = types.NewEIP155Signer(big.NewInt(int64(chainID))) | ||
| } |
There was a problem hiding this comment.
create a util function to generate signer
| @@ -13,13 +13,19 @@ import ( | |||
| "golang.org/x/crypto/sha3" | |||
| ) | |||
|
|
|||
| func rlpRawHash(rawTx *types.Transaction, chainID uint32) (hash.Hash256, error) { | |||
| h := types.NewEIP155Signer(big.NewInt(int64(chainID))).Hash(rawTx) | |||
| func rlpRawHash(rawTx *types.Transaction, chainID uint32, useLondontSigner bool) (hash.Hash256, error) { | |||
| return hash.BytesToHash256(h[:]), nil | ||
| } | ||
|
|
||
| func rlpSignedHash(tx *types.Transaction, chainID uint32, sig []byte) (hash.Hash256, error) { | ||
| signedTx, err := reconstructSignedRlpTxFromSig(tx, chainID, sig) | ||
| func rlpSignedHash(tx *types.Transaction, chainID uint32, sig []byte, useLondonSigner bool) (hash.Hash256, error) { |
| @@ -30,7 +36,7 @@ func rlpSignedHash(tx *types.Transaction, chainID uint32, sig []byte) (hash.Hash | |||
| return hash.BytesToHash256(h.Sum(nil)), nil | |||
| } | |||
|
|
|||
| func reconstructSignedRlpTxFromSig(rawTx *types.Transaction, chainID uint32, sig []byte) (*types.Transaction, error) { | |||
| func reconstructSignedRlpTxFromSig(rawTx *types.Transaction, chainID uint32, sig []byte, useLondonSigner bool) (*types.Transaction, error) { | |||
| signature []byte | ||
| srcAddress address.Address | ||
| hash hash.Hash256 | ||
| useLondonSigner bool |
| @@ -39,7 +45,7 @@ func (sealed *SealedEnvelope) envelopeHash() (hash.Hash256, error) { | |||
| if err != nil { | |||
| return hash.ZeroHash256, err | |||
| } | |||
| return rlpRawHash(tx, sealed.evmNetworkID) | |||
| return rlpRawHash(tx, sealed.evmNetworkID, sealed.useLondonSigner) | |||
| @@ -71,7 +77,7 @@ func (sealed *SealedEnvelope) calcHash() (hash.Hash256, error) { | |||
| if err != nil { | |||
| return hash.ZeroHash256, err | |||
| } | |||
| return rlpSignedHash(tx, sealed.evmNetworkID, sealed.Signature()) | |||
| return rlpSignedHash(tx, sealed.evmNetworkID, sealed.Signature(), sealed.useLondonSigner) | |||
| @@ -146,7 +152,7 @@ func (sealed *SealedEnvelope) loadProto(pbAct *iotextypes.Action, evmID uint32) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| if _, err = rlpSignedHash(tx, evmID, pbAct.GetSignature()); err != nil { | |||
| if _, err = rlpSignedHash(tx, evmID, pbAct.GetSignature(), sealed.useLondonSigner); err != nil { | |||
| @@ -30,7 +30,7 @@ func SignedTransfer(recipientAddr string, senderPriKey crypto.PrivateKey, nonce | |||
| SetGasPrice(gasPrice). | |||
| SetGasLimit(gasLimit). | |||
| SetAction(transfer).Build() | |||
| selp, err := Sign(elp, senderPriKey) | |||
| selp, err := Sign(elp, senderPriKey, false) | |||
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.
Description
as title.
Fixes #(issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Checklist: