certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

node/pkg/ethereum: move up nil check for TransactionReceipt 

This fixes a null pointer dereference for a nil tx.

commit-id:a6a356b8
This commit is contained in:
Leo 2022-05-04 16:24:47 +02:00 committed by Evan Gray
parent 2a863a7ca3
commit 2a83ea406b
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
node/pkg/ethereum/watcher.go
View File

@ -130,7 +130,7 @@ func NewEthWatcher(
unsafeDevMode bool) *Watcher {
var ethIntf common.Ethish
if chainID == vaa.ChainIDCelo && ! unsafeDevMode {
if chainID == vaa.ChainIDCelo && !unsafeDevMode {
// When we are running in mainnet or testnet, we need to use the Celo ethereum library rather than go-ethereum.
// However, in devnet, we currently run the standard ETH node for Celo, so we need to use the standard go-ethereum.
ethIntf = &celo.CeloImpl{NetworkName: networkName}
@ -443,24 +443,6 @@ func (e *Watcher) Run(ctx context.Context) error {
tx, err := e.ethIntf.TransactionReceipt(timeout, pLock.message.TxHash)
cancel()
// This should never happen - if we got this far, it means that logs were emitted,
// which is only possible if the transaction succeeded. We check it anyway just
// in case the EVM implementation is buggy.
if tx.Status != 1 {
logger.Error("transaction receipt with non-success status",
zap.Stringer("tx", pLock.message.TxHash),
zap.Stringer("blockhash", key.BlockHash),
zap.Stringer("emitter_address", key.EmitterAddress),
zap.Uint64("sequence", key.Sequence),
zap.Stringer("current_block", ev.Number),
zap.Stringer("current_blockhash", currentHash),
zap.String("eth_network", e.networkName),
zap.Error(err))
delete(e.pending, key)
ethMessagesOrphaned.WithLabelValues(e.networkName, "tx_failed").Inc()
continue
}
// If the node returns an error after waiting expectedConfirmation blocks,
// it means the chain reorged and the transaction was orphaned. The
// TransactionReceipt call is using the same websocket connection than the
@ -484,6 +466,24 @@ func (e *Watcher) Run(ctx context.Context) error {
continue
}
// This should never happen - if we got this far, it means that logs were emitted,
// which is only possible if the transaction succeeded. We check it anyway just
// in case the EVM implementation is buggy.
if tx.Status != 1 {
logger.Error("transaction receipt with non-success status",
zap.Stringer("tx", pLock.message.TxHash),
zap.Stringer("blockhash", key.BlockHash),
zap.Stringer("emitter_address", key.EmitterAddress),
zap.Uint64("sequence", key.Sequence),
zap.Stringer("current_block", ev.Number),
zap.Stringer("current_blockhash", currentHash),
zap.String("eth_network", e.networkName),
zap.Error(err))
delete(e.pending, key)
ethMessagesOrphaned.WithLabelValues(e.networkName, "tx_failed").Inc()
continue
}
// Any error other than "not found" is likely transient - we retry next block.
if err != nil {
logger.Warn("transaction could not be fetched",