refactor(evm): converted untyped event to typed and cleaned up #2053
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -173,7 +173,10 @@ func WaitForReceipt(s *BackendSuite, txHash gethcommon.Hash) (*big.Int, *gethcom | |
|
|
||
| for { | ||
| receipt, err := s.backend.GetTransactionReceipt(txHash) | ||
| if err != nil { | ||
| return nil, nil | ||
| } | ||
| if receipt != nil { | ||
| return receipt.BlockNumber, &receipt.BlockHash | ||
| } | ||
| select { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |||||
| "math" | ||||||
| "math/big" | ||||||
| "strconv" | ||||||
|
|
||||||
| tmrpcclient "github.com/cometbft/cometbft/rpc/client" | ||||||
| tmrpctypes "github.com/cometbft/cometbft/rpc/core/types" | ||||||
|
|
@@ -334,16 +333,11 @@ | |||||
| if event.Type != msgType { | ||||||
| continue | ||||||
| } | ||||||
| blockBloomEvent, err := evm.EventBlockBloomFromABCIEvent(event) | ||||||
| if err != nil { | ||||||
| continue | ||||||
| } | ||||||
| return gethcore.BytesToBloom(hexutils.HexToBytes(blockBloomEvent.Bloom)), nil | ||||||
| } | ||||||
| return gethcore.Bloom{}, errors.New("block bloom event is not found") | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
|
|
||||||
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -7,7 +7,6 @@ | |||||||||||||
| "math/big" | ||||||||||||||
|
|
||||||||||||||
| errorsmod "cosmossdk.io/errors" | ||||||||||||||
| tmrpcclient "github.com/cometbft/cometbft/rpc/client" | ||||||||||||||
| tmrpctypes "github.com/cometbft/cometbft/rpc/core/types" | ||||||||||||||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||||||||||||||
|
|
@@ -307,7 +306,8 @@ | |||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| // fallback to tendermint tx evmTxIndexer | ||||||||||||||
| query := fmt.Sprintf("%s.%s='%s'", evm.PendingEthereumTxEvent, evm.PendingEthereumTxEventAttrEthHash, hash.Hex()) | ||||||||||||||
|
|
||||||||||||||
| txResult, err := b.queryTendermintTxIndexer(query, func(txs *rpc.ParsedTxs) *rpc.ParsedTx { | ||||||||||||||
| return txs.GetTxByHash(hash) | ||||||||||||||
| }) | ||||||||||||||
|
|
@@ -326,8 +326,9 @@ | |||||||||||||
|
|
||||||||||||||
| // fallback to tendermint tx evmTxIndexer | ||||||||||||||
| query := fmt.Sprintf("tx.height=%d AND %s.%s=%d", | ||||||||||||||
| height, evm.PendingEthereumTxEventTxAttrIndex, | ||||||||||||||
| evm.PendingEthereumTxEventTxAttrIndex, | ||||||||||||||
| index, | ||||||||||||||
|
There was a problem hiding this comment. Incorrect query construction due to misuse of attribute key There is an issue with the query construction where Apply this diff to correct the query: query := fmt.Sprintf("tx.height=%d AND %s.%s=%d",
- height, evm.PendingEthereumTxEventTxAttrIndex,
+ height, evm.PendingEthereumTxEvent,
evm.PendingEthereumTxEventTxAttrIndex,
index,
)This correction ensures that the event type 📝 Committable suggestion
Suggested change
|
||||||||||||||
| ) | ||||||||||||||
| txResult, err := b.queryTendermintTxIndexer(query, func(txs *rpc.ParsedTxs) *rpc.ParsedTx { | ||||||||||||||
| return txs.GetTxByTxIndex(int(index)) // #nosec G701 -- checked for int overflow already | ||||||||||||||
|
|
||||||||||||||
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,8 +8,10 @@ | |||||
| "sort" | ||||||
| "strings" | ||||||
|
|
||||||
| "cosmossdk.io/errors" | ||||||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||||||
| authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" | ||||||
| "github.com/cosmos/gogoproto/proto" | ||||||
| "google.golang.org/grpc/codes" | ||||||
| "google.golang.org/grpc/status" | ||||||
|
|
||||||
|
|
@@ -212,7 +214,7 @@ | |||||
| func AllTxLogsFromEvents(events []abci.Event) ([][]*gethcore.Log, error) { | ||||||
| allLogs := make([][]*gethcore.Log, 0, 4) | ||||||
| for _, event := range events { | ||||||
| if event.Type != proto.MessageName((*evm.EventTxLog)(nil)) { | ||||||
|
There was a problem hiding this comment.
Suggested change
Technically equivalent, but nil pointers look a bit concerning |
||||||
| continue | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -229,7 +231,7 @@ | |||||
| // TxLogsFromEvents parses ethereum logs from cosmos events for specific msg index | ||||||
| func TxLogsFromEvents(events []abci.Event, msgIndex int) ([]*gethcore.Log, error) { | ||||||
| for _, event := range events { | ||||||
| if event.Type != proto.MessageName((*evm.EventTxLog)(nil)) { | ||||||
|
There was a problem hiding this comment.
Suggested change
Technically equivalent, but nil pointers look a bit concerning |
||||||
| continue | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -246,20 +248,19 @@ | |||||
|
|
||||||
| // ParseTxLogsFromEvent parse tx logs from one event | ||||||
| func ParseTxLogsFromEvent(event abci.Event) ([]*gethcore.Log, error) { | ||||||
| eventTxLog, err := evm.EventTxLogFromABCIEvent(event) | ||||||
| if err != nil { | ||||||
| return nil, errors.Wrapf(err, "failed to parse event tx log") | ||||||
| } | ||||||
| var evmLogs []*evm.Log | ||||||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Preallocate slice capacity for efficiency To enhance performance by reducing allocations, preallocate the evmLogs := make([]*evm.Log, 0, len(eventTxLog.TxLogs)) |
||||||
| for _, logString := range eventTxLog.TxLogs { | ||||||
| var evmLog evm.Log | ||||||
| if err = json.Unmarshal([]byte(logString), &evmLog); err != nil { | ||||||
| return nil, errors.Wrapf(err, "failed unmarshal event tx log") | ||||||
|
There was a problem hiding this comment. Correct error message grammar Adjust the error message for grammatical clarity. Change: return nil, errors.Wrapf(err, "failed unmarshal event tx log")to: return nil, errors.Wrapf(err, "failed to unmarshal event tx log") |
||||||
| } | ||||||
| evmLogs = append(evmLogs, &evmLog) | ||||||
| } | ||||||
| return evm.LogsToEthereum(evmLogs), nil | ||||||
| } | ||||||
|
|
||||||
| // ShouldIgnoreGasUsed returns true if the gasUsed in result should be ignored | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
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.
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.
Can you expand on what this comment means?
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.
Wrote a better comment