Merge branch 'develop' into feat-zetaclient-banned-addresses-e2e-tests

Dockerfile

@@ -16,15 +16,9 @@ RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""
 WORKDIR /go/delivery/zeta-node
 COPY go.mod .
 COPY go.sum .
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    go mod download
+
 RUN go mod download
 COPY . .
-
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install
-#RUN --mount=type=cache,target=/root/.cache/go-build \
-#    make install-zetae2e
 RUN make install
 RUN make install-zetae2e
 #

changelog.md

@@ -2,15 +2,16 @@
 
 ## Unreleased
 
-### Features
-
-* [1789](https://github.com/zeta-chain/node/issues/1789) - block cross-chain transactions that involve restricted addresses
-
 ### Refactor
 
+* [1511](https://github.com/zeta-chain/node/pull/1511) - move ballot voting logic from `crosschain` to `observer`
 * [1783](https://github.com/zeta-chain/node/pull/1783) - refactor zetaclient metrics naming and structure
 * [1774](https://github.com/zeta-chain/node/pull/1774) - split params and config in zetaclient
 
+### Features
+
+* [1789](https://github.com/zeta-chain/node/issues/1789) - block cross-chain transactions that involve restricted addresses
+
 ### Tests
 
 * [1767](https://github.com/zeta-chain/node/pull/1767) - add unit tests for emissions module begin blocker
@@ -22,7 +23,10 @@
 
 ## Version: v13.0.0
 
-* `zetaclientd start` : 2 inputs required from stdin
+### Breaking Changes
+
+* `zetaclientd start`: now requires 2 inputs from stdin: hotkey password and tss keyshare password
+  Starting zetaclient now requires two passwords to be input; one for the hotkey and another for the tss key-share.
 
 ### Features
 
@@ -37,9 +41,9 @@
 *[1728] (https://github.com/zeta-chain/node/pull/1728) - allow aborted transactions to be refunded by minting tokens to zEvm.
 
 ### Refactor
+
 * [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
-  Starting zetaclient now requires two passwords to be input; one for the hotkey and another for the tss key-share.
+* [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
 
 ### Fixes
@@ -55,7 +59,6 @@
 * [1721](https://github.com/zeta-chain/node/issues/1721) - zetaclient should provide bitcoin_chain_id when querying TSS address
 * [1744](https://github.com/zeta-chain/node/pull/1744) - added cmd to encrypt tss keyshare file, allowing empty tss password for backward compatibility.
 
-
 ### Tests
 
 * [1584](https://github.com/zeta-chain/node/pull/1584) - allow to run E2E tests on any networks

common/chain.go

@@ -75,12 +75,17 @@ func (chain Chain) BTCAddressFromWitnessProgram(witnessProgram []byte) (string,
 
 // DecodeAddress decode the address string to bytes
 func (chain Chain) DecodeAddress(addr string) ([]byte, error) {
-	if IsEVMChain(chain.ChainId) {
+	return DecodeAddressFromChainID(chain.ChainId, addr)
+}
+
+// DecodeAddressFromChainID decode the address string to bytes
+func DecodeAddressFromChainID(chainID int64, addr string) ([]byte, error) {
+	if IsEVMChain(chainID) {
 		return ethcommon.HexToAddress(addr).Bytes(), nil
-	} else if IsBitcoinChain(chain.ChainId) {
+	} else if IsBitcoinChain(chainID) {
 		return []byte(addr), nil
 	}
-	return nil, fmt.Errorf("chain (%d) not supported", chain.ChainId)
+	return nil, fmt.Errorf("chain (%d) not supported", chainID)
 }
 
 func IsZetaChain(chainID int64) bool {

testutil/keeper/crosschain.go

@@ -32,7 +32,7 @@ var (
 	CrosschainNoMocks = CrosschainMockOptions{}
 )
 
-// CrosschainKeeper initializes a crosschain keeper for testing purposes with option to mock specific keepers
+// CrosschainKeeperWithMocks initializes a crosschain keeper for testing purposes with option to mock specific keepers
 func CrosschainKeeperWithMocks(
 	t testing.TB,
 	mockOptions CrosschainMockOptions,

testutil/keeper/mocks/mocks.go

@@ -4,6 +4,7 @@ import (
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
 	fungibletypes "github.com/zeta-chain/zetacore/x/fungible/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
 /**
@@ -59,6 +60,10 @@ type FungibleEVMKeeper interface {
 	fungibletypes.EVMKeeper
 }
 
+/**
+ * Emissions Mocks
+ */
+
 //go:generate mockery --name EmissionAccountKeeper --filename account.go --case underscore --output ./emissions
 type EmissionAccountKeeper interface {
 	emissionstypes.AccountKeeper
@@ -78,3 +83,17 @@ type EmissionStakingKeeper interface {
 type EmissionObserverKeeper interface {
 	emissionstypes.ObserverKeeper
 }
+
+/**
+ * Observer Mocks
+ */
+
+//go:generate mockery --name ObserverStakingKeeper --filename staking.go --case underscore --output ./observer
+type ObserverStakingKeeper interface {
+	observertypes.StakingKeeper
+}
+
+//go:generate mockery --name ObserverSlashingKeeper --filename slashing.go --case underscore --output ./observer
+type ObserverSlashingKeeper interface {
+	observertypes.SlashingKeeper
+}