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

…aclient-evm-index-by-nonce
zeta-chain · Aug 30, 2024 · 8664efc · 8664efc
2 parents e787e70 + b516a46
commit 8664efc
Show file tree

Hide file tree

Showing 1,145 changed files with 9,488 additions and 6,418 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -13,46 +13,10 @@ on:
     - cron: "0 6 * * *"
   workflow_dispatch:
     inputs:
-      default-test:
-        type: boolean
-        required: false
-        default: false
-      upgrade-light-test:
-        type: boolean
-        required: false
-        default: false
-      upgrade-test:
-        type: boolean
-        required: false
-        default: false
-      admin-test:
-        type: boolean
-        required: false
-        default: false
-      upgrade-import-mainnet-test:
-        type: boolean
-        required: false
-        default: false
-      performance-test:
-        type: boolean
-        required: false
-        default: false
-      stateful-data-test:
-        type: boolean
-        required: false
-        default: false
-      tss-migration-test:
-        type: boolean
-        required: false
-        default: false
-      solana-test:
-        type: boolean
-        required: false
-        default: false
-      v2-test:
-        type: boolean
-        required: false
-        default: false
+      make-targets:
+        description: 'Comma separated list of make targets to run (without the start- prefix)'
+        required: true
+        default: ''
 
 concurrency: 
   group: e2e-${{ github.head_ref || github.sha }}
@@ -74,6 +38,7 @@ jobs:
       TSS_MIGRATION_TESTS: ${{ steps.matrix-conditionals.outputs.TSS_MIGRATION_TESTS }}
       SOLANA_TESTS: ${{ steps.matrix-conditionals.outputs.SOLANA_TESTS }}
       V2_TESTS: ${{ steps.matrix-conditionals.outputs.V2_TESTS }}
+      V2_MIGRATION_TESTS: ${{ steps.matrix-conditionals.outputs.V2_MIGRATION_TESTS }}
     steps:
       # use api rather than event context to avoid race conditions (label added after push)
       - id: matrix-conditionals
