From 0a451149f74ae6acc1f43e436bebe47a18f06283 Mon Sep 17 00:00:00 2001 From: charliec Date: Fri, 27 Oct 2023 15:55:25 -0500 Subject: [PATCH] skip some more recent garbage outTx trackers --- x/emissions/types/events.pb.go | 4 ++-- zetaclient/evm_client.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x/emissions/types/events.pb.go b/x/emissions/types/events.pb.go index a1a96178cc..201211e96f 100644 --- a/x/emissions/types/events.pb.go +++ b/x/emissions/types/events.pb.go @@ -51,8 +51,8 @@ func (EmissionType) EnumDescriptor() ([]byte, []int) { } type ObserverEmission struct { - EmissionType EmissionType `protobuf:"varint,1,opt,name=emission_type,json=emissionType,proto3,enum=zetachain.zetacore.emissions.EmissionType" json:"emission_type,omitempty"` - ObserverAddress string `protobuf:"bytes,2,opt,name=observer_address,json=observerAddress,proto3" json:"observer_address,omitempty"` + EmissionType EmissionType `protobuf:"varint,1,opt,name=emission_type,json=emissionType,proto3,enum=zetachain.zetacore.emissions.EmissionType" json:"emission_type,omitempty"` + ObserverAddress string `protobuf:"bytes,2,opt,name=observer_address,json=observerAddress,proto3" json:"observer_address,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount"` } diff --git a/zetaclient/evm_client.go b/zetaclient/evm_client.go index d828364f63..eb0ed1341b 100644 --- a/zetaclient/evm_client.go +++ b/zetaclient/evm_client.go @@ -462,9 +462,9 @@ func (ob *EVMChainClient) IsSendOutTxProcessed(sendHash string, nonce uint64, co // The lowest nonce we observe outTx for each chain var lowestOutTxNonceToObserve = map[int64]uint64{ - 5: 70000, // Goerli - 97: 95000, // BSC testnet - 80001: 120000, // Mumbai + 5: 110900, // Goerli + 97: 102200, // BSC testnet + 80001: 153000, // Mumbai } // FIXME: there's a chance that a txhash in OutTxChan may not deliver when Stop() is called @@ -556,7 +556,7 @@ func (ob *EVMChainClient) queryTxByHash(txHash string, nonce uint64) (*ethtypes. receipt, err := ob.EvmClient.TransactionReceipt(ctxt, ethcommon.HexToHash(txHash)) if err != nil { if err != ethereum.NotFound { - logger.Warn().Err(err).Msg("TransactionReceipt/TransactionByHash error") + logger.Warn().Err(err).Msgf("TransactionReceipt/TransactionByHash error, txHash %s", txHash) } return nil, nil, err }