Merge branch 'develop' into fungible-evm-keeper-interface

zeta-chain · Aug 5, 2023 · 38e9132 · 38e9132
2 parents d70fdd4 + b77c02f
commit 38e9132
Show file tree

Hide file tree

Showing 53 changed files with 99 additions and 258 deletions.
diff --git a/app/app.go b/app/app.go
@@ -101,7 +101,6 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 
-	// this line is used by starport scaffolding # stargate/app/moduleImport
 	zetaCoreModule "github.com/zeta-chain/zetacore/x/crosschain"
 	zetaCoreModuleTypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 
@@ -151,8 +150,6 @@ var (
 	Bech32PrefixConsPub = AccountAddressPrefix + sdk.PrefixValidator + sdk.PrefixConsensus + sdk.PrefixPublic
 )
 
-// this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
-
 func getGovProposalHandlers() []govclient.ProposalHandler {
 	var govProposalHandlers []govclient.ProposalHandler
 	govProposalHandlers = append(govProposalHandlers,
@@ -405,7 +402,7 @@ func New(
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.ZetaObserverKeeper,
-		app.FungibleKeeper,
+		&app.FungibleKeeper,
 	)
 	app.GroupKeeper = groupkeeper.NewKeeper(keys[group.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper, group.Config{
 		MaxExecutionPeriod: 2 * time.Hour, // Two hours.
@@ -759,7 +756,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(evmtypes.ModuleName)
 	paramsKeeper.Subspace(feemarkettypes.ModuleName)
 	paramsKeeper.Subspace(group.ModuleName)
-	// this line is used by starport scaffolding # stargate/app/paramSubspace
 	paramsKeeper.Subspace(zetaCoreModuleTypes.ModuleName)
 	paramsKeeper.Subspace(zetaObserverModuleTypes.ModuleName)
 	paramsKeeper.Subspace(fungibleModuleTypes.ModuleName)

diff --git a/cmd/zetacored/root.go b/cmd/zetacored/root.go
@@ -282,7 +282,6 @@ func (ac appCreator) appExport(
 			homePath,
 			uint(1),
 			ac.encCfg,
-			// this line is used by starport scaffolding # stargate/root/exportArgument
 			appOpts,
 		)
 
@@ -299,7 +298,6 @@ func (ac appCreator) appExport(
 			homePath,
 			uint(1),
 			ac.encCfg,
-			// this line is used by starport scaffolding # stargate/root/noHeightExportArgument
 			appOpts,
 		)
 	}

diff --git a/proto/crosschain/genesis.proto b/proto/crosschain/genesis.proto
@@ -9,7 +9,6 @@ import "crosschain/last_block_height.proto";
 import "crosschain/out_tx_tracker.proto";
 import "crosschain/params.proto";
 import "crosschain/tss.proto";
-// this line is used by starport scaffolding # genesis/proto/import
 import "gogoproto/gogo.proto";
 
 option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
@@ -25,6 +24,4 @@ message GenesisState {
 
   repeated LastBlockHeight lastBlockHeightList = 8;
   repeated InTxHashToCctx inTxHashToCctxList = 9 [(gogoproto.nullable) = false];
-
-  // this line is used by starport scaffolding # genesis/proto/state
 }
diff --git a/proto/crosschain/query.proto b/proto/crosschain/query.proto
@@ -11,7 +11,6 @@ import "crosschain/nonce_to_cctx.proto";
 import "crosschain/out_tx_tracker.proto";
 import "crosschain/params.proto";
 import "crosschain/tss.proto";
-// this line is used by starport scaffolding # 1
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
@@ -53,8 +52,6 @@ service Query {
     option (google.api.http).get = "/zeta-chain/crosschain/get_tss_address";
   }
 
-  // this line is used by starport scaffolding # 2
-
   // Queries a tSS by index.
   rpc TSS(QueryGetTSSRequest) returns (QueryGetTSSResponse) {
     option (google.api.http).get = "/zeta-chain/crosschain/TSS";
@@ -183,8 +180,6 @@ message QueryGetTssAddressResponse {
   string btc = 2;
 }
 
-// this line is used by starport scaffolding # 3
-
 message QueryGetTSSRequest {}
 
 message QueryGetTSSResponse {

diff --git a/proto/crosschain/tx.proto b/proto/crosschain/tx.proto
@@ -1,7 +1,6 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-// this line is used by starport scaffolding # proto/tx/import
 import "common/common.proto";
 import "gogoproto/gogo.proto";
 
@@ -16,7 +15,6 @@ service Msg {
   rpc NonceVoter(MsgNonceVoter) returns (MsgNonceVoterResponse);
   rpc VoteOnObservedOutboundTx(MsgVoteOnObservedOutboundTx) returns (MsgVoteOnObservedOutboundTxResponse);
   rpc VoteOnObservedInboundTx(MsgVoteOnObservedInboundTx) returns (MsgVoteOnObservedInboundTxResponse);
-  // this line is used by starport scaffolding # proto/tx/rpc
 }
 
 message MsgAddToOutTxTracker {
@@ -36,7 +34,6 @@ message MsgRemoveFromOutTxTracker {
 
 message MsgRemoveFromOutTxTrackerResponse {}
 
-// this line is used by starport scaffolding # proto/tx/message
 message MsgCreateTSSVoter {
   string creator = 1;
   string tss_pubkey = 2;

diff --git a/proto/emissions/genesis.proto b/proto/emissions/genesis.proto
@@ -3,12 +3,10 @@ package zetachain.zetacore.emissions;
 
 import "emissions/params.proto";
 import "gogoproto/gogo.proto";
-// this line is used by starport scaffolding # genesis/proto/import
 
 option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
 
 // GenesisState defines the emissions module's genesis state.
 message GenesisState {
   Params params = 1 [(gogoproto.nullable) = false];
-  // this line is used by starport scaffolding # genesis/proto/state
 }
diff --git a/proto/emissions/query.proto b/proto/emissions/query.proto
@@ -5,7 +5,6 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "emissions/params.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-// this line is used by starport scaffolding # 1
 
 option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
 
@@ -19,8 +18,6 @@ service Query {
   rpc ListPoolAddresses(QueryListPoolAddressesRequest) returns (QueryListPoolAddressesResponse) {
     option (google.api.http).get = "/zeta-chain/zetacore/emissions/list_addresses";
   }
-
-  // this line is used by starport scaffolding # 2
 }
 
 // QueryParamsRequest is request type for the Query/Params RPC method.
@@ -39,5 +36,3 @@ message QueryListPoolAddressesResponse {
   string undistributed_tss_balances_address = 2;
   string emission_module_address = 3;
 }
-
-// this line is used by starport scaffolding # 3
diff --git a/proto/emissions/tx.proto b/proto/emissions/tx.proto
@@ -1,15 +1,10 @@
 syntax = "proto3";
 package zetachain.zetacore.emissions;
 
-// this line is used by starport scaffolding # proto/tx/import
-
 import "gogoproto/gogo.proto";
 
 option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
 
 // Msg defines the Msg service.
 service Msg {
-  // this line is used by starport scaffolding # proto/tx/rpc
 }
-
-// this line is used by starport scaffolding # proto/tx/message
diff --git a/proto/fungible/genesis.proto b/proto/fungible/genesis.proto
@@ -5,7 +5,6 @@ import "fungible/foreign_coins.proto";
 import "fungible/params.proto";
 import "fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
-// this line is used by starport scaffolding # genesis/proto/import
 
 option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
 
@@ -14,5 +13,4 @@ message GenesisState {
   Params params = 1 [(gogoproto.nullable) = false];
   repeated ForeignCoins foreignCoinsList = 2 [(gogoproto.nullable) = false];
   SystemContract systemContract = 3;
-  // this line is used by starport scaffolding # genesis/proto/state
 }
diff --git a/proto/fungible/query.proto b/proto/fungible/query.proto
@@ -7,7 +7,6 @@ import "fungible/params.proto";
 import "fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-// this line is used by starport scaffolding # 1
 
 option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
 
@@ -31,7 +30,6 @@ service Query {
   rpc SystemContract(QueryGetSystemContractRequest) returns (QueryGetSystemContractResponse) {
     option (google.api.http).get = "/zeta-chain/zetacore/fungible/system_contract";
   }
-  // this line is used by starport scaffolding # 2
 }
 
 // QueryParamsRequest is request type for the Query/Params RPC method.
@@ -65,4 +63,3 @@ message QueryGetSystemContractRequest {}
 message QueryGetSystemContractResponse {
   SystemContract SystemContract = 1 [(gogoproto.nullable) = false];
 }
-// this line is used by starport scaffolding # 3
diff --git a/proto/fungible/tx.proto b/proto/fungible/tx.proto
@@ -3,15 +3,12 @@ package zetachain.zetacore.fungible;
 
 import "common/common.proto";
 
-// this line is used by starport scaffolding # proto/tx/import
-
 option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
 
 // Msg defines the Msg service.
 service Msg {
   rpc DeployFungibleCoinZRC20(MsgDeployFungibleCoinZRC20) returns (MsgDeployFungibleCoinZRC20Response);
   rpc RemoveForeignCoin(MsgRemoveForeignCoin) returns (MsgRemoveForeignCoinResponse);
-  // this line is used by starport scaffolding # proto/tx/rpc
 }
 
 message MsgDeployFungibleCoinZRC20 {
@@ -33,5 +30,3 @@ message MsgRemoveForeignCoin {
 }
 
 message MsgRemoveForeignCoinResponse {}
-
-// this line is used by starport scaffolding # proto/tx/message
diff --git a/proto/observer/query.proto b/proto/observer/query.proto
@@ -3,7 +3,6 @@ package zetachain.zetacore.observer;
 
 import "common/common.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-// this line is used by starport scaffolding # 1
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "observer/ballot.proto";
@@ -80,8 +79,6 @@ service Query {
   rpc GetAllBlameRecords(QueryAllBlameRecordsRequest) returns (QueryAllBlameRecordsResponse) {
     option (google.api.http).get = "/zeta-chain/observer/get_all_blame_records";
   }
-
-  // this line is used by starport scaffolding # 2
 }
 
 message QueryParamsRequest {}
@@ -188,5 +185,3 @@ message QueryAllBlameRecordsRequest {}
 message QueryAllBlameRecordsResponse {
   repeated Blame blameInfo = 1;
 }
-
-// this line is used by starport scaffolding # 3
diff --git a/proto/observer/tx.proto b/proto/observer/tx.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 package zetachain.zetacore.observer;
 
-// this line is used by starport scaffolding # proto/tx/import
-
 import "common/common.proto";
 import "gogoproto/gogo.proto";
 import "observer/blame.proto";
@@ -18,7 +16,6 @@ service Msg {
   rpc AddBlameVote(MsgAddBlameVote) returns (MsgAddBlameVoteResponse);
   rpc UpdatePermissionFlags(MsgUpdatePermissionFlags) returns (MsgUpdatePermissionFlagsResponse);
   rpc UpdateKeygen(MsgUpdateKeygen) returns (MsgUpdateKeygenResponse);
-  // this line is used by starport scaffolding # proto/tx/rpc
 }
 
 message MsgUpdateCoreParams {
@@ -55,5 +52,3 @@ message MsgUpdateKeygen {
 }
 
 message MsgUpdateKeygenResponse {}
-
-// this line is used by starport scaffolding # proto/tx/message
diff --git a/testutil/keeper/zetacore.go → testutil/keeper/crosschain.go b/testutil/keeper/zetacore.go → testutil/keeper/crosschain.go
@@ -1,29 +1,29 @@
 package keeper
 
 import (
-	authkeeper2 "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	bankkeeper2 "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"github.com/zeta-chain/zetacore/x/crosschain/keeper"
 	"testing"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/store"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmdb "github.com/tendermint/tm-db"
-	"github.com/zeta-chain/zetacore/x/crosschain/types"
-	fungibleKeeper "github.com/zeta-chain/zetacore/x/fungible/keeper"
-	zetaobserverKeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
 
-	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/zeta-chain/zetacore/x/crosschain/keeper"
+	"github.com/zeta-chain/zetacore/x/crosschain/types"
+	fungiblekeeper "github.com/zeta-chain/zetacore/x/fungible/keeper"
+	observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
 )
 
-func ZetacoreKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
+func CrosschainKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	storeKey := sdk.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
@@ -36,28 +36,28 @@ func ZetacoreKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	registry := codectypes.NewInterfaceRegistry()
 	cdc := codec.NewProtoCodec(registry)
 
-	paramsSubspace := typesparams.NewSubspace(cdc,
+	paramsSubspace := paramstypes.NewSubspace(cdc,
 		types.Amino,
 		storeKey,
 		memStoreKey,
 		"ZetacoreParams",
 	)
 
-	bankkeeper := bankkeeper2.BaseKeeper{}
-	authkeeper := authkeeper2.AccountKeeper{}
-	zetaobserverKeeper := zetaobserverKeeper.Keeper{}
-	fungibleKeeper := fungibleKeeper.Keeper{}
+	bankKeeper := bankkeeper.BaseKeeper{}
+	authKeeper := authkeeper.AccountKeeper{}
+	observerKeeper := observerkeeper.Keeper{}
+	fungibleKeeper := fungiblekeeper.Keeper{}
 
 	k := keeper.NewKeeper(
 		codec.NewProtoCodec(registry),
 		storeKey,
 		memStoreKey,
 		stakingkeeper.Keeper{}, // custom
 		paramsSubspace,
-		authkeeper,
-		bankkeeper,
-		zetaobserverKeeper,
-		fungibleKeeper,
+		authKeeper,
+		bankKeeper,
+		observerKeeper,
+		&fungibleKeeper,
 	)
 
 	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())

diff --git a/x/crosschain/client/cli/query.go b/x/crosschain/client/cli/query.go
@@ -45,7 +45,5 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 		CmdGetTssAddress(),
 	)
 
-	// this line is used by starport scaffolding # 1
-
 	return cmd
 }
diff --git a/x/crosschain/client/cli/tx.go b/x/crosschain/client/cli/tx.go
@@ -31,7 +31,6 @@ func GetTxCmd() *cobra.Command {
 		cli.CmdUpdatePermissionFlags(),
 		cli.CmdUpdateKeygen(),
 	)
-	// this line is used by starport scaffolding # 1
 
 	return cmd
 }
diff --git a/x/crosschain/genesis.go b/x/crosschain/genesis.go
@@ -18,8 +18,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 		k.SetInTxHashToCctx(ctx, elem)
 	}
 
-	// this line is used by starport scaffolding # genesis/module/init
-
 	// Set all the gasPrice
 	for _, elem := range genState.GasPriceList {
 		k.SetGasPrice(ctx, *elem)
@@ -53,7 +51,6 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis.OutTxTrackerList = k.GetAllOutTxTracker(ctx)
 	genesis.InTxHashToCctxList = k.GetAllInTxHashToCctx(ctx)
 
-	// this line is used by starport scaffolding # genesis/module/export
 	// Get all keygen
 
 	// Get all tSSVoter