Merge branch 'develop' into avoid-btc-solana-inbound-endless-rescan-o…

…n-invalid-vote-msg

changelog.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Tests
+
+* [3205](https://github.com/zeta-chain/node/issues/3205) - move Bitcoin revert address test to advanced group to avoid upgrade test failure
+
 ## Refactor
 
 * [3170](https://github.com/zeta-chain/node/pull/3170) - revamp TSS package in zetaclient

cmd/zetae2e/local/local.go

@@ -333,12 +333,12 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			e2etests.TestBitcoinStdMemoDepositName,
 			e2etests.TestBitcoinStdMemoDepositAndCallName,
 			e2etests.TestBitcoinStdMemoDepositAndCallRevertName,
-			e2etests.TestBitcoinStdMemoDepositAndCallRevertOtherAddressName,
 			e2etests.TestBitcoinStdMemoInscribedDepositAndCallName,
 			e2etests.TestCrosschainSwapName,
 		}
 		bitcoinDepositTestsAdvanced := []string{
 			e2etests.TestBitcoinDepositAndCallRevertWithDustName,
+			e2etests.TestBitcoinStdMemoDepositAndCallRevertOtherAddressName,
 		}
 		bitcoinWithdrawTests := []string{
 			e2etests.TestBitcoinWithdrawSegWitName,

e2e/e2etests/test_bitcoin_deposit_and_call_revert.go

@@ -1,7 +1,6 @@
 package e2etests
 
 import (
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/node/e2e/runner"
@@ -40,8 +39,8 @@ func TestBitcoinDepositAndCallRevert(r *runner.E2ERunner, args []string) {
 
 	// Check revert tx receiver address and amount
 	receiver, value := r.QueryOutboundReceiverAndAmount(cctx.OutboundParams[1].Hash)
-	assert.Equal(r, r.BTCDeployerAddress.EncodeAddress(), receiver)
-	assert.Positive(r, value)
+	require.Equal(r, r.BTCDeployerAddress.EncodeAddress(), receiver)
+	require.True(r, value > 0)
 
 	r.Logger.Info("Sent %f BTC to TSS with invalid memo, got refund of %d satoshis", amount, value)
 }

e2e/e2etests/test_bitcoin_std_deposit_and_call_revert.go

@@ -1,7 +1,6 @@
 package e2etests
 
 import (
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/node/e2e/runner"
@@ -42,8 +41,8 @@ func TestBitcoinStdMemoDepositAndCallRevert(r *runner.E2ERunner, args []string)
 
 	// Check revert tx receiver address and amount
 	receiver, value := r.QueryOutboundReceiverAndAmount(cctx.OutboundParams[1].Hash)
-	assert.Equal(r, r.BTCDeployerAddress.EncodeAddress(), receiver)
-	assert.Positive(r, value)
+	require.Equal(r, r.BTCDeployerAddress.EncodeAddress(), receiver)
+	require.True(r, value > 0)
 
 	r.Logger.Info("Sent %f BTC to TSS to call non-existing contract, got refund of %d satoshis", amount, value)
 }

e2e/e2etests/test_bitcoin_std_deposit_and_call_revert_other_address.go

@@ -1,7 +1,6 @@
 package e2etests
 
 import (
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/node/e2e/runner"
@@ -46,13 +45,13 @@ func TestBitcoinStdMemoDepositAndCallRevertOtherAddress(r *runner.E2ERunner, arg
 	cctx := utils.WaitCctxRevertedByInboundHash(r.Ctx, r, txHash.String(), r.CctxClient)
 
 	// Make sure inbound sender and revert address are correct
-	assert.Equal(r, cctx.InboundParams.Sender, r.BTCDeployerAddress.EncodeAddress())
-	assert.Equal(r, cctx.GetCurrentOutboundParam().Receiver, revertAddress)
+	require.Equal(r, cctx.InboundParams.Sender, r.BTCDeployerAddress.EncodeAddress())
+	require.Equal(r, cctx.GetCurrentOutboundParam().Receiver, revertAddress)
 
 	// Check revert tx receiver address and amount
 	receiver, value := r.QueryOutboundReceiverAndAmount(cctx.OutboundParams[1].Hash)
-	assert.Equal(r, revertAddress, receiver)
-	assert.Positive(r, value)
+	require.Equal(r, revertAddress, receiver)
+	require.True(r, value > 0)
 
 	r.Logger.Info(
 		"Sent %f BTC to TSS to call non-existing contract, got refund of %d satoshis to other address",