diff --git a/cmd/zetaclientd-supervisor/lib.go b/cmd/zetaclientd-supervisor/lib.go index 4c495dcf1d..0eedce3311 100644 --- a/cmd/zetaclientd-supervisor/lib.go +++ b/cmd/zetaclientd-supervisor/lib.go @@ -207,8 +207,8 @@ func (s *zetaclientdSupervisor) handleTssUpdate(ctx context.Context) { } tss = tssNew - s.logger.Warn(). - Msg(fmt.Sprintf("tss address is updated from %s to %s", tss.TSS.TssPubkey, tssNew.TSS.TssPubkey)) + s.logger.Info(). + Msgf("tss address is updated from %s to %s", tss.TSS.TssPubkey, tssNew.TSS.TssPubkey) time.Sleep(6 * time.Second) s.logger.Info().Msg("restarting zetaclientd to update tss address") s.restartChan <- syscall.SIGHUP @@ -253,7 +253,7 @@ func (s *zetaclientdSupervisor) handleNewTssKeyGeneration(ctx context.Context) { } tssLenCurrent = tssLenUpdated - s.logger.Warn().Msg(fmt.Sprintf("tss list updated from %d to %d", tssLenCurrent, tssLenUpdated)) + s.logger.Info().Msgf("tss list updated from %d to %d", tssLenCurrent, tssLenUpdated) time.Sleep(5 * time.Second) s.logger.Info().Msg("restarting zetaclientd to update tss list") s.restartChan <- syscall.SIGHUP diff --git a/cmd/zetae2e/local/migration.go b/cmd/zetae2e/local/migration.go index 9a28a9d7a7..f50a2cdb6b 100644 --- a/cmd/zetae2e/local/migration.go +++ b/cmd/zetae2e/local/migration.go @@ -62,7 +62,7 @@ func migrationTestRoutine( return fmt.Errorf("migration tests failed: %v", err) } if err := migrationTestRunner.CheckBtcTSSBalance(); err != nil { - migrationTestRunner.Logger.Print("🍾 BTC check error") + return err } migrationTestRunner.Logger.Print("🍾 migration tests completed in %s", time.Since(startTime).String()) diff --git a/e2e/runner/bitcoin.go b/e2e/runner/bitcoin.go index f26640608d..916ce4cf30 100644 --- a/e2e/runner/bitcoin.go +++ b/e2e/runner/bitcoin.go @@ -77,8 +77,6 @@ func (r *E2ERunner) GetTop20UTXOsForTssAddress() ([]btcjson.ListUnspentResult, e return utxos, nil } -// query UTXOs from node - // DepositBTCWithAmount deposits BTC on ZetaChain with a specific amount func (r *E2ERunner) DepositBTCWithAmount(amount float64) *chainhash.Hash { r.Logger.Print("⏳ depositing BTC into ZEVM") diff --git a/e2e/runner/evm.go b/e2e/runner/evm.go index 59ad587ada..88c1e100bf 100644 --- a/e2e/runner/evm.go +++ b/e2e/runner/evm.go @@ -129,8 +129,6 @@ func (r *E2ERunner) DepositEtherWithAmount(testHeader bool, amount *big.Int) eth r.Logger.EVMReceipt(*receipt, "send to TSS") - r.Logger.Print("✅ Ethers deposited into ZEVM") - // due to the high block throughput in localnet, ZetaClient might catch up slowly with the blocks // to optimize block header proof test, this test is directly executed here on the first deposit instead of having a separate test if testHeader { diff --git a/e2e/runner/zeta.go b/e2e/runner/zeta.go index e866f75af1..732104afe1 100644 --- a/e2e/runner/zeta.go +++ b/e2e/runner/zeta.go @@ -179,8 +179,6 @@ func (r *E2ERunner) WithdrawZeta(amount *big.Int, waitReceipt bool) *ethtypes.Tr return tx } -// zetacored tx crosschain remove-outbound-tracker 1337 13 --from=operator --fees=2000000000000000azeta --chain-id=athens_101-1 --yes - // WithdrawEther withdraws Ether from ZetaChain to the ZETA smart contract on EVM func (r *E2ERunner) WithdrawEther(amount *big.Int) *ethtypes.Transaction { // withdraw diff --git a/e2e/utils/zetacore.go b/e2e/utils/zetacore.go index cbd1477211..cbba05de75 100644 --- a/e2e/utils/zetacore.go +++ b/e2e/utils/zetacore.go @@ -18,7 +18,7 @@ type CCTXClient = crosschaintypes.QueryClient const ( FungibleAdminName = "fungibleadmin" - DefaultCctxTimeout = 8 * time.Minute + DefaultCctxTimeout = 4 * time.Minute ) // WaitCctxMinedByInboundHash waits until cctx is mined; returns the cctxIndex (the last one) diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go index a51c3fa927..eb7686b5c2 100644 --- a/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go +++ b/x/crosschain/keeper/cctx_orchestrator_validate_inbound.go @@ -79,7 +79,6 @@ func (k Keeper) CheckMigration(ctx sdk.Context, msg *types.MsgVoteInbound) error return errors.Wrap(types.ErrInvalidAddress, err.Error()) } if ethTssAddress.Hex() == msg.Sender { - ctx.Logger().Info("Sender is a TSS, cannot create CCTX") return types.ErrTssAddress } } else if chains.IsBitcoinChain(chain.ChainId, additionalChains) { diff --git a/zetaclient/chains/bitcoin/observer/outbound.go b/zetaclient/chains/bitcoin/observer/outbound.go index efbc109dcb..0089507844 100644 --- a/zetaclient/chains/bitcoin/observer/outbound.go +++ b/zetaclient/chains/bitcoin/observer/outbound.go @@ -129,7 +129,6 @@ func (ob *Observer) IsOutboundProcessed(cctx *crosschaintypes.CrossChainTx, logg if !included { if !broadcasted { - fmt.Println("IsOutboundProcessed: outbound not broadcasted yet") return false, false, nil } // If the broadcasted outbound is nonce 0, just wait for inclusion and don't schedule more keysign @@ -144,10 +143,8 @@ func (ob *Observer) IsOutboundProcessed(cctx *crosschaintypes.CrossChainTx, logg // Try including this outbound broadcasted by myself txResult, inMempool := ob.checkIncludedTx(cctx, txnHash) if txResult == nil { // check failed, try again next time - fmt.Println("IsOutboundProcessed: txResult is nil, check failed, try again next time") return false, false, nil } else if inMempool { // still in mempool (should avoid unnecessary Tss keysign) - fmt.Println("IsOutboundProcessed: outbound still in mempool") ob.logger.Outbound.Info().Msgf("IsOutboundProcessed: outbound %s is still in mempool", outboundID) return true, false, nil } @@ -157,7 +154,6 @@ func (ob *Observer) IsOutboundProcessed(cctx *crosschaintypes.CrossChainTx, logg // Get tx result again in case it is just included res = ob.getIncludedTx(nonce) if res == nil { - fmt.Println("IsOutboundProcessed: setIncludedTx failed") return false, false, nil } ob.logger.Outbound.Info().Msgf("IsOutboundProcessed: setIncludedTx succeeded for outbound %s", outboundID) @@ -166,7 +162,7 @@ func (ob *Observer) IsOutboundProcessed(cctx *crosschaintypes.CrossChainTx, logg // It's safe to use cctx's amount to post confirmation because it has already been verified in observeOutbound() amountInSat := params.Amount.BigInt() if res.Confirmations < ob.ConfirmationsThreshold(amountInSat) { - fmt.Printf( + ob.logger.Outbound.Debug().Msgf( "IsOutboundProcessed: outbound not confirmed yet %d: %d", res.Confirmations, ob.ConfirmationsThreshold(amountInSat), diff --git a/zetaclient/tss/tss_signer.go b/zetaclient/tss/tss_signer.go index 99f09ad53d..8c6cd10559 100644 --- a/zetaclient/tss/tss_signer.go +++ b/zetaclient/tss/tss_signer.go @@ -248,7 +248,6 @@ func (tss *TSS) Sign( } if ksRes.Status == thorcommon.Fail { - fmt.Println("signing tssPubkey", tssPubkey) log.Warn().Msgf("keysign status FAIL posting blame to core, blaming node(s): %#v", ksRes.Blame.BlameNodes) // post blame data if enabled