Merge pull request #3202 from zeta-chain/v23-backports

chore: backport more changes to v23
zeta-chain · Nov 22, 2024 · 734b2e9 · 734b2e9
2 parents bb4b7ee + d86f179
commit 734b2e9
Show file tree

Hide file tree

Showing 14 changed files with 332 additions and 52 deletions.
diff --git a/Makefile b/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) \
 	.

diff --git a/cmd/zetae2e/local/erc20.go b/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

diff --git a/docs/openapi/openapi.html b/docs/openapi/openapi.html
@@ -5,18 +5,18 @@
     <link
       rel="stylesheet"
       type="text/css"
-      href="https://unpkg.com/swagger-ui-dist@4.18.1/swagger-ui.css"
+      href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.18.2/swagger-ui.min.css"
     />
     <link
       rel="icon"
       type="image/png"
-      href="https://unpkg.com/swagger-ui-dist@4.18.1/favicon-16x16.png"
+      href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.18.2/favicon-16x16.png"
     />
   </head>
   <body>
     <div id="swagger-ui"></div>
 
-    <script src="https://unpkg.com/swagger-ui-dist@4.18.1/swagger-ui-bundle.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.18.2/swagger-ui-bundle.min.js"></script>
     <script>
       window.onload = function() {
           window.ui = SwaggerUIBundle({

diff --git a/e2e/e2etests/test_erc20_deposit_refund.go b/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 {

diff --git a/e2e/runner/evm.go b/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 {

diff --git a/e2e/runner/liquidity.go b/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)

diff --git a/e2e/utils/require.go b/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...))

diff --git a/pkg/chains/bitcoin.go b/pkg/chains/bitcoin.go
@@ -13,6 +13,7 @@ var (
 		BitcoinMainnet.ChainId:       &chaincfg.MainNetParams,
 		BitcoinTestnet.ChainId:       &chaincfg.TestNet3Params,
 		BitcoinSignetTestnet.ChainId: &chaincfg.SigNetParams,
+		BitcoinTestnet4.ChainId:      &TestNet4Params,
 	}
 
 	// networkNameToChainID maps the Bitcoin network name to the chain ID
@@ -21,6 +22,7 @@ var (
 		chaincfg.MainNetParams.Name:       BitcoinMainnet.ChainId,
 		chaincfg.TestNet3Params.Name:      BitcoinTestnet.ChainId,
 		chaincfg.SigNetParams.Name:        BitcoinSignetTestnet.ChainId,
+		TestNet4Params.Name:               BitcoinTestnet4.ChainId,
 	}
 )
 

diff --git a/pkg/chains/bitcoin_test.go b/pkg/chains/bitcoin_test.go
@@ -18,6 +18,7 @@ func TestBitcoinNetParamsFromChainID(t *testing.T) {
 		{"Mainnet", BitcoinMainnet.ChainId, &chaincfg.MainNetParams, false},
 		{"Testnet", BitcoinTestnet.ChainId, &chaincfg.TestNet3Params, false},
 		{"Signet", BitcoinSignetTestnet.ChainId, &chaincfg.SigNetParams, false},
+		{"Testnet4", BitcoinTestnet4.ChainId, &TestNet4Params, false},
 		{"Unknown", -1, nil, true},
 	}
 
@@ -46,6 +47,7 @@ func TestBitcoinChainIDFromNetParams(t *testing.T) {
 		{"Mainnet", chaincfg.MainNetParams.Name, BitcoinMainnet.ChainId, false},
 		{"Testnet", chaincfg.TestNet3Params.Name, BitcoinTestnet.ChainId, false},
 		{"Signet", chaincfg.SigNetParams.Name, BitcoinSignetTestnet.ChainId, false},
+		{"Testnet4", TestNet4Params.Name, BitcoinTestnet4.ChainId, false},
 		{"Unknown", "Unknown", 0, true},
 	}
 
@@ -67,10 +69,14 @@ func TestIsBitcoinRegnet(t *testing.T) {
 	require.True(t, IsBitcoinRegnet(BitcoinRegtest.ChainId))
 	require.False(t, IsBitcoinRegnet(BitcoinMainnet.ChainId))
 	require.False(t, IsBitcoinRegnet(BitcoinTestnet.ChainId))
+	require.False(t, IsBitcoinRegnet(BitcoinSignetTestnet.ChainId))
+	require.False(t, IsBitcoinRegnet(BitcoinTestnet4.ChainId))
 }
 
 func TestIsBitcoinMainnet(t *testing.T) {
 	require.True(t, IsBitcoinMainnet(BitcoinMainnet.ChainId))
 	require.False(t, IsBitcoinMainnet(BitcoinRegtest.ChainId))
 	require.False(t, IsBitcoinMainnet(BitcoinTestnet.ChainId))
+	require.False(t, IsBitcoinMainnet(BitcoinSignetTestnet.ChainId))
+	require.False(t, IsBitcoinMainnet(BitcoinTestnet4.ChainId))
 }