Merge branch 'release/v20' into fix/ethermint-event

.github/workflows/publish-release.yml

@@ -11,28 +11,40 @@ on:
         type: boolean
         required: false
         default: false
-        description: 'Use this to skip: check-changelog and check-upgrade-handler-updated go straight to approval step.'
+        description: 'Skip pre-release checks and skip straight to the actual release'
       skip_release:
         type: boolean
         required: false
         default: false
-        description: 'If this is true it will simply execute all the steps for a release prior to actually cutting the release, then stop'
+        description: 'Only run pre-release checks'
 
 concurrency:
   group: publish-release
   cancel-in-progress: false
 
 jobs:
+  log:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: "Log inputs"
+        env:
+          INPUTS: ${{ toJson(inputs) }}
+        run: echo "${INPUTS}" | jq -r
+      - name: "Log event"
+        env:
+          EVENT: ${{ toJson(github.event) }}
+        run: echo "${EVENT}" | jq -r
+
   check-branch:
-    if: ${{ (startsWith(github.ref, 'refs/heads/release/v') || startsWith(github.ref, 'refs/heads/hotfix/v')) }}
+    if: (startsWith(github.ref, 'refs/heads/release/v') || startsWith(github.ref, 'refs/heads/hotfix/v'))
     runs-on: ubuntu-22.04
     steps:
       - name: Branch
         run: |
           echo "${{ github.ref }}"
 
   check-goreleaser:
-    if: ${{ github.event.inputs.skip_checks != 'true' }}
+    if: inputs.skip_checks != true
     runs-on: ${{ vars.RELEASE_RUNNER }}
     steps:
       - uses: actions/checkout@v4
@@ -47,13 +59,13 @@ jobs:
     steps:
 
       - name: Checkout code
-        if: ${{ github.event.inputs.skip_checks != 'true' }}
+        if: inputs.skip_checks != true
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Get latest commit SHA of Develop & Current Branch
-        if: ${{ github.event.inputs.skip_checks != 'true' }}
+        if: inputs.skip_checks != true
         id: get-develop-sha
         run: |
           SHA=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
@@ -62,7 +74,7 @@ jobs:
           echo "CURRENT_BRANCH_SHA=${{ github.sha }}" >> ${GITHUB_ENV}
 
       - name: Check for CHANGELOG.md changes
-        if: ${{ github.event.inputs.skip_checks != 'true' }}
+        if: inputs.skip_checks != true
         run: |
           echo "Check the changelog has actually been updated from whats in develop"
           echo "DEVELOP BRANCH SHA: ${DEVELOP_SHA}"
@@ -77,7 +89,7 @@ jobs:
           fi
 
       - name: Mark Job Complete Skipped
-        if: ${{ github.event.inputs.skip_checks == 'true' }}
+        if: inputs.skip_checks == true
         shell: bash
         run: |
           echo "continue"
@@ -90,15 +102,15 @@ jobs:
     steps:
 
       - uses: actions/checkout@v4
-        if: ${{ github.event.inputs.skip_checks != 'true' }}
+        if: inputs.skip_checks != true
         with:
           fetch-depth: 0
 
       - name: Major Version in Upgrade Handler Must Match Tag
-        if: ${{ github.event.inputs.skip_checks != 'true' }}
+        if: inputs.skip_checks != true
         run: |
           UPGRADE_HANDLER_MAJOR_VERSION=$(cat app/setup_handlers.go | grep "const releaseVersion" | cut -d ' ' -f4 | tr -d '"' | cut -d '.' -f 1 | tr -d '\n')
-          USER_INPUT_VERSION=$(echo "${{ github.event.inputs.version }}" | cut -d '.' -f 1 | tr -d '\n')
+          USER_INPUT_VERSION=$(echo "${{ inputs.version }}" | cut -d '.' -f 1 | tr -d '\n')
           echo "Upgrade Handler Major Version: ${UPGRADE_HANDLER_MAJOR_VERSION}"
           echo "User Inputted Release Version: ${USER_INPUT_VERSION}"
           if [ ${USER_INPUT_VERSION} != $UPGRADE_HANDLER_MAJOR_VERSION ]; then
