admin

proto/connect/marketmap/v2/tx.proto

@@ -143,11 +143,11 @@ message MsgRemoveMarketAuthoritiesResponse {}
 // MsgRemoveMarkets defines the Msg/RemoveMarkets request type. It contains the
 // new markets to be removed from the market map.
 message MsgRemoveMarkets {
-  option (cosmos.msg.v1.signer) = "authority";
+  option (cosmos.msg.v1.signer) = "admin";
 
-  // Authority is the signer of this transaction.  This authority must be
-  // authorized by the module to execute the message.
-  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  // Admin defines the authority that is the x/marketmap
+  // Admin account.  This account is set in the module parameters.
+  string admin = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 
   // Markets is the list of markets to remove.
   repeated string markets = 2;

x/marketmap/keeper/msg_server.go

@@ -260,9 +260,13 @@ func (ms msgServer) RemoveMarkets(goCtx context.Context, msg *types.MsgRemoveMar
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	// perform basic msg validity checks
-	if err := ms.verifyMarketAuthorities(ctx, msg); err != nil {
-		return nil, fmt.Errorf("unable to verify market authorities: %w", err)
+	params, err := ms.k.GetParams(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if msg.Authority != params.Admin {
+		return nil, fmt.Errorf("request admin %s does not match module admin %s", msg.Admin, params.Admin)
 	}
 
 	for _, market := range msg.Markets {