Merge branch 'develop' into format/proto

zeta-chain · Aug 2, 2023 · 54e0595 · 54e0595
2 parents 0619046 + c3051bb
commit 54e0595
Show file tree

Hide file tree

Showing 38 changed files with 207 additions and 352 deletions.
diff --git a/x/crosschain/client/cli/cli_cctx.go b/x/crosschain/client/cli/cli_cctx.go
@@ -14,8 +14,6 @@ import (
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdListSend() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list-cctx",

diff --git a/x/crosschain/client/cli/cli_out_tx_tracker_test.go b/x/crosschain/client/cli/cli_out_tx_tracker_test.go
@@ -2,19 +2,15 @@ package cli_test
 
 import (
 	"fmt"
-	"github.com/zeta-chain/zetacore/app"
-	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"github.com/zeta-chain/zetacore/app"
 	"github.com/zeta-chain/zetacore/testutil/network"
 	"github.com/zeta-chain/zetacore/testutil/nullify"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-// Prevent strconv unused error
-var _ = strconv.IntSize
-
 func networkWithOutTxTrackerObjects(t *testing.T, n int) (*network.Network, []types.OutTxTracker) {
 	t.Helper()
 	cfg := network.DefaultConfig()

diff --git a/x/crosschain/client/cli/cli_zeta_height.go b/x/crosschain/client/cli/cli_zeta_height.go
@@ -1,16 +1,12 @@
 package cli
 
 import (
-	"github.com/spf13/cobra"
-	"strconv"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/spf13/cobra"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdLastZetaHeight() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "last-zeta-height",

diff --git a/x/crosschain/client/cli/query.go b/x/crosschain/client/cli/query.go
@@ -26,22 +26,24 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdListOutTxTracker())
-	cmd.AddCommand(CmdShowOutTxTracker())
-	cmd.AddCommand(cli.CmdShowKeygen())
-	cmd.AddCommand(CmdShowTSS())
-	cmd.AddCommand(CmdListGasPrice())
-	cmd.AddCommand(CmdShowGasPrice())
-	cmd.AddCommand(CmdListChainNonces())
-	cmd.AddCommand(CmdShowChainNonces())
-	cmd.AddCommand(CmdListSend())
-	cmd.AddCommand(CmdShowSend())
-	cmd.AddCommand(CmdLastZetaHeight())
-	cmd.AddCommand(CmdListInTxHashToCctx())
-	cmd.AddCommand(CmdShowInTxHashToCctx())
-	cmd.AddCommand(CmdQueryParams())
-	cmd.AddCommand(cli.CmdShowPermissionFlags())
-	cmd.AddCommand(CmdGetTssAddress())
+	cmd.AddCommand(
+		CmdListOutTxTracker(),
+		CmdShowOutTxTracker(),
+		cli.CmdShowKeygen(),
+		CmdShowTSS(),
+		CmdListGasPrice(),
+		CmdShowGasPrice(),
+		CmdListChainNonces(),
+		CmdShowChainNonces(),
+		CmdListSend(),
+		CmdShowSend(),
+		CmdLastZetaHeight(),
+		CmdListInTxHashToCctx(),
+		CmdShowInTxHashToCctx(),
+		CmdQueryParams(),
+		cli.CmdShowPermissionFlags(),
+		CmdGetTssAddress(),
+	)
 
 	// this line is used by starport scaffolding # 1
 

diff --git a/x/crosschain/client/cli/query_get_tss_address.go b/x/crosschain/client/cli/query_get_tss_address.go
@@ -1,16 +1,12 @@
 package cli
 
 import (
-	"strconv"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdGetTssAddress() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "get-tss-address",

diff --git a/x/crosschain/client/cli/tx.go b/x/crosschain/client/cli/tx.go
@@ -2,24 +2,14 @@ package cli
 
 import (
 	"fmt"
-	"github.com/zeta-chain/zetacore/x/observer/client/cli"
-	"time"
-
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/zeta-chain/zetacore/x/observer/client/cli"
 	// "github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-var (
-	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
-)
-
-const (
-// flagPacketTimeoutTimestamp = "packet-timeout-timestamp"
-)
-
 // GetTxCmd returns the transaction commands for this module
 func GetTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -30,15 +20,17 @@ func GetTxCmd() *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdAddToWatchList())
-	cmd.AddCommand(CmdCreateTSSVoter())
-	cmd.AddCommand(CmdGasPriceVoter())
-	cmd.AddCommand(CmdNonceVoter())
-	cmd.AddCommand(CmdCCTXOutboundVoter())
-	cmd.AddCommand(CmdCCTXInboundVoter())
-	cmd.AddCommand(CmdRemoveFromWatchList())
-	cmd.AddCommand(cli.CmdUpdatePermissionFlags())
-	cmd.AddCommand(cli.CmdUpdateKeygen())
+	cmd.AddCommand(
+		CmdAddToWatchList(),
+		CmdCreateTSSVoter(),
+		CmdGasPriceVoter(),
+		CmdNonceVoter(),
+		CmdCCTXOutboundVoter(),
+		CmdCCTXInboundVoter(),
+		CmdRemoveFromWatchList(),
+		cli.CmdUpdatePermissionFlags(),
+		cli.CmdUpdateKeygen(),
+	)
 	// this line is used by starport scaffolding # 1
 
 	return cmd

diff --git a/x/crosschain/keeper/keeper_cross_chain_tx_vote_inbound_tx.go b/x/crosschain/keeper/keeper_cross_chain_tx_vote_inbound_tx.go
@@ -88,6 +88,7 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 	cctx := k.CreateNewCCTX(ctx, msg, index, types.CctxStatus_PendingInbound, observationChain, receiverChain)
 	defer func() {
 		EmitEventInboundFinalized(ctx, &cctx)
+		cctx.InboundTxParams.InboundTxFinalizedZetaHeight = uint64(ctx.BlockHeight())
 		k.SetCctxAndNonceToCctxAndInTxHashToCctx(ctx, cctx)
 	}()
 	// FinalizeInbound updates CCTX Prices and Nonce
@@ -134,7 +135,6 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 	} else { // Cross Chain SWAP
 		tmpCtx, commit := ctx.CacheContext()
 		err = func() error {
-			cctx.InboundTxParams.InboundTxFinalizedZetaHeight = uint64(ctx.BlockHeader().Height)
 			err := k.PayGasInZetaAndUpdateCctx(tmpCtx, receiverChain.ChainId, &cctx)
 			if err != nil {
 				return err

diff --git a/x/crosschain/module_simulation.go b/x/crosschain/module_simulation.go
@@ -3,26 +3,12 @@ package crosschain
 import (
 	"math/rand"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
-	"github.com/zeta-chain/zetacore/testutil/sample"
-	crosschainsimulation "github.com/zeta-chain/zetacore/x/crosschain/simulation"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-// avoid unused import issue
-var (
-	_ = sample.AccAddress
-	_ = crosschainsimulation.FindAccount
-	_ = simappparams.StakePerAccount
-	_ = simulation.MsgEntryKind
-	_ = baseapp.Paramspace
-)
-
 const (
 // this line is used by starport scaffolding # simapp/module/const
 )

diff --git a/x/crosschain/types/codec.go b/x/crosschain/types/codec.go
@@ -23,27 +23,12 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgAddToOutTxTracker{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgRemoveFromOutTxTracker{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgCreateTSSVoter{},
-	)
-
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgGasPriceVoter{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgNonceVoter{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgVoteOnObservedOutboundTx{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgVoteOnObservedInboundTx{},
-	)
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgSetNodeKeys{},
 	)
 

diff --git a/x/crosschain/types/key_in_tx_hash_to_cctx.go b/x/crosschain/types/key_in_tx_hash_to_cctx.go
@@ -1,9 +1,5 @@
 package types
 
-import "encoding/binary"
-
-var _ binary.ByteOrder
-
 const (
 	// InTxHashToCctxKeyPrefix is the prefix to retrieve all InTxHashToCctx
 	InTxHashToCctxKeyPrefix = "InTxHashToCctx/value/"

diff --git a/x/emissions/client/cli/query.go b/x/emissions/client/cli/query.go
@@ -24,8 +24,10 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdQueryParams())
-	cmd.AddCommand(CmdListPoolAddresses())
+	cmd.AddCommand(
+		CmdQueryParams(),
+		CmdListPoolAddresses(),
+	)
 
 	// this line is used by starport scaffolding # 1
 

diff --git a/x/emissions/client/cli/query_list_balances.go b/x/emissions/client/cli/query_list_balances.go
@@ -1,16 +1,12 @@
 package cli
 
 import (
-	"strconv"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
 	"github.com/zeta-chain/zetacore/x/emissions/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdListPoolAddresses() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list-pool-addresses",

diff --git a/x/fungible/client/cli/query.go b/x/fungible/client/cli/query.go
@@ -24,9 +24,11 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdQueryParams())
-	cmd.AddCommand(CmdListForeignCoins())
-	cmd.AddCommand(CmdShowForeignCoins())
+	cmd.AddCommand(
+		CmdQueryParams(),
+		CmdListForeignCoins(),
+		CmdShowForeignCoins(),
+	)
 	// this line is used by starport scaffolding # 1
 
 	return cmd

diff --git a/x/fungible/client/cli/tx.go b/x/fungible/client/cli/tx.go
@@ -2,19 +2,13 @@ package cli
 
 import (
 	"fmt"
-	"time"
-
-	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/spf13/cobra"
 	// "github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/zeta-chain/zetacore/x/fungible/types"
 )
 
-var (
-	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
-)
-
 // GetTxCmd returns the transaction commands for this module
 func GetTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -25,8 +19,10 @@ func GetTxCmd() *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	cmd.AddCommand(CmdDeployFungibleCoinZRC4())
-	cmd.AddCommand(CmdRemoveForeignCoin())
+	cmd.AddCommand(
+		CmdDeployFungibleCoinZRC4(),
+		CmdRemoveForeignCoin(),
+	)
 	// this line is used by starport scaffolding # 1
 
 	return cmd

diff --git a/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go b/x/fungible/client/cli/tx_deploy_fungible_coin_zrc_4.go
@@ -13,8 +13,6 @@ import (
 	"github.com/zeta-chain/zetacore/x/fungible/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdDeployFungibleCoinZRC4() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "deploy-fungible-coin-zrc-4 [erc-20] [foreign-chain] [decimals] [name] [symbol] [coin-type] [gas-limit]",

diff --git a/x/fungible/client/cli/tx_remove_foreign_coin.go b/x/fungible/client/cli/tx_remove_foreign_coin.go
@@ -1,17 +1,13 @@
 package cli
 
 import (
-	"strconv"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
 	"github.com/zeta-chain/zetacore/x/fungible/types"
 )
 
-var _ = strconv.Itoa(0)
-
 func CmdRemoveForeignCoin() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "remove-foreign-coin [name]",

diff --git a/x/fungible/module_simulation.go b/x/fungible/module_simulation.go
@@ -3,26 +3,12 @@ package fungible
 import (
 	"math/rand"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
-	"github.com/zeta-chain/zetacore/testutil/sample"
-	fungiblesimulation "github.com/zeta-chain/zetacore/x/fungible/simulation"
 	"github.com/zeta-chain/zetacore/x/fungible/types"
 )
 
-// avoid unused import issue
-var (
-	_ = sample.AccAddress
-	_ = fungiblesimulation.FindAccount
-	_ = simappparams.StakePerAccount
-	_ = simulation.MsgEntryKind
-	_ = baseapp.Paramspace
-)
-
 const (
 // this line is used by starport scaffolding # simapp/module/const
 )

diff --git a/x/fungible/types/codec.go b/x/fungible/types/codec.go
@@ -14,14 +14,11 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 }
 
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
-
 	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgDeployFungibleCoinZRC20{},
-	)
-
-	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgRemoveForeignCoin{},
 	)
+
 	// this line is used by starport scaffolding # 3
 
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)

diff --git a/x/fungible/types/key_foreign_coins.go b/x/fungible/types/key_foreign_coins.go
@@ -1,9 +1,5 @@
 package types
 
-import "encoding/binary"
-
-var _ binary.ByteOrder
-
 const (
 	// ForeignCoinsKeyPrefix is the prefix to retrieve all ForeignCoins
 	ForeignCoinsKeyPrefix = "ForeignCoins/value/"