@@ -109,7 +121,7 @@ jobs:
           echo "The major version found in 'releaseVersion' in app/setup_handlers.go matches this tagged release - Moving Forward!"
 
       - name: Mark Job Complete Skipped
-        if: ${{ github.event.inputs.skip_checks == 'true' }}
+        if: inputs.skip_checks == true
         shell: bash
         run: |
           echo "continue"
@@ -119,7 +131,7 @@ jobs:
       id-token: write
       contents: write
       attestations: write
-    if: ${{ github.event.inputs.skip_release == 'false' }}
+    if: inputs.skip_release != true
     needs:
       - check-changelog
       - check-upgrade-handler-updated
@@ -131,15 +143,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Pipeline Dependencies
-        uses: ./.github/actions/install-dependencies
-        timeout-minutes: 8
-        with:
-          cpu_architecture: ${{ env.CPU_ARCH }}
-          skip_python: "true"
-          skip_aws_cli: "true"
-          skip_docker_compose: "true"
-
       - name: Change Log Release Notes.
         id: release_notes
         run: |
@@ -148,19 +151,7 @@ jobs:
 
       - name: Set Version
         run: |
-          echo "GITHUB_TAG_MAJOR_VERSION=${{ github.event.inputs.version }}" >> ${GITHUB_ENV}
-
-      - name: Set CPU Architecture
-        shell: bash
-        run: |
-          if [ "$(uname -m)" == "aarch64" ]; then
-            echo "CPU_ARCH=arm64" >> $GITHUB_ENV
-          elif [ "$(uname -m)" == "x86_64" ]; then
-            echo "CPU_ARCH=amd64" >> $GITHUB_ENV
-          else
-            echo "Unsupported architecture" >&2
-            exit 1
-          fi
+          echo "GITHUB_TAG_MAJOR_VERSION=${{ inputs.version }}" >> ${GITHUB_ENV}
 
       - name: Create Release Tag
         shell: bash

Makefile

@@ -293,12 +293,12 @@ start-v2-test: zetanode
 ifdef UPGRADE_TEST_FROM_SOURCE
 zetanode-upgrade: zetanode
 	@echo "Building zetanode-upgrade from source"
-	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source --build-arg OLD_VERSION='release/v18' .
+	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source --build-arg OLD_VERSION='release/v19' .
 .PHONY: zetanode-upgrade
 else
 zetanode-upgrade: zetanode
 	@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/v18.0.0' .
+	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime --build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v19.1.1' .
 .PHONY: zetanode-upgrade
 endif
 

app/setup_handlers.go

