From 1923bce06fa28832ef0d0726abb51adb3e667763 Mon Sep 17 00:00:00 2001 From: brewmaster012 <> Date: Fri, 21 Jul 2023 17:55:49 -0500 Subject: [PATCH 1/4] temporary fix: detect target chain id mismatch and reject --- zetaclient/zetacore_observer.go | 4 ++++ 1 file changed, 4 insertions(+) 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) From aeb76ec4b5e41a50864b4e60efd4255e2b246ade Mon Sep 17 00:00:00 2001 From: kevinssgh Date: Mon, 24 Jul 2023 11:20:02 -0400 Subject: [PATCH 2/4] include patch for increased resource limits in go-tss lib --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index db669ea35a..fa4009d36d 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-20230724151211-040b021ef778 ) diff --git a/go.sum b/go.sum index 58f0ca8904..64dd14e050 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-20230724151211-040b021ef778 h1:ci2dMMLoiRqhc7hUkbAiWGHQSvc1izfJv1ZVL+Av4Fs= +github.com/brewmaster012/go-tss v0.0.0-20230724151211-040b021ef778/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= From 8a92e72402324be1c45c7a7e22fb56f15af3e73d Mon Sep 17 00:00:00 2001 From: kevinssgh Date: Mon, 24 Jul 2023 11:31:48 -0400 Subject: [PATCH 3/4] update patch for increased resource limits in go-tss lib --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa4009d36d..423af88210 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-20230724151211-040b021ef778 + gitlab.com/thorchain/tss/go-tss => github.com/brewmaster012/go-tss v0.0.0-20230724153007-064d87811f60 ) diff --git a/go.sum b/go.sum index 64dd14e050..17751649d9 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-20230724151211-040b021ef778 h1:ci2dMMLoiRqhc7hUkbAiWGHQSvc1izfJv1ZVL+Av4Fs= -github.com/brewmaster012/go-tss v0.0.0-20230724151211-040b021ef778/go.mod h1:RYOe4ihG8KkoQQhW6ljiyxyW6F3CoZA3ozyyEb5HVmI= +github.com/brewmaster012/go-tss v0.0.0-20230724153007-064d87811f60 h1:vVjLtEzL/QGtNwzwFu6IjWVyKyVJamKZDrJhlmhQf5A= +github.com/brewmaster012/go-tss v0.0.0-20230724153007-064d87811f60/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= From 54a0bcd8f11535013c2f75e6972b04021ac5ce9f Mon Sep 17 00:00:00 2001 From: kevinssgh Date: Tue, 25 Jul 2023 11:09:50 -0400 Subject: [PATCH 4/4] update commit hash for go-tss lib --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 423af88210..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-20230724153007-064d87811f60 + 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 17751649d9..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-20230724153007-064d87811f60 h1:vVjLtEzL/QGtNwzwFu6IjWVyKyVJamKZDrJhlmhQf5A= -github.com/brewmaster012/go-tss v0.0.0-20230724153007-064d87811f60/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=