Merge branch 'develop' into fix-MaxLookaheadNonce

app/ante/ante.go

@@ -168,7 +168,7 @@ func IsSystemTx(tx sdk.Tx, isAuthorizedSigner func(string) bool) bool {
 		}
 	}
 	switch innerMsg.(type) {
-	case *cctxtypes.MsgGasPriceVoter,
+	case *cctxtypes.MsgVoteGasPrice,
 		*cctxtypes.MsgVoteOnObservedInboundTx,
 		*cctxtypes.MsgVoteOnObservedOutboundTx,
 		*cctxtypes.MsgAddToOutTxTracker,

app/ante/ante_test.go

@@ -32,7 +32,7 @@ func (mah *MockAnteHandler) AnteHandle(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.C
 
 func TestIsSystemTx(t *testing.T) {
 	// system tx types:
-	//      *cctxtypes.MsgGasPriceVoter,
+	//      *cctxtypes.MsgVoteGasPrice,
 	//		*cctxtypes.MsgVoteOnObservedInboundTx,
 	//		*cctxtypes.MsgVoteOnObservedOutboundTx,
 	//		*cctxtypes.MsgAddToOutTxTracker,

changelog.md

@@ -11,6 +11,9 @@
 * `MsgCreateTSSVoter` message in the `crosschain` module has been moved to the `observer` module and renamed to `MsgVoteTSS`.
   * The structure of the message remains the same.
 
+* `MsgGasPriceVoter` message in the `crosschain` module has been renamed to `MsgVoteGasPrice`.
+  * The structure of the message remains the same.
+
 ### Refactor
 
 * [1511](https://github.com/zeta-chain/node/pull/1511) - move ballot voting logic from `crosschain` to `observer`
@@ -26,6 +29,7 @@
 * [1936](https://github.com/zeta-chain/node/pull/1936) - refactor common package into subpackages and rename to pkg
 * [1966](https://github.com/zeta-chain/node/pull/1966) - move TSS vote message from crosschain to observer
 * [1853](https://github.com/zeta-chain/node/pull/1853) - refactor vote inbound tx and vote outbound tx
+* [2013](https://github.com/zeta-chain/node/pull/2013) - rename `GasPriceVoter` message to `VoteGasPrice`
 
 ### Features
 

contrib/localnet/zetacored/zetacored_zetacore0/config/genesis.json

@@ -675,7 +675,7 @@
           "grantee": "zeta1syavy2npfyt9tcncdtsdzf7kny9lh777heefxk",
           "authorization": {
             "@type": "/cosmos.authz.v1beta1.GenericAuthorization",
-            "msg": "/zetachain.zetacore.crosschain.MsgGasPriceVoter"
+            "msg": "/zetachain.zetacore.crosschain.MsgVoteGasPrice"
           },
           "expiration": null
         },
@@ -738,7 +738,7 @@
           "grantee": "zeta1l7hypmqk2yc334vc6vmdwzp5sdefygj2w5yj50",
           "authorization": {
             "@type": "/cosmos.authz.v1beta1.GenericAuthorization",
-            "msg": "/zetachain.zetacore.crosschain.MsgGasPriceVoter"
+            "msg": "/zetachain.zetacore.crosschain.MsgVoteGasPrice"
           },
           "expiration": null
         },

contrib/localnet/zetacored/zetacored_zetacore1/config/genesis.json

@@ -675,7 +675,7 @@
           "grantee": "zeta1syavy2npfyt9tcncdtsdzf7kny9lh777heefxk",
           "authorization": {
             "@type": "/cosmos.authz.v1beta1.GenericAuthorization",
-            "msg": "/zetachain.zetacore.crosschain.MsgGasPriceVoter"
+            "msg": "/zetachain.zetacore.crosschain.MsgVoteGasPrice"
           },
           "expiration": null
         },
@@ -738,7 +738,7 @@
           "grantee": "zeta1l7hypmqk2yc334vc6vmdwzp5sdefygj2w5yj50",
           "authorization": {
             "@type": "/cosmos.authz.v1beta1.GenericAuthorization",
-            "msg": "/zetachain.zetacore.crosschain.MsgGasPriceVoter"
+            "msg": "/zetachain.zetacore.crosschain.MsgVoteGasPrice"
           },
           "expiration": null
         },

docs/cli/zetacored/zetacored_tx_crosschain.md

@@ -29,12 +29,12 @@ zetacored tx crosschain [flags]
 * [zetacored tx crosschain add-to-in-tx-tracker](zetacored_tx_crosschain_add-to-in-tx-tracker.md)	 - Add a in-tx-tracker 
 				Use 0:Zeta,1:Gas,2:ERC20
 * [zetacored tx crosschain add-to-out-tx-tracker](zetacored_tx_crosschain_add-to-out-tx-tracker.md)	 - Add a out-tx-tracker
-* [zetacored tx crosschain gas-price-voter](zetacored_tx_crosschain_gas-price-voter.md)	 - Broadcast message gasPriceVoter
 * [zetacored tx crosschain inbound-voter](zetacored_tx_crosschain_inbound-voter.md)	 - Broadcast message sendVoter
 * [zetacored tx crosschain migrate-tss-funds](zetacored_tx_crosschain_migrate-tss-funds.md)	 - Migrate TSS funds to the latest TSS address
 * [zetacored tx crosschain outbound-voter](zetacored_tx_crosschain_outbound-voter.md)	 - Broadcast message receiveConfirmation
 * [zetacored tx crosschain refund-aborted](zetacored_tx_crosschain_refund-aborted.md)	 - Refund an aborted tx , the refund address is optional, if not provided, the refund will be sent to the sender/tx origin of the cctx.
 * [zetacored tx crosschain remove-from-out-tx-tracker](zetacored_tx_crosschain_remove-from-out-tx-tracker.md)	 - Remove a out-tx-tracker
 * [zetacored tx crosschain update-tss-address](zetacored_tx_crosschain_update-tss-address.md)	 - Create a new TSSVoter
+* [zetacored tx crosschain vote-gas-price](zetacored_tx_crosschain_vote-gas-price.md)	 - Broadcast message to vote gas price
 * [zetacored tx crosschain whitelist-erc20](zetacored_tx_crosschain_whitelist-erc20.md)	 - Add a new erc20 token to whitelist
 

docs/cli/zetacored/zetacored_tx_crosschain_gas-price-voter.md → docs/cli/zetacored/zetacored_tx_crosschain_vote-gas-price.md

@@ -1,9 +1,9 @@
-# tx crosschain gas-price-voter
+# tx crosschain vote-gas-price
 
-Broadcast message gasPriceVoter
+Broadcast message to vote gas price
 
 ```
-zetacored tx crosschain gas-price-voter [chain] [price] [supply] [blockNumber] [flags]
+zetacored tx crosschain vote-gas-price [chain] [price] [supply] [blockNumber] [flags]
 ```
 
 ### Options
@@ -21,7 +21,7 @@ zetacored tx crosschain gas-price-voter [chain] [price] [supply] [blockNumber] [
       --gas-adjustment float     adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored  (default 1)
       --gas-prices string        Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)
       --generate-only            Build an unsigned transaction and write it to STDOUT (when enabled, the local Keybase only accessed when providing a key name)
-  -h, --help                     help for gas-price-voter
+  -h, --help                     help for vote-gas-price
       --keyring-backend string   Select keyring's backend (os|file|kwallet|pass|test|memory) 
       --keyring-dir string       The client Keyring directory; if omitted, the default 'home' directory will be used
       --ledger                   Use a connected Ledger device

docs/openapi/openapi.swagger.yaml

@@ -53681,8 +53681,6 @@ definitions:
       is_removed:
         type: boolean
         title: if the tx was removed from the tracker due to no pending cctx
-  crosschainMsgGasPriceVoterResponse:
-    type: object
   crosschainMsgMigrateTssFundsResponse:
     type: object
   crosschainMsgRefundAbortedCCTXResponse:
@@ -53691,6 +53689,8 @@ definitions:
     type: object
   crosschainMsgUpdateTssAddressResponse:
     type: object
+  crosschainMsgVoteGasPriceResponse:
+    type: object
   crosschainMsgVoteOnObservedInboundTxResponse:
     type: object
   crosschainMsgVoteOnObservedOutboundTxResponse:

docs/spec/crosschain/messages.md

@@ -52,16 +52,16 @@ message MsgRemoveFromOutTxTracker {
 }
 ```
 
-## MsgGasPriceVoter
+## MsgVoteGasPrice
 
-GasPriceVoter submits information about the connected chain's gas price at a specific block
+VoteGasPrice submits information about the connected chain's gas price at a specific block
 height. Gas price submitted by each validator is recorded separately and a
 median index is updated.
 
 Only observer validators are authorized to broadcast this message.
 
 ```proto
-message MsgGasPriceVoter {
+message MsgVoteGasPrice {
 	string creator = 1;
 	int64 chain_id = 2;
 	uint64 price = 3;

proto/crosschain/tx.proto

@@ -14,7 +14,7 @@ service Msg {
   rpc AddToInTxTracker(MsgAddToInTxTracker) returns (MsgAddToInTxTrackerResponse);
   rpc RemoveFromOutTxTracker(MsgRemoveFromOutTxTracker) returns (MsgRemoveFromOutTxTrackerResponse);
 
-  rpc GasPriceVoter(MsgGasPriceVoter) returns (MsgGasPriceVoterResponse);
+  rpc VoteGasPrice(MsgVoteGasPrice) returns (MsgVoteGasPriceResponse);
   rpc VoteOnObservedOutboundTx(MsgVoteOnObservedOutboundTx) returns (MsgVoteOnObservedOutboundTxResponse);
   rpc VoteOnObservedInboundTx(MsgVoteOnObservedInboundTx) returns (MsgVoteOnObservedInboundTxResponse);
   rpc WhitelistERC20(MsgWhitelistERC20) returns (MsgWhitelistERC20Response);
@@ -91,15 +91,15 @@ message MsgRemoveFromOutTxTracker {
 
 message MsgRemoveFromOutTxTrackerResponse {}
 
-message MsgGasPriceVoter {
+message MsgVoteGasPrice {
   string creator = 1;
   int64 chain_id = 2;
   uint64 price = 3;
   uint64 block_number = 4;
   string supply = 5;
 }
 
-message MsgGasPriceVoterResponse {}
+message MsgVoteGasPriceResponse {}
 
 message MsgVoteOnObservedOutboundTx {
   string creator = 1;

typescript/crosschain/tx_pb.d.ts

@@ -400,9 +400,9 @@ export declare class MsgRemoveFromOutTxTrackerResponse extends Message<MsgRemove
 }
 
 /**
- * @generated from message zetachain.zetacore.crosschain.MsgGasPriceVoter
+ * @generated from message zetachain.zetacore.crosschain.MsgVoteGasPrice
  */
-export declare class MsgGasPriceVoter extends Message<MsgGasPriceVoter> {
+export declare class MsgVoteGasPrice extends Message<MsgVoteGasPrice> {
   /**
    * @generated from field: string creator = 1;
    */
@@ -428,38 +428,38 @@ export declare class MsgGasPriceVoter extends Message<MsgGasPriceVoter> {
    */
   supply: string;
 
-  constructor(data?: PartialMessage<MsgGasPriceVoter>);
+  constructor(data?: PartialMessage<MsgVoteGasPrice>);
 
   static readonly runtime: typeof proto3;
-  static readonly typeName = "zetachain.zetacore.crosschain.MsgGasPriceVoter";
+  static readonly typeName = "zetachain.zetacore.crosschain.MsgVoteGasPrice";
   static readonly fields: FieldList;
 
-  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MsgGasPriceVoter;
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MsgVoteGasPrice;
 
-  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): MsgGasPriceVoter;
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): MsgVoteGasPrice;
 
-  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): MsgGasPriceVoter;
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): MsgVoteGasPrice;
 
-  static equals(a: MsgGasPriceVoter | PlainMessage<MsgGasPriceVoter> | undefined, b: MsgGasPriceVoter | PlainMessage<MsgGasPriceVoter> | undefined): boolean;
+  static equals(a: MsgVoteGasPrice | PlainMessage<MsgVoteGasPrice> | undefined, b: MsgVoteGasPrice | PlainMessage<MsgVoteGasPrice> | undefined): boolean;
 }
 
 /**
- * @generated from message zetachain.zetacore.crosschain.MsgGasPriceVoterResponse
+ * @generated from message zetachain.zetacore.crosschain.MsgVoteGasPriceResponse
  */
-export declare class MsgGasPriceVoterResponse extends Message<MsgGasPriceVoterResponse> {
-  constructor(data?: PartialMessage<MsgGasPriceVoterResponse>);
+export declare class MsgVoteGasPriceResponse extends Message<MsgVoteGasPriceResponse> {
+  constructor(data?: PartialMessage<MsgVoteGasPriceResponse>);
 
   static readonly runtime: typeof proto3;
-  static readonly typeName = "zetachain.zetacore.crosschain.MsgGasPriceVoterResponse";
+  static readonly typeName = "zetachain.zetacore.crosschain.MsgVoteGasPriceResponse";
   static readonly fields: FieldList;
 
-  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MsgGasPriceVoterResponse;
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MsgVoteGasPriceResponse;
 
-  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): MsgGasPriceVoterResponse;
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): MsgVoteGasPriceResponse;
 
-  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): MsgGasPriceVoterResponse;
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): MsgVoteGasPriceResponse;
 
-  static equals(a: MsgGasPriceVoterResponse | PlainMessage<MsgGasPriceVoterResponse> | undefined, b: MsgGasPriceVoterResponse | PlainMessage<MsgGasPriceVoterResponse> | undefined): boolean;
+  static equals(a: MsgVoteGasPriceResponse | PlainMessage<MsgVoteGasPriceResponse> | undefined, b: MsgVoteGasPriceResponse | PlainMessage<MsgVoteGasPriceResponse> | undefined): boolean;
 }
 
 /**

x/crosschain/client/cli/cli_gas_price.go

@@ -74,10 +74,10 @@ func CmdShowGasPrice() *cobra.Command {
 
 // Transaction CLI /////////////////////////
 
-func CmdGasPriceVoter() *cobra.Command {
+func CmdVoteGasPrice() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "gas-price-voter [chain] [price] [supply] [blockNumber]",
-		Short: "Broadcast message gasPriceVoter",
+		Use:   "vote-gas-price [chain] [price] [supply] [blockNumber]",
+		Short: "Broadcast message to vote gas price",
 		Args:  cobra.ExactArgs(4),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			argsChain, err := strconv.ParseInt(args[0], 10, 64)
@@ -99,7 +99,7 @@ func CmdGasPriceVoter() *cobra.Command {
 				return err
 			}
 
-			msg := types.NewMsgGasPriceVoter(clientCtx.GetFromAddress().String(), argsChain, argsPrice, argsSupply, argsBlockNumber)
+			msg := types.NewMsgVoteGasPrice(clientCtx.GetFromAddress().String(), argsChain, argsPrice, argsSupply, argsBlockNumber)
 
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},

x/crosschain/client/cli/tx.go

@@ -22,7 +22,7 @@ func GetTxCmd() *cobra.Command {
 
 	cmd.AddCommand(
 		CmdAddToWatchList(),
-		CmdGasPriceVoter(),
+		CmdVoteGasPrice(),
 		CmdCCTXOutboundVoter(),
 		CmdCCTXInboundVoter(),
 		CmdRemoveFromWatchList(),

x/crosschain/keeper/msg_server_gas_price_voter.go → x/crosschain/keeper/msg_server_vote_gas_price.go

@@ -15,12 +15,12 @@ import (
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
-// GasPriceVoter submits information about the connected chain's gas price at a specific block
+// VoteGasPrice submits information about the connected chain's gas price at a specific block
 // height. Gas price submitted by each validator is recorded separately and a
 // median index is updated.
 //
 // Only observer validators are authorized to broadcast this message.
-func (k msgServer) GasPriceVoter(goCtx context.Context, msg *types.MsgGasPriceVoter) (*types.MsgGasPriceVoterResponse, error) {
+func (k msgServer) VoteGasPrice(goCtx context.Context, msg *types.MsgVoteGasPrice) (*types.MsgVoteGasPriceResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	chain := k.zetaObserverKeeper.GetSupportedChainFromChainID(ctx, msg.ChainId)
@@ -78,7 +78,7 @@ func (k msgServer) GasPriceVoter(goCtx context.Context, msg *types.MsgGasPriceVo
 	// reset the gas count
 	k.ResetGasMeterAndConsumeGas(ctx, gasUsed)
 
-	return &types.MsgGasPriceVoterResponse{}, nil
+	return &types.MsgVoteGasPriceResponse{}, nil
 }
 
 type indexValue struct {

x/crosschain/keeper/msg_server_gas_price_voter_test.go → x/crosschain/keeper/msg_server_vote_gas_price_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
-func TestMsgServer_GasPriceVoter(t *testing.T) {
+func TestMsgServer_VoteGasPrice(t *testing.T) {
 	t.Run("should error if unsupported chain", func(t *testing.T) {
 		k, ctx, _, _ := keepertest.CrosschainKeeperWithMocks(t, keepertest.CrosschainMockOptions{
 			UseObserverMock: true,
@@ -24,7 +24,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 
 		msgServer := keeper.NewMsgServerImpl(*k)
 
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			ChainId: 5,
 		})
 		require.Error(t, err)
@@ -42,7 +42,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 
 		msgServer := keeper.NewMsgServerImpl(*k)
 
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			ChainId: 5,
 		})
 		require.Error(t, err)
@@ -65,7 +65,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 		fungibleMock.On("SetGasPrice", mock.Anything, mock.Anything, mock.Anything).Return(uint64(0), errors.New("err"))
 		msgServer := keeper.NewMsgServerImpl(*k)
 
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			ChainId: 5,
 		})
 		require.Error(t, err)
@@ -90,7 +90,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 		fungibleMock.On("SetGasPrice", mock.Anything, mock.Anything, mock.Anything).Return(uint64(1), nil)
 		msgServer := keeper.NewMsgServerImpl(*k)
 		creator := sample.AccAddress()
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			Creator:     creator,
 			ChainId:     5,
 			Price:       1,
@@ -136,7 +136,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 			Prices:    []uint64{1},
 		})
 
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			Creator:     creator,
 			ChainId:     5,
 			BlockNumber: 2,
@@ -181,7 +181,7 @@ func TestMsgServer_GasPriceVoter(t *testing.T) {
 			Prices:    []uint64{1},
 		})
 
-		res, err := msgServer.GasPriceVoter(ctx, &types.MsgGasPriceVoter{
+		res, err := msgServer.VoteGasPrice(ctx, &types.MsgVoteGasPrice{
 			Creator:     creator,
 			ChainId:     5,
 			BlockNumber: 2,

x/crosschain/types/authz.go

@@ -8,7 +8,7 @@ import (
 // GetAllAuthzZetaclientTxTypes returns all the authz types for required for zetaclient
 func GetAllAuthzZetaclientTxTypes() []string {
 	return []string{
-		sdk.MsgTypeURL(&MsgGasPriceVoter{}),
+		sdk.MsgTypeURL(&MsgVoteGasPrice{}),
 		sdk.MsgTypeURL(&MsgVoteOnObservedInboundTx{}),
 		sdk.MsgTypeURL(&MsgVoteOnObservedOutboundTx{}),
 		sdk.MsgTypeURL(&MsgAddToOutTxTracker{}),

x/crosschain/types/authz_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestGetAllAuthzZetaclientTxTypes(t *testing.T) {
-	require.Equal(t, []string{"/zetachain.zetacore.crosschain.MsgGasPriceVoter",
+	require.Equal(t, []string{"/zetachain.zetacore.crosschain.MsgVoteGasPrice",
 		"/zetachain.zetacore.crosschain.MsgVoteOnObservedInboundTx",
 		"/zetachain.zetacore.crosschain.MsgVoteOnObservedOutboundTx",
 		"/zetachain.zetacore.crosschain.MsgAddToOutTxTracker",

x/crosschain/types/codec.go

@@ -11,7 +11,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&MsgAddToOutTxTracker{}, "crosschain/AddToOutTxTracker", nil)
 	cdc.RegisterConcrete(&MsgAddToInTxTracker{}, "crosschain/AddToInTxTracker", nil)
 	cdc.RegisterConcrete(&MsgRemoveFromOutTxTracker{}, "crosschain/RemoveFromOutTxTracker", nil)
-	cdc.RegisterConcrete(&MsgGasPriceVoter{}, "crosschain/GasPriceVoter", nil)
+	cdc.RegisterConcrete(&MsgVoteGasPrice{}, "crosschain/VoteGasPrice", nil)
 	cdc.RegisterConcrete(&MsgVoteOnObservedOutboundTx{}, "crosschain/VoteOnObservedOutboundTx", nil)
 	cdc.RegisterConcrete(&MsgVoteOnObservedInboundTx{}, "crosschain/VoteOnObservedInboundTx", nil)
 	cdc.RegisterConcrete(&MsgWhitelistERC20{}, "crosschain/WhitelistERC20", nil)
@@ -25,7 +25,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgAddToOutTxTracker{},
 		&MsgAddToInTxTracker{},
 		&MsgRemoveFromOutTxTracker{},
-		&MsgGasPriceVoter{},
+		&MsgVoteGasPrice{},
 		&MsgVoteOnObservedOutboundTx{},
 		&MsgVoteOnObservedInboundTx{},
 		&MsgWhitelistERC20{},