@@ -3,106 +3,22 @@ package app
 import (
 	"os"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
-	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	"golang.org/x/exp/slices"
-
-	"github.com/zeta-chain/zetacore/pkg/constant"
-	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
-	emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
+const releaseVersion = "v20"
+
 func SetupHandlers(app *App) {
-	// Set param key table for params module migration
-	for _, subspace := range app.ParamsKeeper.GetSubspaces() {
-		var keyTable paramstypes.KeyTable
-		switch subspace.Name() {
-		case authtypes.ModuleName:
-			keyTable = authtypes.ParamKeyTable() //nolint:staticcheck
-		case banktypes.ModuleName:
-			keyTable = banktypes.ParamKeyTable() //nolint:staticcheck
-		case stakingtypes.ModuleName:
-			keyTable = stakingtypes.ParamKeyTable()
-		case distrtypes.ModuleName:
-			keyTable = distrtypes.ParamKeyTable() //nolint:staticcheck
-		case slashingtypes.ModuleName:
-			keyTable = slashingtypes.ParamKeyTable() //nolint:staticcheck
-		case govtypes.ModuleName:
-			keyTable = govv1.ParamKeyTable() //nolint:staticcheck
-		case crisistypes.ModuleName:
-			keyTable = crisistypes.ParamKeyTable() //nolint:staticcheck
-		case emissionstypes.ModuleName:
-			keyTable = emissionstypes.ParamKeyTable()
-		default:
-			continue
-		}
-		if !subspace.HasKeyTable() {
-			subspace.WithKeyTable(keyTable)
-		}
-	}
-	baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
-	needsForcedMigration := []string{
-		authtypes.ModuleName,
-		banktypes.ModuleName,
-		stakingtypes.ModuleName,
-		distrtypes.ModuleName,
-		slashingtypes.ModuleName,
-		govtypes.ModuleName,
-		crisistypes.ModuleName,
-		emissionstypes.ModuleName,
-		authoritytypes.ModuleName,
-		observertypes.ModuleName,
-	}
 	allUpgrades := upgradeTracker{
 		upgrades: []upgradeTrackerItem{
-			{
-				index: 1714664193,
-				storeUpgrade: &storetypes.StoreUpgrades{
-					Added: []string{consensustypes.ModuleName, crisistypes.ModuleName},
-				},
-				upgradeHandler: func(ctx sdk.Context, vm module.VersionMap) (module.VersionMap, error) {
-					// Migrate Tendermint consensus parameters from x/params module to a dedicated x/consensus module
-					// https://docs.cosmos.network/main/build/migrations/upgrading#xconsensus
-					baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper)
-
-					// empty version map happens when upgrading from old versions which did not correctly call
-					// app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) in InitChainer.
-					// we must populate the version map if we detect this scenario
-					//
-					// this will only happen on the first upgrade. mainnet and testnet will not require this condition.
-					if len(vm) == 0 {
-						for m, mb := range app.mm.Modules {
-							if module, ok := mb.(module.HasConsensusVersion); ok {
-								if slices.Contains(needsForcedMigration, m) {
-									vm[m] = module.ConsensusVersion() - 1
-								} else {
-									vm[m] = module.ConsensusVersion()
-								}
-							}
-						}
-					}
-					return vm, nil
-				},
-			},
 			// 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: 1715624665,
+			//	index: <CURRENT TIMESTAMP>,
 			//	storeUpgrade: &storetypes.StoreUpgrades{
 			//		Added: []string{
 			//			capabilitytypes.ModuleName,
@@ -112,7 +28,7 @@ func SetupHandlers(app *App) {
 			//	},
 			//},
 			//{
-			//	index: 1715707436,
+			//	index: <CURRENT TIMESTAMP>,
 			//	storeUpgrade: &storetypes.StoreUpgrades{
 			//		Added: []string{ibccrosschaintypes.ModuleName},
 			//	},
@@ -135,9 +51,9 @@ func SetupHandlers(app *App) {
 	}
 
 	app.UpgradeKeeper.SetUpgradeHandler(
-		constant.Version,
+		releaseVersion,
 		func(ctx sdk.Context, _ types.Plan, vm module.VersionMap) (module.VersionMap, error) {
-			app.Logger().Info("Running upgrade handler for " + constant.Version)
+			app.Logger().Info("Running upgrade handler for " + releaseVersion)
 
 			var err error
 			for _, upgradeHandler := range upgradeHandlerFns {
@@ -155,7 +71,7 @@ func SetupHandlers(app *App) {
 	if err != nil {
 		panic(err)
 	}
-	if upgradeInfo.Name == constant.Version && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+	if upgradeInfo.Name == releaseVersion && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		// Use upgrade store loader for the initial loading of all stores when app starts,
 		// it checks if version == upgradeHeight and applies store upgrades before loading the stores,
 		// so that new stores start with the correct version (the current height of chain),

changelog.md

@@ -19,6 +19,7 @@
 ### Refactor
 
 * [2615](https://github.com/zeta-chain/node/pull/2615) - Refactor cleanup of outbound trackers
+* [2855](https://github.com/zeta-chain/node/pull/2855) - disable Bitcoin witness support for mainnet
 
 ### Tests
 

contrib/localnet/scripts/import-data.sh

@@ -10,6 +10,6 @@ echo "NETWORK: ${NETWORK}"
 rm -rf ~/.zetacored/genesis_data
 mkdir -p ~/.zetacored/genesis_data
 echo "Download Latest State Export"
-LATEST_EXPORT_URL=$(curl https://snapshots.zetachain.com/latest-state-export | jq -r ."${NETWORK}")
+LATEST_EXPORT_URL=$(curl https://snapshots.rpc.zetachain.com/${NETWORK}/state/latest.json | jq -r '.snapshots[0].link')
 echo "LATEST EXPORT URL: ${LATEST_EXPORT_URL}"
 wget -q ${LATEST_EXPORT_URL} -O ~/.zetacored/genesis_data/exported-genesis.json

contrib/localnet/scripts/start-upgrade-orchestrator.sh

@@ -39,7 +39,7 @@ fi
 # get new zetacored version
 curl -L -o /tmp/zetacored.new "${ZETACORED_URL}"
 chmod +x /tmp/zetacored.new
-UPGRADE_NAME=$(/tmp/zetacored.new version)
+UPGRADE_NAME="v20"
 
 # if explicit upgrade height not provided, use dumb estimator
 if [[ -z $UPGRADE_HEIGHT ]]; then

go.mod

@@ -366,4 +366,4 @@ replace github.com/evmos/ethermint => github.com/zeta-chain/ethermint v0.0.0-202
 
 replace github.com/libp2p/go-libp2p => github.com/zeta-chain/go-libp2p v0.0.0-20240710192637-567fbaacc2b4
 
-replace gitlab.com/thorchain/tss/go-tss => github.com/zeta-chain/go-tss v0.0.0-20240729195411-9f5ae8189449
+replace gitlab.com/thorchain/tss/go-tss => github.com/zeta-chain/go-tss v0.0.0-20240907163312-b576693642e0

go.sum

@@ -1669,8 +1669,8 @@ github.com/zeta-chain/ethermint v0.0.0-20240910000510-6248efa8bc4f h1:de8f21SSof
 github.com/zeta-chain/ethermint v0.0.0-20240910000510-6248efa8bc4f/go.mod h1:s1zA6OpXv3Tb5I0M6M6j5fo/AssaZL/pgkc7G0W2kN8=
 github.com/zeta-chain/go-libp2p v0.0.0-20240710192637-567fbaacc2b4 h1:FmO3HfVdZ7LzxBUfg6sVzV7ilKElQU2DZm8PxJ7KcYI=
 github.com/zeta-chain/go-libp2p v0.0.0-20240710192637-567fbaacc2b4/go.mod h1:TBv5NY/CqWYIfUstXO1fDWrt4bDoqgCw79yihqBspg8=
-github.com/zeta-chain/go-tss v0.0.0-20240729195411-9f5ae8189449 h1:4U+4g2QQjbrmeLU1ZdCDU6CYsE5kbwMOKZ/PACR/vN8=
-github.com/zeta-chain/go-tss v0.0.0-20240729195411-9f5ae8189449/go.mod h1:LN1IBRN8xQkKgdgLhl5BDGZyPm70QOTbVLejdS2FVpo=
+github.com/zeta-chain/go-tss v0.0.0-20240907163312-b576693642e0 h1:OMuw0XgFcX0RQ8+B3gtreV4H/JPglCSfG2PfVi7bONM=
+github.com/zeta-chain/go-tss v0.0.0-20240907163312-b576693642e0/go.mod h1:LN1IBRN8xQkKgdgLhl5BDGZyPm70QOTbVLejdS2FVpo=
 github.com/zeta-chain/keystone/keys v0.0.0-20231105174229-903bc9405da2 h1:gd2uE0X+ZbdFJ8DubxNqLbOVlCB12EgWdzSNRAR82tM=
 github.com/zeta-chain/keystone/keys v0.0.0-20231105174229-903bc9405da2/go.mod h1:x7Bkwbzt2W2lQfjOirnff0Dj+tykdbTG1FMJPVPZsvE=
 github.com/zeta-chain/protocol-contracts v1.0.2-athens3.0.20240819143729-b8229cd7b410 h1:sBeVX63s/qmfT1KnIKj1Y2SK3PsFpAM/P49ODcD1CN8=