diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 797e7497a3..1e66f95294 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -440,4 +440,43 @@ jobs: zetacored-ubuntu-20-amd64 zetaclientd-ubuntu-20-amd64 + - name: Determine Release Type + run: | + if [[ "${{ env.BINARY_VERSION }}" =~ ^v[0-9]+\.0\.0+$ ]]; then + echo "RELEASE_TYPE=major" >> ${GITHUB_ENV} + elif [[ "${{ env.BINARY_VERSION }}" =~ ^v[0-9]+\.[0-9]+\.[1-9]+$ ]]; then + echo "RELEASE_TYPE=minor" >> ${GITHUB_ENV} + else + echo "RELEASE_TYPE=unknown" >> ${GITHUB_ENV} + fi + id: determine_release_type + - name: "SEND:DISCORD:MESSAGE" + if: steps.determine_release_type.outputs.RELEASE_TYPE == 'major' + uses: gzukel/CosmosComposites/send_discord_message@main + with: + discord_token: "${{ secrets.DISCORD_TOKEN }}" + discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" + discord_message: | + Hey <@&1122981184255840306>! A new version of the zetachain node has been released. + + Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. + We will raise a governance proposal on Monday at 15:00 UTC with a 12-hour voting period. + The upgrade will be scheduled for Tuesday at approximately 15:00 UTC. + More specific information including block height will be shared on Monday as part of the governance proposal. + + See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} + + # - name: "SEND:DISCORD:MESSAGE" + # if: steps.determine_release_type.outputs.RELEASE_TYPE == 'minor' + # uses: gzukel/CosmosComposites/send_discord_message@main + # with: + # discord_token: "${{ secrets.DISCORD_TOKEN }}" + # discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" + # discord_message: | + # Hey <@&1122981184255840306>! A new version of the zetachain node has been released. + + # Minor Version Upgrade (e.g. v5.0.x to v5.1.x) can be applied without a governance proposal. + # Please review the release notes for any specific upgrade instructions or considerations. + + # See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} \ No newline at end of file diff --git a/go.mod b/go.mod index db669ea35a..295ecad1e8 100644 --- a/go.mod +++ b/go.mod @@ -299,5 +299,5 @@ replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/tendermint/tm-db => github.com/BlockPILabs/cosmos-db v0.0.3 - gitlab.com/thorchain/tss/go-tss => github.com/brewmaster012/go-tss v0.0.0-20230530183945-4ce35ef0f84f + gitlab.com/thorchain/tss/go-tss => github.com/brewmaster012/go-tss v0.0.0-20230724230849-ce080275bbad ) diff --git a/go.sum b/go.sum index 58f0ca8904..110c42679f 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/brewmaster012/go-tss v0.0.0-20230530183945-4ce35ef0f84f h1:/+bYJK9GALvVF3yNxewZ2ohs9H+wvI6pkqqtPtiqXAY= -github.com/brewmaster012/go-tss v0.0.0-20230530183945-4ce35ef0f84f/go.mod h1:RYOe4ihG8KkoQQhW6ljiyxyW6F3CoZA3ozyyEb5HVmI= +github.com/brewmaster012/go-tss v0.0.0-20230724230849-ce080275bbad h1:/Jqi03d/vQ9SXDjubEKYGpv2usH5Ejjrmrdv405UFNo= +github.com/brewmaster012/go-tss v0.0.0-20230724230849-ce080275bbad/go.mod h1:RYOe4ihG8KkoQQhW6ljiyxyW6F3CoZA3ozyyEb5HVmI= github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= diff --git a/zetaclient/zetacore_observer.go b/zetaclient/zetacore_observer.go index dcff12938e..b6e48b0264 100644 --- a/zetaclient/zetacore_observer.go +++ b/zetaclient/zetacore_observer.go @@ -133,6 +133,10 @@ func (co *CoreObserver) startSendScheduler() { } for idx, send := range sendList { + if send.GetCurrentOutTxParam().ReceiverChainId != c.ChainId { + log.Warn().Msgf("mismatch chainid: want %d, got %d", c.ChainId, send.GetCurrentOutTxParam().ReceiverChainId) + continue + } ob, err := co.getTargetChainOb(send) if err != nil { co.logger.ZetaChainWatcher.Error().Err(err).Msgf("getTargetChainOb fail %s", c.ChainName)