@@ -98,6 +63,7 @@ jobs:
               core.setOutput('TSS_MIGRATION_TESTS', labels.includes('TSS_MIGRATION_TESTS'));
               core.setOutput('SOLANA_TESTS', labels.includes('SOLANA_TESTS'));
               core.setOutput('V2_TESTS', labels.includes('V2_TESTS')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('V2_MIGRATION_TESTS', labels.includes('V2_MIGRATION_TESTS')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
             } else if (context.eventName === 'merge_group') {
               core.setOutput('DEFAULT_TESTS', true);
               core.setOutput('UPGRADE_LIGHT_TESTS', true);
@@ -112,6 +78,7 @@ jobs:
               core.setOutput('PERFORMANCE_TESTS', true);
               core.setOutput('STATEFUL_DATA_TESTS', true);
               core.setOutput('V2_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('V2_MIGRATION_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
             } else if (context.eventName === 'schedule') {
               core.setOutput('DEFAULT_TESTS', true);
               core.setOutput('UPGRADE_TESTS', true);
@@ -123,17 +90,20 @@ jobs:
               core.setOutput('TSS_MIGRATION_TESTS', true);
               core.setOutput('SOLANA_TESTS', true);
               core.setOutput('V2_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('V2_MIGRATION_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
             } else if (context.eventName === 'workflow_dispatch') {
-              core.setOutput('DEFAULT_TESTS', context.payload.inputs['default-test']);
-              core.setOutput('UPGRADE_TESTS', context.payload.inputs['upgrade-test']);
-              core.setOutput('UPGRADE_LIGHT_TESTS', context.payload.inputs['upgrade-light-test']);
-              core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', context.payload.inputs['upgrade-import-mainnet-test']);
-              core.setOutput('ADMIN_TESTS', context.payload.inputs['admin-test']);
-              core.setOutput('PERFORMANCE_TESTS', context.payload.inputs['performance-test']);
-              core.setOutput('STATEFUL_DATA_TESTS', context.payload.inputs['stateful-data-test']);
-              core.setOutput('TSS_MIGRATION_TESTS', context.payload.inputs['tss-migration-test']);
-              core.setOutput('SOLANA_TESTS', context.payload.inputs['solana-test']);
-              core.setOutput('V2_TESTS', context.payload.inputs['v2-test']); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              const makeTargets = context.payload.inputs['make-targets'].split(',');
+              core.setOutput('DEFAULT_TESTS', makeTargets.includes('default-test'));
+              core.setOutput('UPGRADE_TESTS', makeTargets.includes('upgrade-test'));
+              core.setOutput('UPGRADE_LIGHT_TESTS', makeTargets.includes('upgrade-test-light'));
+              core.setOutput('UPGRADE_IMPORT_MAINNET_TESTS', makeTargets.includes('upgrade-import-mainnet-test'));
+              core.setOutput('ADMIN_TESTS', makeTargets.includes('admin-test'));
+              core.setOutput('PERFORMANCE_TESTS', makeTargets.includes('performance-test'));
+              core.setOutput('STATEFUL_DATA_TESTS', makeTargets.includes('import-mainnet-test'));
+              core.setOutput('TSS_MIGRATION_TESTS', makeTargets.includes('tss-migration-test'));
+              core.setOutput('SOLANA_TESTS', makeTargets.includes('solana-test'));
+              core.setOutput('V2_TESTS', makeTargets.includes('v2-test')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('V2_MIGRATION_TESTS', makeTargets.includes('v2-migration-test')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
             }
 
   e2e:
@@ -175,6 +145,9 @@ jobs:
           - make-target: "start-v2-test"
             runs-on: ubuntu-20.04
             run: ${{ needs.matrix-conditionals.outputs.V2_TESTS == 'true' }}
+          - make-target: "start-upgrade-v2-migration-test"
+            runs-on: ubuntu-20.04
+            run: ${{ needs.matrix-conditionals.outputs.V2_MIGRATION_TESTS == 'true' }}
     name: ${{ matrix.make-target }}
     uses: ./.github/workflows/reusable-e2e.yml
     with:

diff --git a/.github/workflows/generate-files.yml b/.github/workflows/generate-files.yml
@@ -18,6 +18,10 @@ jobs:
         run: |
           echo "$HOME/go/bin" >> $GITHUB_PATH
 
+      - name: Install solc-select
+        run: |
+          pip3 install solc-select
+
       - name: Generate Go code, docs and specs
         env:
           TEST_ENV: ${{ github.workspace }}

diff --git a/.golangci.yml b/.golangci.yml
@@ -44,7 +44,7 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/zeta-chain/zetacore)
+      - prefix(github.com/zeta-chain/node)
     skip-generated: true
 
 issues:

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -54,10 +54,10 @@ builds:
       - -X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd
       - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
       - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .FullCommit }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored
-      - -X github.com/zeta-chain/zetacore/pkg/constant.Version={{ .Version }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.CommitHash={{ .FullCommit }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
+      - -X github.com/zeta-chain/node/pkg/constant.Name=zetacored
+      - -X github.com/zeta-chain/node/pkg/constant.Version={{ .Version }}
+      - -X github.com/zeta-chain/node/pkg/constant.CommitHash={{ .FullCommit }}
+      - -X github.com/zeta-chain/node/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
       - -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb
 
   - id: "zetaclientd"

diff --git a/Dockerfile-localnet b/Dockerfile-localnet
@@ -24,7 +24,7 @@ RUN --mount=type=cache,target="/root/.cache/go-build" make install
 RUN --mount=type=cache,target="/root/.cache/go-build" make install-zetae2e
 
 FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS cosmovisor-build
-RUN go install cosmossdk.io/tools/cosmovisor/cmd/cosmovisor@v1.5.0
+RUN go install cosmossdk.io/tools/cosmovisor/cmd/cosmovisor@v1.6.0
 
 FROM ghcr.io/zeta-chain/golang:1.22.5-bookworm AS base-runtime
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 .PHONY: build
 
+PACKAGE_NAME := github.com/zeta-chain/node
 VERSION := $(shell ./version.sh)
 COMMIT := $(shell [ -z "${COMMIT_ID}" ] && git log -1 --format='%H' || echo ${COMMIT_ID} )
 BUILDTIME := $(shell date -u +"%Y%m%d.%H%M%S" )
@@ -8,22 +9,24 @@ DOCKER ?= docker
 # useful for setting profiles
 DOCKER_COMPOSE ?= $(DOCKER) compose $(COMPOSE_ARGS)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
-GOFLAGS:=""
+GOFLAGS := ""
+GOLANG_CROSS_VERSION ?= v1.22.4
+GOPATH ?= '$(HOME)/go'
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \
 	-X github.com/cosmos/cosmos-sdk/version.ServerName=zetacored \
 	-X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd \
 	-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 	-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored \
-	-X github.com/zeta-chain/zetacore/pkg/constant.Version=$(VERSION) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.CommitHash=$(COMMIT) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.BuildTime=$(BUILDTIME) \
+	-X github.com/zeta-chain/node/pkg/constant.Name=zetacored \
+	-X github.com/zeta-chain/node/pkg/constant.Version=$(VERSION) \
+	-X github.com/zeta-chain/node/pkg/constant.CommitHash=$(COMMIT) \
+	-X github.com/zeta-chain/node/pkg/constant.BuildTime=$(BUILDTIME) \
 	-X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb
 
 BUILD_FLAGS := -ldflags '$(ldflags)' -tags pebbledb,ledger
 
-TEST_DIR?="./..."
+TEST_DIR ?= "./..."
 TEST_BUILD_FLAGS := -tags pebbledb,ledger
 HSM_BUILD_FLAGS := -tags pebbledb,ledger,hsm_test
 
@@ -53,11 +56,11 @@ go.sum: go.mod
 ###                             Test commands                               ###
 ###############################################################################
 
+test: clean-test-dir run-test
+
 run-test:
 	@go test ${TEST_BUILD_FLAGS} ${TEST_DIR}
 
-test :clean-test-dir run-test
-
 test-hsm:
 	@go test ${HSM_BUILD_FLAGS} ${TEST_DIR}
 
@@ -199,8 +202,13 @@ mocks:
 	@bash ./scripts/mocks-generate.sh
 .PHONY: mocks
 
+precompiles:
+	@echo "--> Generating bindings for precompiled contracts"
+	@bash ./scripts/bindings-stateful-precompiles.sh
+.PHONY: precompiles
+
 # generate also includes Go code formatting
-generate: proto-gen openapi specs typescript docs-zetacored mocks fmt
+generate: proto-gen openapi specs typescript docs-zetacored mocks precompiles fmt
 .PHONY: generate
 
 
@@ -294,7 +302,6 @@ zetanode-upgrade: zetanode
 .PHONY: zetanode-upgrade
 endif
 
-
 start-upgrade-test: zetanode-upgrade
 	@echo "--> Starting upgrade test"
 	export LOCALNET_MODE=upgrade && \
@@ -307,14 +314,23 @@ start-upgrade-test-light: zetanode-upgrade
 	export UPGRADE_HEIGHT=90 && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose.yml -f docker-compose-upgrade.yml up -d
 
-
 start-upgrade-test-admin: zetanode-upgrade
 	@echo "--> Starting admin upgrade test"
 	export LOCALNET_MODE=upgrade && \
 	export UPGRADE_HEIGHT=90 && \
 	export E2E_ARGS="--skip-regular --test-admin" && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose.yml -f docker-compose-upgrade.yml up -d
 
+# this test upgrades from v18 and execute the v2 contracts migration process
+# this tests is part of upgrade test part because it should run the upgrade from v18 to fully replicate the upgrade process
+start-upgrade-v2-migration-test: zetanode-upgrade
+	@echo "--> Starting v2 migration upgrade test"
+	export LOCALNET_MODE=upgrade && \
+	export UPGRADE_HEIGHT=90 && \
+	export E2E_ARGS="--test-v2-migration" && \
+	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose.yml -f docker-compose-upgrade.yml up -d
+
+
 start-upgrade-import-mainnet-test: zetanode-upgrade
 	@echo "--> Starting import-data upgrade test"
 	export LOCALNET_MODE=upgrade && \
@@ -327,9 +343,6 @@ start-upgrade-import-mainnet-test: zetanode-upgrade
 ###                                GoReleaser  		                        ###
 ###############################################################################
 
-PACKAGE_NAME          := github.com/zeta-chain/node
-GOLANG_CROSS_VERSION  ?= v1.22.4
-GOPATH ?= '$(HOME)/go'
 release-dry-run:
 	docker run \
 		--rm \

diff --git a/app/ante/ante.go b/app/ante/ante.go
@@ -12,7 +12,7 @@
 // GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with the Ethermint library. If not, see https://github.com/evmos/ethermint/blob/main/LICENSE
+// along with the Ethermint library. If not, see https://github.com/zeta-chain/ethermint/blob/main/LICENSE
 package ante
 
 import (
@@ -27,8 +27,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
+	crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
+	observertypes "github.com/zeta-chain/node/x/observer/types"
 )
 
 func ValidateHandlerOptions(options HandlerOptions) error {

diff --git a/app/ante/ante_test.go b/app/ante/ante_test.go
@@ -9,11 +9,11 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/app"
-	"github.com/zeta-chain/zetacore/app/ante"
-	"github.com/zeta-chain/zetacore/testutil/sample"
-	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
-	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
+	"github.com/zeta-chain/node/app"
+	"github.com/zeta-chain/node/app/ante"
+	"github.com/zeta-chain/node/testutil/sample"
+	crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
+	observertypes "github.com/zeta-chain/node/x/observer/types"
 )
 
 var _ sdk.AnteHandler = (&MockAnteHandler{}).AnteHandle

diff --git a/app/ante/fees.go b/app/ante/fees.go
@@ -12,7 +12,7 @@
 // GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with the Ethermint library. If not, see https://github.com/evmos/ethermint/blob/main/LICENSE
+// along with the Ethermint library. If not, see https://github.com/zeta-chain/ethermint/blob/main/LICENSE
 
 // Copyright 2023 ZetaChain
 // modified to exclude gentx transaction type from the min gas price check
@@ -26,7 +26,7 @@ import (
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
+	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 )
 
 var (

diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go
@@ -12,7 +12,7 @@
 // GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with the Ethermint library. If not, see https://github.com/evmos/ethermint/blob/main/LICENSE
+// along with the Ethermint library. If not, see https://github.com/zeta-chain/ethermint/blob/main/LICENSE
 
 package ante
 
@@ -29,11 +29,11 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-	ethante "github.com/evmos/ethermint/app/ante"
-	ethermint "github.com/evmos/ethermint/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
+	ethante "github.com/zeta-chain/ethermint/app/ante"
+	ethermint "github.com/zeta-chain/ethermint/types"
+	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
 
-	observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
+	observerkeeper "github.com/zeta-chain/node/x/observer/keeper"
 )
 
 type HandlerOptions struct {

diff --git a/app/ante/interfaces.go b/app/ante/interfaces.go
@@ -12,7 +12,7 @@
 // GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with the Ethermint library. If not, see https://github.com/evmos/ethermint/blob/main/LICENSE
+// along with the Ethermint library. If not, see https://github.com/zeta-chain/ethermint/blob/main/LICENSE
 
 package ante
 
@@ -24,10 +24,9 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/evmos/ethermint/x/evm/statedb"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
-	evm "github.com/evmos/ethermint/x/evm/vm"
-	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
+	"github.com/zeta-chain/ethermint/x/evm/statedb"
+	evmtypes "github.com/zeta-chain/ethermint/x/evm/types"
+	feemarkettypes "github.com/zeta-chain/ethermint/x/feemarket/types"
 )
 
 // DynamicFeeEVMKeeper is a subset of EVMKeeper interface that supports dynamic fee checker
@@ -42,7 +41,7 @@ type EVMKeeper interface {
 	statedb.Keeper
 	DynamicFeeEVMKeeper
 
-	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) evm.EVM
+	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) *vm.EVM
 	DeductTxCostsFromUserBalance(ctx sdk.Context, fees sdk.Coins, from common.Address) error
 	GetBalance(ctx sdk.Context, addr common.Address) *big.Int
 	ResetTransientGasUsed(ctx sdk.Context)

diff --git a/app/ante/system_tx_priority_decorator_test.go b/app/ante/system_tx_priority_decorator_test.go
@@ -10,9 +10,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/app"
-	"github.com/zeta-chain/zetacore/app/ante"
-	"github.com/zeta-chain/zetacore/testutil/sample"
+	"github.com/zeta-chain/node/app"
+	"github.com/zeta-chain/node/app/ante"
+	"github.com/zeta-chain/node/testutil/sample"
 )
 
 func TestSystemTxPriorityDecorator_AnteHandle(t *testing.T) {