chore: merge main into develop

.github/workflows/e2e.yml

@@ -253,7 +253,7 @@ jobs:
           - make-target: "start-upgrade-test"
             runs-on: ubuntu-22.04
             run: ${{ needs.matrix-conditionals.outputs.UPGRADE_TESTS == 'true' }}
-          - make-target: "start-upgrade-test-zetaclient"
+          - make-target: "start-upgrade-test-zetaclient-light"
             runs-on: ubuntu-22.04
             run: ${{ needs.matrix-conditionals.outputs.UPGRADE_TEST_ZETACLIENT == 'true' }}
           - make-target: "start-upgrade-test-light"

.github/workflows/semgrep.yml

@@ -31,7 +31,7 @@ jobs:
       # uses json for semgrep script for transformation in the next step
       - run: semgrep ci --json --output semgrep-findings.json 
 
-      # transforms the output from above into a GHAS compatible SARIF 
+      # transforms the output from above into a GHAS compatible SARIF
       # SARIF output by "semgrep --sarif" doesn't integrate well with GHAS dashboard
       # Example: the event name uses segmrep rules name/ID, severities are [error, warning, info], tags are a bit confusing)
       - run: python semgrep-utilities/utilities/github-sarif-helper/src/semgrep-json-to-sarif.py --json semgrep-findings.json --sarif semgrep-github.sarif

Makefile

@@ -166,7 +166,7 @@ devnet-fork-upgrade:
 
 download-snapshot:
 	@echo "--> Downloading and caching snapshot..."
-	@python3 contrib/localnet/scripts_python/download_snapshot.py --chain-id $(or $(CHAIN_ID),athens_7001-1)
+	@python3 contrib/localnet/scripts_python/download_snapshot.py --chain-id $(or $(CHAIN_ID),athens_7001-1) --force
 
 ###############################################################################
 ###                                 Linting            	                    ###
@@ -475,6 +475,7 @@ start-upgrade-test-zetaclient-light: zetanode-upgrade
 	export LOCALNET_MODE=upgrade && \
 	export UPGRADE_HEIGHT=60 && \
 	export E2E_ARGS="--upgrade-contracts" && \
+	export USE_ZETAE2E_ANTE=true && \
 	export UPGRADE_ZETACLIENT_ONLY=true && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade-zetaclient -f docker-compose-upgrade.yml up -d
 
@@ -513,7 +514,8 @@ start-upgrade-import-mainnet-test: zetanode-upgrade
 start-connector-migration-test: zetanode-upgrade
 	@echo "--> Starting migration test for v2 connector contracts"
 	export LOCALNET_MODE=upgrade && \
-	export UPGRADE_HEIGHT=90 && \
+	export UPGRADE_HEIGHT=60 && \
+	export USE_ZETAE2E_ANTE=true && \
 	export E2E_ARGS="${E2E_ARGS} --skip-regular --test-connector-migration --test-legacy" && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose-upgrade.yml up -d
 

app/ante/authz.go

