Merge remote-tracking branch 'origin/genesis-import' into genesis-import

Dockerfile-localnet

@@ -11,21 +11,12 @@ RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""
 WORKDIR /go/delivery/zeta-node
 COPY go.mod .
 COPY go.sum .
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    go mod download
 RUN go mod download
 COPY . .
 
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install-zetae2e
 RUN make install
 RUN make install-zetae2e
-#
-#FROM golang:1.20-alpine
 
-#RUN apk --no-cache add openssh jq tmux vim curl bash
 RUN ssh-keygen -A
 WORKDIR /root
 

app/ante/ante.go

@@ -172,7 +172,7 @@ func IsSystemTx(tx sdk.Tx, isAuthorizedSigner func(string) bool) bool {
 		*cctxtypes.MsgVoteOnObservedInboundTx,
 		*cctxtypes.MsgVoteOnObservedOutboundTx,
 		*cctxtypes.MsgAddToOutTxTracker,
-		*cctxtypes.MsgCreateTSSVoter,
+		*observertypes.MsgVoteTSS,
 		*observertypes.MsgAddBlockHeader,
 		*observertypes.MsgAddBlameVote:
 		signers := innerMsg.GetSigners()

app/ante/ante_test.go

@@ -36,7 +36,7 @@ func TestIsSystemTx(t *testing.T) {
 	//		*cctxtypes.MsgVoteOnObservedInboundTx,
 	//		*cctxtypes.MsgVoteOnObservedOutboundTx,
 	//		*cctxtypes.MsgAddToOutTxTracker,
-	//		*cctxtypes.MsgCreateTSSVoter,
+	//		*observertypes.MsgVoteTSS,
 	//		*observertypes.MsgAddBlockHeader,
 	//		*observertypes.MsgAddBlameVote:
 	buildTxFromMsg := func(msg sdk.Msg) sdk.Tx {
@@ -64,26 +64,26 @@ func TestIsSystemTx(t *testing.T) {
 		wantIs       bool
 	}{
 		{
-			"MsgCreateTSSVoter",
-			buildTxFromMsg(&crosschaintypes.MsgCreateTSSVoter{
+			"MsgVoteTSS",
+			buildTxFromMsg(&observertypes.MsgVoteTSS{
 				Creator:   sample.AccAddress(),
 				TssPubkey: "pubkey1234",
 			}),
 			isAuthorizedFalse,
 			false,
 		},
 		{
-			"MsgCreateTSSVoter",
-			buildTxFromMsg(&crosschaintypes.MsgCreateTSSVoter{
+			"MsgVoteTSS",
+			buildTxFromMsg(&observertypes.MsgVoteTSS{
 				Creator:   sample.AccAddress(),
 				TssPubkey: "pubkey1234",
 			}),
 			isAuthorized,
 			true,
 		},
 		{
-			"MsgExec{MsgCreateTSSVoter}",
-			buildAuthzTxFromMsg(&crosschaintypes.MsgCreateTSSVoter{
+			"MsgExec{MsgVoteTSS}",
+			buildAuthzTxFromMsg(&observertypes.MsgVoteTSS{
 				Creator:   sample.AccAddress(),
 				TssPubkey: "pubkey1234",
 			}),
@@ -169,17 +169,17 @@ func TestIsSystemTx(t *testing.T) {
 			true,
 		},
 		{
-			"MsgCreateTSSVoter",
-			buildTxFromMsg(&crosschaintypes.MsgCreateTSSVoter{
+			"MsgVoteTSS",
+			buildTxFromMsg(&observertypes.MsgVoteTSS{
 				Creator: sample.AccAddress(),
 			}),
 			isAuthorized,
 
 			true,
 		},
 		{
-			"MsgExec{MsgCreateTSSVoter}",
-			buildAuthzTxFromMsg(&crosschaintypes.MsgCreateTSSVoter{
+			"MsgExec{MsgVoteTSS}",
+			buildAuthzTxFromMsg(&observertypes.MsgVoteTSS{
 				Creator: sample.AccAddress(),
 			}),
 			isAuthorized,

changelog.md

@@ -8,6 +8,9 @@
   * The `Policies` query of the `authority` module must be used to get the current admin policies.
   * `PolicyType_group1` has been renamed into `PolicyType_groupEmergency` and `PolicyType_group2` has been renamed into `PolicyType_groupAdmin`.
 
+* `MsgCreateTSSVoter` message in the `crosschain` module has been moved to the `observer` module and renamed to `MsgVoteTSS`.
+  * The structure of the message remains the same.
+
 ### Refactor
 
 * [1511](https://github.com/zeta-chain/node/pull/1511) - move ballot voting logic from `crosschain` to `observer`
@@ -21,15 +24,16 @@
 * [1914](https://github.com/zeta-chain/node/pull/1914) - move crosschain flags to core context in zetaclient
 * [1948](https://github.com/zeta-chain/node/pull/1948) - remove deprecated GetTSSAddress query in crosschain module
 * [1936](https://github.com/zeta-chain/node/pull/1936) - refactor common package into subpackages and rename to pkg
+* [1966](https://github.com/zeta-chain/node/pull/1966) - move TSS vote message from crosschain to observer
 * [1853](https://github.com/zeta-chain/node/pull/1853) - refactor vote inbound tx and vote outbound tx
 
-
 ### Features
 
 * [1789](https://github.com/zeta-chain/node/issues/1789) - block cross-chain transactions that involve restricted addresses
 * [1755](https://github.com/zeta-chain/node/issues/1755) - use evm JSON RPC for inbound tx (including blob tx) observation.
 * [1815](https://github.com/zeta-chain/node/pull/1815) - add authority module for authorized actions
 * [1884](https://github.com/zeta-chain/node/pull/1884) - added zetatool cmd, added subcommand to filter deposits
+* [1942](https://github.com/zeta-chain/node/pull/1982) - support Bitcoin P2TR, P2WSH, P2SH, P2PKH addresses
 * [1935](https://github.com/zeta-chain/node/pull/1935) - add an operational authority group
 * [1954](https://github.com/zeta-chain/node/pull/1954) - add metric for concurrent keysigns
 * [1979](https://github.com/zeta-chain/node/pull/1979) - add script to import genesis data into an existing genesis file
@@ -48,15 +52,24 @@
 * [1805](https://github.com/zeta-chain/node/pull/1805) - add admin and performance test and fix upgrade test
 * [1879](https://github.com/zeta-chain/node/pull/1879) - full coverage for messages in types packages
 * [1899](https://github.com/zeta-chain/node/pull/1899) - add empty test files so packages are included in coverage
+* [1900](https://github.com/zeta-chain/node/pull/1900) - add testing for external chain migration
 * [1903](https://github.com/zeta-chain/node/pull/1903) - common package tests
+* [1961](https://github.com/zeta-chain/node/pull/1961) - improve observer module coverage
+* [1967](https://github.com/zeta-chain/node/pull/1967) - improve crosschain module coverage
 * [1955](https://github.com/zeta-chain/node/pull/1955) - improve emissions module coverage
+* [1941](https://github.com/zeta-chain/node/pull/1941) - add unit tests for zetabridge package
+* [1985](https://github.com/zeta-chain/node/pull/1985) - improve fungible module coverage
+* [1992](https://github.com/zeta-chain/node/pull/1992) - remove setupKeeper from crosschain module
 
 ### Fixes
 
 * [1861](https://github.com/zeta-chain/node/pull/1861) - fix `ObserverSlashAmount` invalid read
 * [1880](https://github.com/zeta-chain/node/issues/1880) - lower the gas price multiplier for EVM chains.
+* [1883](https://github.com/zeta-chain/node/issues/1883) - zetaclient should check 'IsSupported' flag to pause/unpause a specific chain
 * [1633](https://github.com/zeta-chain/node/issues/1633) - zetaclient should be able to pick up new connector and erc20Custody addresses
 * [1944](https://github.com/zeta-chain/node/pull/1944) - fix evm signer unit tests
+* [1888](https://github.com/zeta-chain/node/issues/1888) - zetaclient should stop inbound/outbound txs according to cross-chain flags
+* [1970](https://github.com/zeta-chain/node/issues/1970) - remove the timeout in the evm outtx tracker processing thread
 
 ### Chores
 
@@ -171,6 +184,7 @@
 * [1675](https://github.com/zeta-chain/node/issues/1675) - use chain param ConfirmationCount for bitcoin confirmation
 
 ## Chores
+
 * [1694](https://github.com/zeta-chain/node/pull/1694) - remove standalone network, use require testing package for the entire node folder
 
 ## Version: v12.1.0
@@ -183,6 +197,7 @@
 * [1658](https://github.com/zeta-chain/node/pull/1658) - modify emission distribution to use fixed block rewards
 
 ### Fixes
+
 * [1535](https://github.com/zeta-chain/node/issues/1535) - Avoid voting on wrong ballots due to false blockNumber in EVM tx receipt
 * [1588](https://github.com/zeta-chain/node/pull/1588) - fix chain params comparison logic
 * [1650](https://github.com/zeta-chain/node/pull/1605) - exempt (discounted) *system txs* from min gas price check and gas fee deduction

cmd/zetaclientd/debug.go

@@ -8,25 +8,24 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/btcsuite/btcd/rpcclient"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/onrik/ethrpc"
+	"github.com/rs/zerolog"
+	"github.com/spf13/cobra"
 	"github.com/zeta-chain/zetacore/pkg/chains"
 	"github.com/zeta-chain/zetacore/pkg/coin"
+	"github.com/zeta-chain/zetacore/testutil/sample"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"github.com/zeta-chain/zetacore/zetaclient/bitcoin"
+	"github.com/zeta-chain/zetacore/zetaclient/config"
 	corecontext "github.com/zeta-chain/zetacore/zetaclient/core_context"
 	"github.com/zeta-chain/zetacore/zetaclient/evm"
 	"github.com/zeta-chain/zetacore/zetaclient/keys"
 	"github.com/zeta-chain/zetacore/zetaclient/metrics"
 	"github.com/zeta-chain/zetacore/zetaclient/zetabridge"
-
-	"github.com/btcsuite/btcd/rpcclient"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	ethcommon "github.com/ethereum/go-ethereum/common"
-	"github.com/rs/zerolog"
-	"github.com/spf13/cobra"
-	"github.com/zeta-chain/zetacore/testutil/sample"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
-	"github.com/zeta-chain/zetacore/zetaclient/config"
 )
 
 var debugArgs = debugArguments{}

cmd/zetaclientd/utils.go

@@ -67,9 +67,6 @@ func CreateSignerMap(
 			loggers.Std.Error().Msgf("ChainParam not found for chain %s", evmConfig.Chain.String())
 			continue
 		}
-		if !evmChainParams.IsSupported {
-			continue
-		}
 		mpiAddress := ethcommon.HexToAddress(evmChainParams.ConnectorContractAddress)
 		erc20CustodyAddress := ethcommon.HexToAddress(evmChainParams.Erc20CustodyContractAddress)
 		signer, err := evm.NewEVMSigner(
@@ -117,14 +114,11 @@ func CreateChainClientMap(
 		if evmConfig.Chain.IsZetaChain() {
 			continue
 		}
-		evmChainParams, found := appContext.ZetaCoreContext().GetEVMChainParams(evmConfig.Chain.ChainId)
+		_, found := appContext.ZetaCoreContext().GetEVMChainParams(evmConfig.Chain.ChainId)
 		if !found {
 			loggers.Std.Error().Msgf("ChainParam not found for chain %s", evmConfig.Chain.String())
 			continue
 		}
-		if !evmChainParams.IsSupported {
-			continue
-		}
 		co, err := evm.NewEVMChainClient(appContext, bridge, tss, dbpath, loggers, evmConfig, ts)
 		if err != nil {
 			loggers.Std.Error().Err(err).Msgf("NewEVMChainClient error for chain %s", evmConfig.Chain.String())

cmd/zetae2e/local/accounts.go

@@ -30,8 +30,9 @@ var (
 	UserMiscPrivateKey = "853c0945b8035a501b1161df65a17a0a20fc848bda8975a8b4e9222cc6f84cd4" // #nosec G101 - used for testing
 
 	// UserAdminAddress is the address of the account for testing admin function features
-	UserAdminAddress    = ethcommon.HexToAddress("0xcC8487562AAc220ea4406196Ee902C7c076966af")
-	UserAdminPrivateKey = "95409f1f0e974871cc26ba98ffd31f613aa1287d40c0aea6a87475fc3521d083" // #nosec G101 - used for testing
+	// NOTE: this is the default account using Anvil
+	UserAdminAddress    = ethcommon.HexToAddress("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266")
+	UserAdminPrivateKey = "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" // #nosec G101 - used for testing
 
 	FungibleAdminMnemonic = "snow grace federal cupboard arrive fancy gym lady uniform rotate exercise either leave alien grass" // #nosec G101 - used for testing
 )

cmd/zetae2e/local/admin.go

@@ -38,7 +38,7 @@ func adminTestRoutine(
 			deployerRunner,
 			UserAdminAddress,
 			UserAdminPrivateKey,
-			runner.NewLogger(verbose, color.FgGreen, "admin"),
+			runner.NewLogger(verbose, color.FgHiGreen, "admin"),
 		)
 		if err != nil {
 			return err
@@ -48,7 +48,8 @@ func adminTestRoutine(
 		startTime := time.Now()
 
 		// funding the account
-		txZetaSend := deployerRunner.SendZetaOnEvm(UserAdminAddress, 1000)
+		// we transfer around the total supply of Zeta to the admin for the chain migration test
+		txZetaSend := deployerRunner.SendZetaOnEvm(UserAdminAddress, 20_500_000_000)
 		txERC20Send := deployerRunner.SendERC20OnEvm(UserAdminAddress, 1000)
 		adminRunner.WaitForTxReceiptOnEvm(txZetaSend)
 		adminRunner.WaitForTxReceiptOnEvm(txERC20Send)

cmd/zetae2e/local/local.go

@@ -188,7 +188,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 	if !skipSetup {
 		logger.Print("⚙️ setting up networks")
 		startTime := time.Now()
-		deployerRunner.SetupEVM(contractsDeployed)
+		deployerRunner.SetupEVM(contractsDeployed, true)
 		deployerRunner.SetZEVMContracts()
 
 		// NOTE: this method return an error so we handle it and panic if it occurs unlike other method that panics directly
@@ -250,7 +250,11 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			e2etests.TestZetaDepositRestrictedName,
 		}
 		bitcoinTests := []string{
-			e2etests.TestBitcoinWithdrawName,
+			e2etests.TestBitcoinWithdrawSegWitName,
+			e2etests.TestBitcoinWithdrawTaprootName,
+			e2etests.TestBitcoinWithdrawLegacyName,
+			e2etests.TestBitcoinWithdrawP2SHName,
+			e2etests.TestBitcoinWithdrawP2WSHName,
 			e2etests.TestBitcoinWithdrawInvalidAddressName,
 			e2etests.TestZetaWithdrawBTCRevertName,
 			e2etests.TestCrosschainSwapName,
@@ -285,6 +289,12 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			e2etests.TestPauseZRC20Name,
 			e2etests.TestUpdateBytecodeName,
 			e2etests.TestDepositEtherLiquidityCapName,
+
+			// TestMigrateChainSupportName tests EVM chain migration. Currently this test doesn't work with Anvil because pre-EIP1559 txs are not supported
+			// See issue below for details
+			// TODO: renenable this test as per the issue below
+			// https://github.com/zeta-chain/node/issues/1980
+			// e2etests.TestMigrateChainSupportName,
 		))
 	}
 	if testPerformance {

cmd/zetae2e/stress.go

@@ -155,7 +155,7 @@ func StressTest(cmd *cobra.Command, _ []string) {
 		panic(err)
 	}
 
-	e2eTest.SetupEVM(stressTestArgs.contractsDeployed)
+	e2eTest.SetupEVM(stressTestArgs.contractsDeployed, true)
 
 	// If stress test is running on local docker environment
 	if stressTestArgs.network == "LOCAL" {

codecov.yml

@@ -38,7 +38,7 @@ flags:
       - "common/"
 
 ignore:
-  - "x/**/client/"
+  - "x/**/client/**/*"
   - "x/**/keeper/keeper.go"
   - "x/**/keeper/msg_server.go"
   - "x/**/keeper/grpc_query_params.go"
@@ -49,25 +49,27 @@ ignore:
   - "x/**/types/types.go"
   - "x/**/types/expected_keepers.go"
   - "x/**/module.go"
+  - "x/**/events.go"
+  - "x/**/migrator.go"
   - "x/**/module_simulation.go"
-  - "x/**/simulation/"
+  - "x/**/simulation/**/*"
   - "**/*.proto"
   - "**/*.md"
   - "**/*.yml"
   - "**/*.yaml"
   - "**/*.pb.go"
   - "**/*.pb.gw.go"
   - "**/*.json"
-  - ".github/"
-  - "app/"
-  - "cmd/"
-  - "contrib/"
-  - "docs/"
-  - "rpc/"
-  - "proto/"
-  - "scripts/"
-  - "server/"
-  - "testutil/"
-  - "testutils/"
-  - "errors/"
-  - "typescript/"
+  - ".github/**/*"
+  - "app/**/*"
+  - "cmd/**/*"
+  - "contrib/**/*"
+  - "docs/**/*"
+  - "rpc/**/*"
+  - "proto/**/*"
+  - "scripts/**/*"
+  - "server/**/*"
+  - "testutil/**/*"
+  - "testutils/**/*"
+  - "errors/**/*"
+  - "typescript/**/*"

contrib/localnet/anvil/Dockerfile

@@ -0,0 +1,11 @@
+# This Dockerfile is used to build a Docker image for Anvil, a localnet for testing purposes.
+# Currently we directly set the chain ID to 11155111 and expose the default Anvil port specifically for the chain migration test.
+
+# Start from the latest Rust image as Anvil is built with Rust
+FROM ghcr.io/foundry-rs/foundry:latest
+
+# Expose the default Anvil port
+EXPOSE 8545
+
+# Run Anvil with specified chain ID and a prefunded account when the container starts
+ENTRYPOINT ["anvil", "--host", "0.0.0.0", "--chain-id", "11155111"]

contrib/localnet/docker-compose-admin.yml

@@ -2,8 +2,25 @@ version: "3"
 
 # This docker-compose file overrides the orchestrator service to specify the flag to test the admin functions
 # and skip the regular tests
+# it also adds another local Ethereum network to test EVM chain migration and use the additional-evm flag
 
 services:
   orchestrator:
     entrypoint: ["/work/start-zetae2e.sh", "local --skip-regular --test-admin"]
 
+  eth2:
+    build:
+      context: ./anvil
+    container_name: eth2
+    hostname: eth2
+    ports:
+      - "8546:8545"
+    networks:
+      mynetwork:
+        ipv4_address: 172.20.0.102
+
+  zetaclient0:
+    entrypoint: [ "/root/start-zetaclientd.sh", "additional-evm" ]
+
+  zetaclient1:
+    entrypoint: [ "/root/start-zetaclientd.sh", "additional-evm" ]

contrib/localnet/orchestrator/Dockerfile

@@ -13,6 +13,7 @@ COPY --from=zeta /root/.ssh/localtest.pem /root/.ssh/localtest.pem
 
 COPY contrib/localnet/orchestrator/start-zetae2e.sh /work/
 COPY contrib/localnet/orchestrator/restart-zetaclientd.sh /work/
+COPY contrib/localnet/orchestrator/restart-zetaclientd-at-upgrade.sh /work/
 RUN chmod +x /work/*.sh
 
 ENV GOPATH /go