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

…n-invalid-vote-msg

Makefile

@@ -327,7 +327,7 @@ ifdef UPGRADE_TEST_FROM_SOURCE
 zetanode-upgrade: e2e-images
 	@echo "Building zetanode-upgrade from source"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source \
-		--build-arg OLD_VERSION='release/v21' \
+		--build-arg OLD_VERSION='release/v22' \
 		--build-arg NODE_VERSION=$(NODE_VERSION) \
 		--build-arg NODE_COMMIT=$(NODE_COMMIT)
 		.
@@ -336,7 +336,7 @@ else
 zetanode-upgrade: e2e-images
 	@echo "Building zetanode-upgrade from binaries"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime \
-	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v21.0.0' \
+	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v22.1.1' \
 	--build-arg NODE_VERSION=$(NODE_VERSION) \
 	--build-arg NODE_COMMIT=$(NODE_COMMIT) \
 	.

cmd/zetae2e/local/erc20.go

@@ -37,7 +37,7 @@ func erc20TestRoutine(
 		startTime := time.Now()
 
 		// funding the account
-		txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 10)
+		txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 10000)
 		erc20Runner.WaitForTxReceiptOnEvm(txERC20Send)
 
 		// depositing the necessary tokens on ZetaChain

e2e/e2etests/test_erc20_deposit_refund.go

@@ -2,9 +2,7 @@ package e2etests
 
 import (
 	"errors"
-	"fmt"
 	"math/big"
-	"time"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	ethcommon "github.com/ethereum/go-ethereum/common"
@@ -64,7 +62,9 @@ func TestERC20DepositAndCallRefund(r *runner.E2ERunner, _ []string) {
 	r.Logger.Info("Sending a deposit that should revert with a liquidity pool")
 
 	r.Logger.Info("Creating the liquidity pool USTD/ZETA")
-	err = createZetaERC20LiquidityPool(r)
+	fifty := big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(50))
+	r.AddLiquidityETH(fifty, fifty)
+	r.AddLiquidityERC20(fifty, fifty)
 	require.NoError(r, err)
 
 	r.Logger.Info("Liquidity pool created")
@@ -73,7 +73,7 @@ func TestERC20DepositAndCallRefund(r *runner.E2ERunner, _ []string) {
 	require.NoError(r, err)
 
 	// send the deposit
-	amount = big.NewInt(1e7)
+	amount = big.NewInt(1e10)
 	inboundHash, err = sendInvalidERC20Deposit(r, amount)
 	require.NoError(r, err)
 
@@ -120,43 +120,6 @@ func TestERC20DepositAndCallRefund(r *runner.E2ERunner, _ []string) {
 	r.Logger.Info("\tbalance after refund: %s", erc20BalanceAfterRefund.String())
 }
 
-func createZetaERC20LiquidityPool(r *runner.E2ERunner) error {
-	amount := big.NewInt(1e10)
-	txHash := r.DepositERC20WithAmountAndMessage(r.EVMAddress(), amount, []byte{})
-	utils.WaitCctxMinedByInboundHash(r.Ctx, txHash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
-
-	tx, err := r.ERC20ZRC20.Approve(r.ZEVMAuth, r.UniswapV2RouterAddr, big.NewInt(1e10))
-	if err != nil {
-		return err
-	}
-	receipt := utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
-	if receipt.Status == 0 {
-		return errors.New("approve failed")
-	}
-
-	previousValue := r.ZEVMAuth.Value
-	r.ZEVMAuth.Value = big.NewInt(1e10)
-	tx, err = r.UniswapV2Router.AddLiquidityETH(
-		r.ZEVMAuth,
-		r.ERC20ZRC20Addr,
-		amount,
-		big.NewInt(0),
-		big.NewInt(0),
-		r.EVMAddress(),
-		big.NewInt(time.Now().Add(10*time.Minute).Unix()),
-	)
-	r.ZEVMAuth.Value = previousValue
-	if err != nil {
-		return err
-	}
-	receipt = utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
-	if receipt.Status == 0 {
-		return fmt.Errorf("add liquidity failed")
-	}
-
-	return nil
-}
-
 func sendInvalidERC20Deposit(r *runner.E2ERunner, amount *big.Int) (string, error) {
 	tx, err := r.ERC20.Approve(r.EVMAuth, r.ERC20CustodyAddr, amount)
 	if err != nil {

e2e/runner/evm.go

@@ -60,7 +60,8 @@ func (r *E2ERunner) SendERC20OnEvm(address ethcommon.Address, amountERC20 int64)
 func (r *E2ERunner) DepositERC20() ethcommon.Hash {
 	r.Logger.Print("⏳ depositing ERC20 into ZEVM")
 
-	return r.DepositERC20WithAmountAndMessage(r.EVMAddress(), big.NewInt(1e18), []byte{})
+	oneHundred := big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(100))
+	return r.DepositERC20WithAmountAndMessage(r.EVMAddress(), oneHundred, []byte{})
 }
 
 func (r *E2ERunner) DepositERC20WithAmountAndMessage(to ethcommon.Address, amount *big.Int, msg []byte) ethcommon.Hash {

e2e/runner/liquidity.go

@@ -37,7 +37,9 @@ func (r *E2ERunner) AddLiquidityETH(amountZETA, amountETH *big.Int) {
 	require.NoError(r, err)
 
 	receipt := utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
-	require.EqualValues(r, types.ReceiptStatusSuccessful, receipt.Status, "add liquidity failed")
+	if receipt.Status == types.ReceiptStatusFailed {
+		r.Logger.Error("Add liquidity failed for ZETA/ETH")
+	}
 
 	// get the pair address
 	pairAddress, err := r.UniswapV2Factory.GetPair(&bind.CallOpts{}, r.WZetaAddr, r.ETHZRC20Addr)
@@ -72,7 +74,9 @@ func (r *E2ERunner) AddLiquidityERC20(amountZETA, amountERC20 *big.Int) {
 	require.NoError(r, err)
 
 	receipt := utils.MustWaitForTxReceipt(r.Ctx, r.ZEVMClient, tx, r.Logger, r.ReceiptTimeout)
-	require.EqualValues(r, types.ReceiptStatusSuccessful, receipt.Status, "add liquidity failed")
+	if receipt.Status == types.ReceiptStatusFailed {
+		r.Logger.Error("Add liquidity failed for ZETA/ERC20")
+	}
 
 	// get the pair address
 	pairAddress, err := r.UniswapV2Factory.GetPair(&bind.CallOpts{}, r.WZetaAddr, r.ERC20ZRC20Addr)

e2e/utils/require.go

@@ -16,7 +16,13 @@ func RequireCCTXStatus(
 	expected crosschaintypes.CctxStatus,
 	msgAndArgs ...any,
 ) {
-	msg := fmt.Sprintf("cctx status is not %q cctx index %s", expected.String(), cctx.Index)
+	msg := fmt.Sprintf(
+		"cctx status is not %q cctx index %s, status: %s, error: %s",
+		expected.String(),
+		cctx.Index,
+		cctx.CctxStatus.StatusMessage,
+		cctx.CctxStatus.ErrorMessage,
+	)
 
 	require.NotNil(t, cctx.CctxStatus)
 	require.Equal(t, expected, cctx.CctxStatus.Status, msg+errSuffix(msgAndArgs...))