@@ -49,7 +49,7 @@ func (ald AuthzLimiterDecorator) AnteHandle(
 // maxNestedMsgs threshold. If there are more than that limit, it returns an error
 func (ald AuthzLimiterDecorator) checkDisabledMsgs(msgs []sdk.Msg, isAuthzInnerMsg bool, nestedLvl int) error {
 	if nestedLvl >= maxNestedMsgs {
-		return fmt.Errorf("found more nested msgs than permited. Limit is : %d", maxNestedMsgs)
+		return fmt.Errorf("found more nested msgs than permitted. Limit is : %d", maxNestedMsgs)
 	}
 	for _, msg := range msgs {
 		switch msg := msg.(type) {

app/setup_handler_test.go

@@ -1,67 +1,59 @@
 package app
 
-import (
-	"testing"
-
-	storetypes "cosmossdk.io/store/types"
-	erc20types "github.com/cosmos/evm/x/erc20/types"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_CreateUpgrades(t *testing.T) {
-
-	addErc20ModuleUpgrade := upgradeTrackerItem{
-		index: 1752528615,
-		storeUpgrade: &storetypes.StoreUpgrades{
-			Added: []string{erc20types.ModuleName},
-		},
-	}
-	tests := []struct {
-		name    string
-		chainID string
-		result  []upgradeTrackerItem
-		panic   bool
-	}{
-		{
-			name:    "mainnet chain ID",
-			chainID: "zetachain_7000-1",
-			result:  []upgradeTrackerItem{addErc20ModuleUpgrade},
-			panic:   false,
-		},
-		{
-			name:    "testnet chain ID",
-			chainID: "zetachain_7001-1",
-			result:  []upgradeTrackerItem{},
-			panic:   false,
-		},
-		{
-			name:    "invalid chain ID",
-			chainID: "zetachain-7001-1",
-			result:  []upgradeTrackerItem{},
-			panic:   true,
-		},
-		{
-			name:    "empty chain ID",
-			chainID: "",
-			result:  []upgradeTrackerItem{},
-			panic:   false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.panic {
-				require.Panics(t, func() {
-					createUpgrades(tt.chainID)
-				}, "createUpgrades(%s) should panic", tt.chainID)
-				return
-			} else {
-				require.NotPanics(t, func() {
-					createUpgrades(tt.chainID)
-				}, "createUpgrades(%s) should not panic", tt.chainID)
-			}
-
-			result := createUpgrades(tt.chainID)
-			require.Equal(t, tt.result, result, "createUpgrades(%s) = %v, want %v", tt.chainID, result, tt.result)
-		})
-	}
-}
+//func Test_CreateUpgrades(t *testing.T) {
+//
+//	addErc20ModuleUpgrade := upgradeTrackerItem{
+//		index: 1752528615,
+//		storeUpgrade: &storetypes.StoreUpgrades{
+//			Added: []string{erc20types.ModuleName},
+//		},
+//	}
+//	tests := []struct {
+//		name    string
+//		chainID string
+//		result  []upgradeTrackerItem
+//		panic   bool
+//	}{
+//		{
+//			name:    "mainnet chain ID",
+//			chainID: "zetachain_7000-1",
+//			result:  []upgradeTrackerItem{addErc20ModuleUpgrade},
+//			panic:   false,
+//		},
+//		{
+//			name:    "testnet chain ID",
+//			chainID: "zetachain_7001-1",
+//			result:  []upgradeTrackerItem{},
+//			panic:   false,
+//		},
+//		{
+//			name:    "invalid chain ID",
+//			chainID: "zetachain-7001-1",
+//			result:  []upgradeTrackerItem{},
+//			panic:   true,
+//		},
+//		{
+//			name:    "empty chain ID",
+//			chainID: "",
+//			result:  []upgradeTrackerItem{},
+//			panic:   false,
+//		},
+//	}
+//	for _, tt := range tests {
+//		t.Run(tt.name, func(t *testing.T) {
+//			if tt.panic {
+//				require.Panics(t, func() {
+//					createUpgrades(tt.chainID)
+//				}, "createUpgrades(%s) should panic", tt.chainID)
+//				return
+//			} else {
+//				require.NotPanics(t, func() {
+//					createUpgrades(tt.chainID)
+//				}, "createUpgrades(%s) should not panic", tt.chainID)
+//			}
+//
+//			result := createUpgrades(tt.chainID)
+//			require.Equal(t, tt.result, result, "createUpgrades(%s) = %v, want %v", tt.chainID, result, tt.result)
+//		})
+//	}
+//}

app/setup_handlers.go

@@ -7,10 +7,8 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	"cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	erc20types "github.com/cosmos/evm/x/erc20/types"
 	"golang.org/x/mod/semver"
 
-	"github.com/zeta-chain/node/pkg/chains"
 	"github.com/zeta-chain/node/pkg/constant"
 )
 
@@ -31,47 +29,29 @@ func GetDefaultUpgradeHandlerVersion() string {
 	return semver.Major(vVersion)
 }
 
-func createUpgrades(chainID string) []upgradeTrackerItem {
-	addErc20ModuleUpgrade := upgradeTrackerItem{
-		index: 1752528615,
-		storeUpgrade: &storetypes.StoreUpgrades{
-			Added: []string{erc20types.ModuleName},
-		},
-		// TODO: enable back IBC
-		// https://github.com/zeta-chain/node/issues/2573
-		//{
-		//	index: <CURRENT TIMESTAMP>,
-		//	storeUpgrade: &storetypes.StoreUpgrades{
-		//		Added: []string{
-		//			capabilitytypes.ModuleName,
-		//			ibcexported.ModuleName,
-		//			ibctransfertypes.ModuleName,
-		//		},
-		//	},
-		//},
-		//{
-		//	index: <CURRENT TIMESTAMP>,
-		//	storeUpgrade: &storetypes.StoreUpgrades{
-		//		Added: []string{ibccrosschaintypes.ModuleName},
-		//	},
-		//},
-	}
-	upgrades := make([]upgradeTrackerItem, 0)
-	if chainID != "" {
-		evmChaindID, err := chains.CosmosToEthChainID(chainID)
-		if err != nil {
-			panic("invalid chain ID: " + chainID + ", error: " + err.Error())
-		}
-		if evmChaindID == chains.ZetaChainMainnet.ChainId {
-			return append(upgrades, addErc20ModuleUpgrade)
-		}
-	}
-	return upgrades
-}
-
 func SetupHandlers(app *App) {
 	allUpgrades := upgradeTracker{
-		upgrades:     createUpgrades(app.ChainID()),
+		upgrades: []upgradeTrackerItem{
+			// TODO: enable back IBC
+			// these commented lines allow for the IBC modules to be added to the upgrade tracker
+			// https://github.com/zeta-chain/node/issues/2573
+			//{
+			//	index: <CURRENT TIMESTAMP>,
+			//	storeUpgrade: &storetypes.StoreUpgrades{
+			//		Added: []string{
+			//			capabilitytypes.ModuleName,
+			//			ibcexported.ModuleName,
+			//			ibctransfertypes.ModuleName,
+			//		},
+			//	},
+			//},
+			//{
+			//	index: <CURRENT TIMESTAMP>,
+			//	storeUpgrade: &storetypes.StoreUpgrades{
+			//		Added: []string{ibccrosschaintypes.ModuleName},
+			//	},
+			//},
+		},
 		stateFileDir: DefaultNodeHome,
 	}
 

changelog.md

@@ -1,6 +1,8 @@
 # CHANGELOG
 
-## Unreleased
+## Release ReForge
+- zetacored: v37.0.0
+- zetaclientd: v38.0.0
 
 ### Breaking Changes
 
@@ -18,11 +20,6 @@ The `zetacored` binary must be upgraded to trigger chain parameters data migrati
 * [4493](https://github.com/zeta-chain/node/pull/4493) - enable ALT in solana inbounds
 * [4485](https://github.com/zeta-chain/node/pull/4485) - move gas price multiplier to zetacore chain parameters
 
-### Tests
-
-* [4476](https://github.com/zeta-chain/node/pull/4476) - add separate versions for zetaclient ,zetacore and zetae2e binaries for upgrade e2e tests.
-* [4503](https://github.com/zeta-chain/node/pull/4503) - add an e2e test to replace observer without TSS migration
-
 ### Fixes
 
 * [4403](https://github.com/zeta-chain/node/pull/4403) - load Sui inbound cursors from database for all supported packages
@@ -41,8 +38,10 @@ The `zetacored` binary must be upgraded to trigger chain parameters data migrati
 
 * [4440](https://github.com/zeta-chain/node/pull/4440) - add more chaos profiles to zetaclient localnet
 * [4474](https://github.com/zeta-chain/node/pull/4474) - add e2e test for zetaclient minimum version
+* [4476](https://github.com/zeta-chain/node/pull/4476) - add separate versions for zetaclient ,zetacore and zetae2e binaries for upgrade e2e tests.
 * [4488](https://github.com/zeta-chain/node/pull/4488) - add sui to tss migration tests
 * [4491](https://github.com/zeta-chain/node/pull/4491) - add ton to tss migration tests
+* [4503](https://github.com/zeta-chain/node/pull/4503) - add an e2e test to replace observer without TSS migration
 
 ## v37.0.0
 
@@ -149,6 +148,69 @@ Also EnableSolanaAddressLookupTable feature flag should be set.
 * [4194](https://github.com/zeta-chain/node/pull/4194) - remove duplicate solana post-gas-price goroutine
 * [4291](https://github.com/zeta-chain/node/pull/4291) - adjust inbound retry gas limit and stop tx broadcasting on mempool congestion
 
+## Unreleased
+
+### Breaking Changes
+
+* EVM inbounds support multiple calls inside same tx. EVM Gateway contracts must be upgraded before node upgrade, and an additional action fee should be set,
+by calling `updateAdditionalActionFee` admin function.
+* `confirmation_count` in the chain params has been entirely removed. It was made deprecated in v28. Use `confirmation_params` instead.
+* The message `MsgWhitelistERC20` has been renamed to `MsgWhitelistAsset`. The message parameters remain unchanged.
+  * The event `EventERC20Whitelist` has been renamed to `EventAssetWhitelist`. The event parameters remain unchanged.
+
+### Features
+
+* [4064](https://github.com/zeta-chain/node/pull/4064) - add support for withdraws using the new v2 connector contract
+* [4138](https://github.com/zeta-chain/node/pull/4138) - allow zetaclient to observe inbound events from Sui original gateway package
+* [4153](https://github.com/zeta-chain/node/pull/4153) - make the gas limit used for gateway calls a configurable parameter
+* [4157](https://github.com/zeta-chain/node/pull/4157) - multiple evm calls in single tx
+* [4211](https://github.com/zeta-chain/node/pull/4211) - provide error information in cctx when Bitcoin deposit fail
+* [4218](https://github.com/zeta-chain/node/pull/4218) - enable NoAssetCall from Bitcoin chain
+* [3834](https://github.com/zeta-chain/node/pull/3734) - refund a portion of remaining unused tokens to user
+
+### Refactor
+
+* [4070](https://github.com/zeta-chain/node/pull/4070) - remove support for v1 revert address for BTC
+* [4144](https://github.com/zeta-chain/node/pull/4144) - standardize structured logging for zetaclient
+* [4192](https://github.com/zeta-chain/node/pull/4192) - remove deprecated code in observer module, including `confirmation_count`
+* [4180](https://github.com/zeta-chain/node/pull/4180) - remove unused loggers and log fields
+* [4203](https://github.com/zeta-chain/node/pull/4203) - rename `whitelistERC20` into `whitelistAsset`
+* [4199](https://github.com/zeta-chain/node/pull/4199) - remove `MsgUpdateERC20CustodyPauseStatus` and `MsgMigrateERC20CustodyFunds`
+* [4205](https://github.com/zeta-chain/node/pull/4205) - remove index field in ballot
+* [4200](https://github.com/zeta-chain/node/pull/4200) - remove `LastBlockHeight` state variable
+* [4174](https://github.com/zeta-chain/node/pull/4174) - add documentation for ZetaClient logging fields
+* [4210](https://github.com/zeta-chain/node/pull/4210) - skip writing config file to the filesystem when updating consensus timeout deltas
+* [4213](https://github.com/zeta-chain/node/pull/4213) - prepare the client interfaces of the observer-signers for dry mode
+
+### Fixes
+
+* [4090](https://github.com/zeta-chain/node/pull/4090) - print error message in detail if unable to decode Bitcoin memo
+* [4116](https://github.com/zeta-chain/node/pull/4116) - remove confirmation mode from outbound and inbound digest
+* [4111](https://github.com/zeta-chain/node/pull/4111) - cancel Solana outbound if transaction size is too large
+* [4112](https://github.com/zeta-chain/node/pull/4112) - fix error when deploying contracts on testnet
+* [4121](https://github.com/zeta-chain/node/pull/4121) - dbg trace block by number gas limit legacy
+* [4169](https://github.com/zeta-chain/node/pull/4169) - unpack revert message from Bitcoin memo without considering `CallOnRevert` flag
+* [4194](https://github.com/zeta-chain/node/pull/4194) - remove duplicate solana post-gas-price goroutine
+* [4197](https://github.com/zeta-chain/node/pull/4197) - re-check for finalized ballot when executing inbound vote to create cctx
+* [4217](https://github.com/zeta-chain/node/pull/4217) - remove ZetaChain chain ID from GasStabilityPoolBalances query
+* [4251](https://github.com/zeta-chain/node/pull/4251) - check test contracts deployment in E2E tests
+
+### Tests
+
+* [4071](https://github.com/zeta-chain/node/pull/4071) - use v2 connector contract in admin e2e tests
+* [4113](https://github.com/zeta-chain/node/pull/4113) - fix Solana flaky depositAndCall e2e tests in live networks
+* [4142](https://github.com/zeta-chain/node/pull/4142) - fix Solana flaky SPL deposit e2e test in live networks
+* [4158](https://github.com/zeta-chain/node/pull/4158) - have e2e tests interact with pre-deployed example dApp contract
+* [4165](https://github.com/zeta-chain/node/pull/4165) - fix Sui flaky depositAndCall e2e test in live networks
+* [4177](https://github.com/zeta-chain/node/pull/4177) - add an E2E test to verify depositAndCall with high gas consumption
+* [4310](https://github.com/zeta-chain/node/pull/4310) - add zetaclient only upgrade tests
+
+## v36.0.0
+
+### Features
+
+* [4153](https://github.com/zeta-chain/node/pull/4153) - make the gas limit used for gateway calls a configurable parameter
+
 ## v33.0.0
 
 ### Features
@@ -160,6 +222,8 @@ Also EnableSolanaAddressLookupTable feature flag should be set.
 * [4063](https://github.com/zeta-chain/node/pull/4063) - add a message to burn funds in the fungible module
 * [3991](https://github.com/zeta-chain/node/pull/3991) - migrate from Ethermint to new Cosmos EVM module
 * [4077](https://github.com/zeta-chain/node/pull/4077) - add Cosmos EVM default precompiles support
+* [4068](https://github.com/zeta-chain/node/pull/4068) - add support for hostname in addition to public IP for zetaclient to connect to zetacore
+* [4087](https://github.com/zeta-chain/node/pull/4087) - re-enable Sui authenticated call and adopt MessageContext ID as a gateway dynamic field
 
 ### Fixes
 
@@ -173,6 +237,7 @@ Also EnableSolanaAddressLookupTable feature flag should be set.
 * [4018](https://github.com/zeta-chain/node/pull/4018) - Sui token accounting mismatch
 * [4020](https://github.com/zeta-chain/node/pull/4020) - add a migration script to delete ZRC20 SUI gas tokens from stability pool
 * [4067](https://github.com/zeta-chain/node/pull/4067) - disable sui authenticated call temporarily until gateway upgrade
+* [4072](https://github.com/zeta-chain/node/pull/4072) - improve rate limiter robustness and code quality
 
 ### Refactor
 

cmd/zetaclientd-supervisor/lib.go

@@ -68,6 +68,7 @@ func newZetaclientdSupervisor(
 	enableAutoDownload bool,
 ) (*zetaclientdSupervisor, error) {
 	logger = logger.With().Str("module", "zetaclientdSupervisor").Logger()
+
 	conn, err := grpc.Dial(
 		fmt.Sprintf("%s:9090", zetaCoreURL),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),

cmd/zetae2e/config/config.go

@@ -95,10 +95,10 @@ func ExportContractsFromRunner(r *runner.E2ERunner, conf config.Config) config.C
 	conf.Contracts.ZEVM.ConnectorZEVMAddr = config.DoubleQuotedString(r.ConnectorZEVMAddr.Hex())
 	conf.Contracts.ZEVM.WZetaAddr = config.DoubleQuotedString(r.WZetaAddr.Hex())
 	conf.Contracts.ZEVM.ZEVMSwapAppAddr = config.DoubleQuotedString(r.ZEVMSwapAppAddr.Hex())
-	conf.Contracts.ZEVM.ContextAppAddr = config.DoubleQuotedString(r.ContextAppAddr.Hex())
 	conf.Contracts.ZEVM.TestDappAddr = config.DoubleQuotedString(r.ZevmTestDAppAddr.Hex())
 	conf.Contracts.ZEVM.Gateway = config.DoubleQuotedString(r.GatewayZEVMAddr.Hex())
 	conf.Contracts.ZEVM.TestDAppV2Addr = config.DoubleQuotedString(r.TestDAppV2ZEVMAddr.Hex())
+	conf.Contracts.ZEVM.CoreRegistry = config.DoubleQuotedString(r.CoreRegistryAddr.Hex())
 
 	return conf
 }