Merge branch 'develop' of https://github.com/zeta-chain/node into fea…

…t-observe-blob-transaction

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
 
@@ -98,6 +99,7 @@
 * Added scripts for the new docker image that facilitate the start up automation.
 * Adjusted the docker pipeline slightly to pull the version on PR from the app.go file.
 * [1781](https://github.com/zeta-chain/node/pull/1781) - add codecov coverage report in CI
+* fixed the download binary script to use relative pathing from binary_list file.
 
 ### Features
 

contrib/docker-scripts/download_binaries.py

@@ -1,11 +1,8 @@
-import re
 import requests
 import os
 import json
 import logging
 import sys
-import shutil
-
 
 # Logger class for easier logging setup
 class Logger:
@@ -22,51 +19,14 @@ def __init__(self):
 # Initialize logger instance
 logger = Logger()
 
-# Define the path where upgrades will be stored, using an environment variable for the base path
-upgrade_path = f'{os.environ["DAEMON_HOME"]}/cosmovisor/upgrades/'
-
-
-# Function to find the latest patch version of a binary based on major and optional minor version
-def find_latest_patch_version(major_version, minor_version=None):
-    # Define a regex pattern to match version directories
-    pattern = re.compile(
-        f"v{major_version}\.{minor_version}\.(\d+)" if minor_version else f"v{major_version}\.0\.(\d+)")
-    # List directories that match the version pattern
-    versions = [folder for folder in os.listdir(upgrade_path) if pattern.match(folder)]
-    if versions:
-        try:
-            # Find the maximum version, assuming it's the latest patch
-            latest_patch_version = max(versions)
-            # Return the path to the binary of the latest patch version
-            return os.path.join(upgrade_path, latest_patch_version, "bin", "zetacored")
-        except ValueError as e:
-            logger.log.error(f"Error finding latest patch version: {e}")
-            return None
-    return None
-
-
-# Function to replace an old binary with a new one
-def replace_binary(source, target):
-    try:
-        # Log deletion of old binary
-        if os.path.exists(target):
-            logger.log.info(f"Deleted old binary: {target}")
-            os.remove(target)
-        # Copy the new binary to the target location
-        shutil.copy(source, target)
-        logger.log.info(f"Binary replaced: {target} -> {source}")
-    except Exception as e:
-        logger.log.error(f"Error replacing binary: {e}")
-
-
 # Parse JSON from an environment variable to get binary download information
 info = json.loads(os.environ["DOWNLOAD_BINARIES"])
 
 try:
     # Iterate over binaries to download
     for binary in info["binaries"]:
         download_link = binary["download_url"]
-        binary_location = binary["binary_location"]
+        binary_location = f'{os.environ["DAEMON_HOME"]}/{binary["binary_location"]}'
         binary_directory = os.path.dirname(binary_location)
         # Log download link
         logger.log.info(f"DOWNLOAD LINK: {download_link}")

zetaclient/bitcoin/bitcoin_client_test.go

@@ -18,13 +18,14 @@ import (
 	"github.com/zeta-chain/zetacore/common"
 	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(),
 	}
 }
 

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),
 	}
 }
 

zetaclient/evm/evm_client.go

@@ -188,7 +188,7 @@ func (ob *ChainClient) WithEvmJSONRPC(client *ethrpc.EthRPC) {
 	ob.evmJSONRPC = client
 }
 
-func (ob *ChainClient) WithZetaClient(bridge *zetabridge.ZetaCoreBridge) {
+func (ob *ChainClient) WithZetaClient(bridge interfaces.ZetaCoreBridger) {
 	ob.Mu.Lock()
 	defer ob.Mu.Unlock()
 	ob.zetaClient = bridge