Merge branch 'develop' into test-remove-usdt-mentions-from-e2e-tests

zeta-chain · Mar 7, 2024 · b451a00 · b451a00
2 parents 739d543 + 09f99eb
commit b451a00
Show file tree

Hide file tree

Showing 14 changed files with 1,239 additions and 376 deletions.
diff --git a/changelog.md b/changelog.md
@@ -62,6 +62,7 @@
 * [1766](https://github.com/zeta-chain/node/pull/1766) - Refactors the `PostTxProcessing` EVM hook functionality to deal with invalid withdraw events
 * [1630](https://github.com/zeta-chain/node/pull/1630) - added password prompts for hotkey and tss keyshare in zetaclient
 * [1760](https://github.com/zeta-chain/node/pull/1760) - Make staking keeper private in crosschain module
+* [1809](https://github.com/zeta-chain/node/pull/1809) - Refactored tryprocessout function in evm signer
 
 ### Fixes
 

diff --git a/zetaclient/bitcoin/bitcoin_client_test.go b/zetaclient/bitcoin/bitcoin_client_test.go
@@ -19,13 +19,14 @@ import (
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"github.com/zeta-chain/zetacore/zetaclient/testutils"
+	"github.com/zeta-chain/zetacore/zetaclient/testutils/stub"
 )
 
 func MockBTCClientMainnet() *BTCChainClient {
 	return &BTCChainClient{
 		chain:      common.BtcMainnetChain(),
-		zetaClient: testutils.MockCoreBridge(),
-		Tss:        testutils.NewMockTSSMainnet(),
+		zetaClient: stub.NewZetaCoreBridge(),
+		Tss:        stub.NewTSSMainnet(),
 	}
 }
 

diff --git a/zetaclient/config/types.go b/zetaclient/config/types.go
@@ -82,7 +82,8 @@ type Config struct {
 
 func NewConfig() *Config {
 	return &Config{
-		cfgLock: &sync.RWMutex{},
+		cfgLock:         &sync.RWMutex{},
+		EVMChainConfigs: make(map[int64]*EVMConfig),
 	}
 }