Merge branch 'develop' into cherry-pick-hotfix-v10.0.x

cmd/zetaclientd/keygen_tss.go

@@ -134,7 +134,8 @@ func keygenTss(cfg *config.Config, tss *mc.TSS, keygenLogger zerolog.Logger) err
 		if err != nil {
 			return err
 		}
-		zetaHash, err := tss.CoreBridge.PostBlameData(&res.Blame, common.ZetaChain().ChainId, digest)
+		index := fmt.Sprintf("keygen-%s-%d", digest, keyGen.BlockNumber)
+		zetaHash, err := tss.CoreBridge.PostBlameData(&res.Blame, common.ZetaChain().ChainId, index)
 		if err != nil {
 			keygenLogger.Error().Err(err).Msg("error sending blame data to core")
 			return err

cmd/zetacored/root.go

@@ -92,7 +92,7 @@ func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {
 
 			customAppTemplate, customAppConfig := initAppConfig()
 
-			return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, tmcfg.DefaultConfig())
+			return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, initTmConfig())
 		},
 	}
 
@@ -107,6 +107,18 @@ func initAppConfig() (string, interface{}) {
 	return servercfg.AppConfig(zetacoredconfig.BaseDenom)
 }
 
+// initTmConfig overrides the default Tendermint config
+func initTmConfig() *tmcfg.Config {
+	cfg := tmcfg.DefaultConfig()
+
+	// use mempool version 1 to enable tx priority
+	if cfg.Mempool != nil {
+		cfg.Mempool.Version = tmcfg.MempoolV1
+	}
+
+	return cfg
+}
+
 func initRootCmd(rootCmd *cobra.Command, encodingConfig appparams.EncodingConfig) {
 	rootCmd.AddCommand(
 		ethermintclient.ValidateChainID(

docs/openapi/openapi.swagger.yaml

@@ -27295,6 +27295,32 @@ paths:
           type: string
       tags:
         - Query
+  /zeta-chain/observer/blame_by_chain_and_nonce/{chain_id}/{nonce}:
+    get:
+      summary: Queries a list of VoterByIdentifier items.
+      operationId: Query_BlamesByChainAndNonce
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/observerQueryBlameByChainAndNonceResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      parameters:
+        - name: chain_id
+          in: path
+          required: true
+          type: string
+          format: int64
+        - name: nonce
+          in: path
+          required: true
+          type: string
+          format: int64
+      tags:
+        - Query
   /zeta-chain/observer/blame_by_identifier/{blame_identifier}:
     get:
       summary: Queries a list of VoterByIdentifier items.
@@ -50449,6 +50475,11 @@ definitions:
     type: object
   crosschainMsgWhitelistERC20Response:
     type: object
+    properties:
+      zrc20_address:
+        type: string
+      cctx_index:
+        type: string
   crosschainOutTxTracker:
     type: object
     properties:
@@ -51114,6 +51145,14 @@ definitions:
         $ref: '#/definitions/observerObservationType'
       ballot_status:
         $ref: '#/definitions/observerBallotStatus'
+  observerQueryBlameByChainAndNonceResponse:
+    type: object
+    properties:
+      blame_info:
+        type: array
+        items:
+          type: object
+          $ref: '#/definitions/observerBlame'
   observerQueryBlameByIdentifierResponse:
     type: object
     properties:

docs/spec/crosschain/messages.md

@@ -207,6 +207,9 @@ message MsgVoteOnObservedInboundTx {
 
 ## MsgWhitelistERC20
 
+WhitelistERC20 deploys a new zrc20, create a foreign coin object for the ERC20
+and emit a crosschain tx to whitelist the ERC20 on the external chain
+
 ```proto
 message MsgWhitelistERC20 {
 	string creator = 1;

docs/spec/fungible/messages.md

@@ -78,6 +78,7 @@ message MsgUpdateZRC20WithdrawFee {
 	string creator = 1;
 	string zrc20_address = 2;
 	string new_withdraw_fee = 6;
+	string new_gas_limit = 7;
 }
 ```
 

proto/crosschain/tx.proto

@@ -37,7 +37,10 @@ message MsgWhitelistERC20 {
   int64 gas_limit = 7;
 }
 
-message MsgWhitelistERC20Response {}
+message MsgWhitelistERC20Response {
+  string zrc20_address = 1;
+  string cctx_index = 2;
+}
 
 message MsgAddToOutTxTracker {
   string creator = 1;

proto/fungible/events.proto

@@ -34,6 +34,8 @@ message EventZRC20WithdrawFeeUpdated {
   string old_withdraw_fee = 5;
   string new_withdraw_fee = 6;
   string signer = 7;
+  string old_gas_limit = 8;
+  string new_gas_limit = 9;
 }
 
 message EventZRC20PausedStatusUpdated {

proto/fungible/tx.proto

@@ -24,6 +24,10 @@ message MsgUpdateZRC20WithdrawFee {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint",
     (gogoproto.nullable) = false
   ];
+  string new_gas_limit = 7 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint",
+    (gogoproto.nullable) = false
+  ];
 }
 
 message MsgUpdateZRC20WithdrawFeeResponse {}

proto/observer/query.proto

@@ -80,6 +80,11 @@ service Query {
     option (google.api.http).get = "/zeta-chain/observer/get_all_blame_records";
   }
 
+  // Queries a list of VoterByIdentifier items.
+  rpc BlamesByChainAndNonce(QueryBlameByChainAndNonceRequest) returns (QueryBlameByChainAndNonceResponse) {
+    option (google.api.http).get = "/zeta-chain/observer/blame_by_chain_and_nonce/{chain_id}/{nonce}";
+  }
+
   rpc GetAllBlockHeaders(QueryAllBlockHeaderRequest) returns (QueryAllBlockHeaderResponse) {
     option (google.api.http).get = "/zeta-chain/observer/get_all_block_headers";
   }
@@ -211,6 +216,15 @@ message QueryAllBlameRecordsResponse {
   repeated Blame blame_info = 1;
 }
 
+message QueryBlameByChainAndNonceRequest {
+  int64 chain_id = 1;
+  int64 nonce = 2;
+}
+
+message QueryBlameByChainAndNonceResponse {
+  repeated Blame blame_info = 1;
+}
+
 message QueryAllBlockHeaderRequest {
   cosmos.base.query.v1beta1.PageRequest pagination = 1;
 }

x/crosschain/keeper/cctx_utils.go

@@ -4,10 +4,10 @@ import (
 	"errors"
 	"fmt"
 
+	cosmoserrors "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/zeta-chain/zetacore/common"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
@@ -24,24 +24,24 @@ func (k Keeper) UpdateNonce(ctx sdk.Context, receiveChainID int64, cctx *types.C
 
 	nonce, found := k.GetChainNonces(ctx, chain.ChainName.String())
 	if !found {
-		return sdkerrors.Wrap(types.ErrCannotFindReceiverNonce, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX()))
+		return cosmoserrors.Wrap(types.ErrCannotFindReceiverNonce, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX()))
 	}
 
 	// SET nonce
 	cctx.GetCurrentOutTxParam().OutboundTxTssNonce = nonce.Nonce
 	tss, found := k.GetTSS(ctx)
 	if !found {
-		return sdkerrors.Wrap(types.ErrCannotFindTSSKeys, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX()))
+		return cosmoserrors.Wrap(types.ErrCannotFindTSSKeys, fmt.Sprintf("Chain(%s) | Identifiers : %s ", chain.ChainName.String(), cctx.LogIdentifierForCCTX()))
 	}
 
 	p, found := k.GetPendingNonces(ctx, tss.TssPubkey, receiveChainID)
 	if !found {
-		return sdkerrors.Wrap(types.ErrCannotFindPendingNonces, fmt.Sprintf("chain_id %d, nonce %d", receiveChainID, nonce.Nonce))
+		return cosmoserrors.Wrap(types.ErrCannotFindPendingNonces, fmt.Sprintf("chain_id %d, nonce %d", receiveChainID, nonce.Nonce))
 	}
 
 	// #nosec G701 always in range
 	if p.NonceHigh != int64(nonce.Nonce) {
-		return sdkerrors.Wrap(types.ErrNonceMismatch, fmt.Sprintf("chain_id %d, high nonce %d, current nonce %d", receiveChainID, p.NonceHigh, nonce.Nonce))
+		return cosmoserrors.Wrap(types.ErrNonceMismatch, fmt.Sprintf("chain_id %d, high nonce %d, current nonce %d", receiveChainID, p.NonceHigh, nonce.Nonce))
 	}
 
 	nonce.Nonce++

x/crosschain/keeper/gas_payment_test.go

@@ -232,7 +232,7 @@ func TestKeeper_PayGasNativeAndUpdateCctx(t *testing.T) {
 		zrc20 := setupGasCoin(t, ctx, zk.FungibleKeeper, sdkk.EvmKeeper, chainID, "foobar", "foobar")
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, zrc20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, zrc20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{
@@ -330,7 +330,7 @@ func TestKeeper_PayGasNativeAndUpdateCctx(t *testing.T) {
 		zrc20 := setupGasCoin(t, ctx, zk.FungibleKeeper, sdkk.EvmKeeper, chainID, "foobar", "foobar")
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, zrc20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, zrc20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{
@@ -384,7 +384,7 @@ func TestKeeper_PayGasInERC20AndUpdateCctx(t *testing.T) {
 		)
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{
@@ -497,7 +497,7 @@ func TestKeeper_PayGasInERC20AndUpdateCctx(t *testing.T) {
 		gasZRC20 := setupGasCoin(t, ctx, zk.FungibleKeeper, sdkk.EvmKeeper, chainID, "foo", "foo")
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{
@@ -551,7 +551,7 @@ func TestKeeper_PayGasInERC20AndUpdateCctx(t *testing.T) {
 		)
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{
@@ -605,7 +605,7 @@ func TestKeeper_PayGasInERC20AndUpdateCctx(t *testing.T) {
 		)
 		_, err := zk.FungibleKeeper.UpdateZRC20WithdrawFee(
 			sdk.UnwrapSDKContext(ctx),
-			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee)),
+			fungibletypes.NewMsgUpdateZRC20WithdrawFee(admin, gasZRC20.String(), sdk.NewUint(withdrawFee), math.Uint{}),
 		)
 		require.NoError(t, err)
 		k.SetGasPrice(ctx, types.GasPrice{

x/crosschain/keeper/keeper_chain_nonces.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	zetaObserverTypes "github.com/zeta-chain/zetacore/x/observer/types"
-
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/zeta-chain/zetacore/x/crosschain/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -108,12 +107,11 @@ func (k msgServer) NonceVoter(goCtx context.Context, msg *types.MsgNonceVoter) (
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainID(msg.ChainId)
 	if chain == nil {
-		return nil, zetaObserverTypes.ErrSupportedChains
+		return nil, observertypes.ErrSupportedChains
 	}
 
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, chain); !ok {
+		return nil, observertypes.ErrNotAuthorizedPolicy
 	}
 	chainNonce, isFound := k.GetChainNonces(ctx, chain.ChainName.String())
 

x/crosschain/keeper/keeper_cross_chain_tx_vote_inbound_tx.go

@@ -77,9 +77,8 @@ func (k msgServer) VoteOnObservedInboundTx(goCtx context.Context, msg *types.Msg
 		tssPub = tss.TssPubkey
 	}
 	// IsAuthorized does various checks against the list of observer mappers
-	ok, err := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain)
-	if !ok {
-		return nil, err
+	if ok := k.zetaObserverKeeper.IsAuthorized(ctx, msg.Creator, observationChain); !ok {
+		return nil, observerTypes.ErrNotAuthorizedPolicy
 	}
 
 	index := msg.Digest()