From 4d47d4f3e74a6c01c1f8d58007790a4c479a5b31 Mon Sep 17 00:00:00 2001
From: Charlie Chen <34498985+ws4charlie@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:54:39 -0600
Subject: [PATCH] fix: cherry-picked fixes, double watched gas price and fix
 btc scheduler (#1693)

* double watched gas price and fix btc scheduler

* update changelog

---------

Co-authored-by: Lucas Bertrand <lucas.bertrand.22@gmail.com>
---
 changelog.md                    | 17 +++++++++++------
 zetaclient/tx.go                |  2 ++
 zetaclient/zetacore_observer.go |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/changelog.md b/changelog.md
index 56f8373f26..b7bb34d3dd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,13 +1,23 @@
 # CHANGELOG
 
 ## Unreleased
+
+* `zetaclientd start` : 2 inputs required from stdin
+
+### Refactor
+
 * [1630](https://github.com/zeta-chain/node/pull/1630) added password prompts for hotkey and tss keyshare in zetaclient
   Starting zetaclient now requires two passwords to be input; one for the hotkey and another for the tss key-share.
-* `zetaclientd start` : 2 inputs required from stdin
 
 ### Fixes
 
+* [1690](https://github.com/zeta-chain/node/issues/1690) - double watched gas prices and fix btc scheduler
 * [1687](https://github.com/zeta-chain/node/pull/1687) - only use EVM supported chains for gas stability pool
+* [1692](https://github.com/zeta-chain/node/pull/1692) - fix get params query for emissions module
+
+### Tests
+
+* [1584](https://github.com/zeta-chain/node/pull/1584) - allow to run E2E tests on any networks
 
 ## Version: v12.2.4
 
@@ -22,11 +32,6 @@
 * [1663](https://github.com/zeta-chain/node/issues/1663) - skip Mumbai empty block if ethclient sanity check fails
 * [1661](https://github.com/zeta-chain/node/issues/1661) - use estimated SegWit tx size for Bitcoin gas fee calculation
 * [1667](https://github.com/zeta-chain/node/issues/1667) - estimate SegWit tx size in uinit of vByte
-* [1692](https://github.com/zeta-chain/node/pull/1692) - fix get params query for emissions module
-
-### Tests
-
-* [1584](https://github.com/zeta-chain/node/pull/1584) - allow to run E2E tests on any networks
 
 ## Version: v12.1.0
 
diff --git a/zetaclient/tx.go b/zetaclient/tx.go
index 491b76d133..f422a3e026 100644
--- a/zetaclient/tx.go
+++ b/zetaclient/tx.go
@@ -51,6 +51,8 @@ func (b *ZetaCoreBridge) WrapMessageWithAuthz(msg sdk.Msg) (sdk.Msg, AuthZSigner
 }
 
 func (b *ZetaCoreBridge) PostGasPrice(chain common.Chain, gasPrice uint64, supply string, blockNum uint64) (string, error) {
+	// double the gas price to avoid gas price spike
+	gasPrice = gasPrice * 2
 	signerAddress := b.keys.GetOperatorAddress().String()
 	msg := types.NewMsgGasPriceVoter(signerAddress, chain.ChainId, gasPrice, supply, blockNum)
 
diff --git a/zetaclient/zetacore_observer.go b/zetaclient/zetacore_observer.go
index 6fae898ece..dbce742826 100644
--- a/zetaclient/zetacore_observer.go
+++ b/zetaclient/zetacore_observer.go
@@ -342,7 +342,7 @@ func (co *CoreObserver) scheduleCctxBTC(
 		}
 		if included || confirmed {
 			co.logger.ZetaChainWatcher.Info().Msgf("scheduleCctxBTC: outtx %s already included; do not schedule keysign", outTxID)
-			return
+			continue
 		}
 
 		// stop if the nonce being processed is higher than the pending nonce