more manual upgrades

.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:

.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"

Makefile

@@ -18,10 +18,10 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \
 	-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

app/app.go

@@ -127,9 +127,9 @@ import (
 // ibctypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 // ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 // ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-// "github.com/zeta-chain/zetacore/x/ibccrosschain"
-// ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper"
-// ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
+// "github.com/zeta-chain/node/x/ibccrosschain"
+// ibccrosschainkeeper "github.com/zeta-chain/node/x/ibccrosschain/keeper"
+// ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types"
 
 const Name = "zetacore"
 

proto/zetachain/zetacore/authority/authorization.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.authority;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/authority/policies.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Authorization defines the authorization required to access use a message
 // which needs special permissions

proto/zetachain/zetacore/authority/chain_info.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.authority;
 import "zetachain/zetacore/pkg/chains/chains.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // ChainInfo contains static information about the chains
 // This structure is used to dynamically update these info on a live network

proto/zetachain/zetacore/authority/genesis.proto

@@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/authorization.proto";
 import "zetachain/zetacore/authority/chain_info.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // GenesisState defines the authority module's genesis state.
 message GenesisState {

proto/zetachain/zetacore/authority/policies.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.authority;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // PolicyType defines the type of policy
 enum PolicyType {

proto/zetachain/zetacore/authority/query.proto

@@ -8,7 +8,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/zetachain/zetacore/authority/tx.proto

@@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/chain_info.proto";
 import "zetachain/zetacore/authority/authorization.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Msg defines the Msg service.
 service Msg {

proto/zetachain/zetacore/crosschain/cross_chain_tx.proto

@@ -6,7 +6,7 @@ import "zetachain/zetacore/pkg/coin/coin.proto";
 
 // TODO : fix the descriptor numbers for the fields
 //  https://github.com/zeta-chain/node/issues/1951
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 enum CctxStatus {
   option (gogoproto.goproto_enum_stringer) = true;

proto/zetachain/zetacore/crosschain/events.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message EventInboundFinalized {
   string msg_type_url = 1;

proto/zetachain/zetacore/crosschain/gas_price.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message GasPrice {
   string creator = 1;

proto/zetachain/zetacore/crosschain/genesis.proto

@@ -10,7 +10,7 @@ import "zetachain/zetacore/crosschain/outbound_tracker.proto";
 import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // GenesisState defines the crosschain module's genesis state.
 message GenesisState {

proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message InboundHashToCctx {
   string inbound_hash = 1;

proto/zetachain/zetacore/crosschain/inbound_tracker.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain;
 
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message InboundTracker {
   int64 chain_id = 1;

proto/zetachain/zetacore/crosschain/last_block_height.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message LastBlockHeight {
   string creator = 1;

proto/zetachain/zetacore/crosschain/outbound_tracker.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message TxHash {
   string tx_hash = 1;

proto/zetachain/zetacore/crosschain/query.proto

@@ -12,7 +12,7 @@ import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.crosschain;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message RateLimiterFlags {
   bool enabled = 1;

proto/zetachain/zetacore/crosschain/tx.proto

@@ -8,7 +8,7 @@ import "zetachain/zetacore/pkg/proofs/proofs.proto";
 import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "zetachain/zetacore/crosschain/cross_chain_tx.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // Msg defines the Msg service.
 service Msg {

proto/zetachain/zetacore/emissions/events.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 enum EmissionType {
   option (gogoproto.goproto_enum_stringer) = true;

proto/zetachain/zetacore/emissions/genesis.proto

@@ -5,7 +5,7 @@ import "zetachain/zetacore/emissions/params.proto";
 import "zetachain/zetacore/emissions/withdrawable_emissions.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // GenesisState defines the emissions module's genesis state.
 message GenesisState {

proto/zetachain/zetacore/emissions/params.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Params defines the parameters for the module.
 message Params {

proto/zetachain/zetacore/emissions/query.proto

@@ -6,7 +6,7 @@ import "zetachain/zetacore/emissions/params.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/zetachain/zetacore/emissions/tx.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.emissions;
 import "zetachain/zetacore/emissions/params.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Msg defines the Msg service.
 service Msg {

proto/zetachain/zetacore/emissions/withdrawable_emissions.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 message WithdrawableEmissions {
   string address = 1;

proto/zetachain/zetacore/fungible/events.proto

@@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/tx.proto";
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message EventSystemContractUpdated {
   string msg_type_url = 1;

proto/zetachain/zetacore/fungible/foreign_coins.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.fungible;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message ForeignCoins {
   //  string index = 1;

proto/zetachain/zetacore/fungible/genesis.proto

@@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/foreign_coins.proto";
 import "zetachain/zetacore/fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // GenesisState defines the fungible module's genesis state.
 message GenesisState {

proto/zetachain/zetacore/fungible/query.proto

@@ -7,7 +7,7 @@ import "zetachain/zetacore/fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/zetachain/zetacore/fungible/system_contract.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.fungible;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message SystemContract {
   string system_contract = 1;

proto/zetachain/zetacore/fungible/tx.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.fungible;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // Msg defines the Msg service.
 service Msg {

proto/zetachain/zetacore/ibccrosschain/genesis.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // GenesisState defines the ibccrosschain module's genesis state.
 message GenesisState {}

proto/zetachain/zetacore/ibccrosschain/query.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.ibccrosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // Query defines the gRPC querier service.
 service Query {}

proto/zetachain/zetacore/ibccrosschain/tx.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // Msg defines the Msg service.
 service Msg {}

proto/zetachain/zetacore/lightclient/block_header_verification.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // HeaderSupportedChain is a structure containing information of weather a chain
 // is enabled or not for block header verification

proto/zetachain/zetacore/lightclient/chain_state.proto

@@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // ChainState defines the overall state of the block headers for a given chain
 message ChainState {

proto/zetachain/zetacore/lightclient/genesis.proto

@@ -6,7 +6,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto";
 import "zetachain/zetacore/lightclient/chain_state.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // GenesisState defines the lightclient module's genesis state.
 message GenesisState {

proto/zetachain/zetacore/lightclient/query.proto

@@ -8,7 +8,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto";
 import "zetachain/zetacore/lightclient/chain_state.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // Query defines the gRPC querier service.
 service Query {

proto/zetachain/zetacore/lightclient/tx.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.lightclient;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/lightclient/block_header_verification.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // Msg defines the Msg service.
 service Msg {

proto/zetachain/zetacore/observer/ballot.proto

@@ -4,7 +4,7 @@ package zetachain.zetacore.observer;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/observer/observer.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 enum VoteType {
   option (gogoproto.goproto_enum_stringer) = true;