more msgBatchCancels in code

protocol/app/module/interface_registry.go

@@ -1,8 +1,9 @@
 package module
 
 import (
-	"cosmossdk.io/x/tx/signing"
 	"fmt"
+
+	"cosmossdk.io/x/tx/signing"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -76,6 +77,9 @@ func NewInterfaceRegistry(addrPrefix string, valAddrPrefix string) (types.Interf
 			// https://github.com/cosmos/cosmos-sdk/issues/18722 is fixed, replace this with the cosmos.msg.v1.signing
 			// annotation on the protos.
 			CustomGetSigners: map[protoreflect.FullName]signing.GetSignersFunc{
+				"dydxprotocol.clob.MsgBatchCancel": getLegacyMsgSignerFn(
+					[]string{"subaccount_id", "owner"},
+				),
 				"dydxprotocol.clob.MsgCancelOrder": getLegacyMsgSignerFn(
 					[]string{"order_id", "subaccount_id", "owner"},
 				),

protocol/app/process/other_msgs.go

@@ -1,6 +1,8 @@
 package process
 
 import (
+	"fmt"
+
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/dydxprotocol/v4-chain/protocol/lib/ante"
@@ -23,6 +25,7 @@ func DecodeOtherMsgsTx(decoder sdk.TxDecoder, txBytes []byte) (*OtherMsgsTx, err
 	// Decode.
 	tx, err := decoder(txBytes)
 	if err != nil {
+		fmt.Println("GUHH")
 		return nil, errorsmod.Wrapf(ErrDecodingTxBytes, "OtherMsgsTx Error: %+v", err)
 	}
 

protocol/app/process/other_msgs_test.go

@@ -1,9 +1,10 @@
 package process_test
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	"testing"
 
+	errorsmod "cosmossdk.io/errors"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/dydxprotocol/v4-chain/protocol/app/process"
 	"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
@@ -87,6 +88,13 @@ func TestDecodeOtherMsgsTx(t *testing.T) {
 				"Msg type *types.MsgCancelOrder is not allowed in OtherTxs",
 			),
 		},
+		"Error: batch cancel order is not allowed": {
+			txBytes: constants.Msg_BatchCancel_TxBtyes,
+			expectedErr: errorsmod.Wrap(
+				process.ErrUnexpectedMsgType,
+				"Msg type *types.MsgBatchCancel is not allowed in OtherTxs",
+			),
+		},
 		"Valid: single msg": {
 			txBytes:      constants.Msg_Send_TxBytes,
 			expectedMsgs: []sdk.Msg{constants.Msg_Send},

protocol/app/process/utils_disallow_msgs.go

@@ -18,6 +18,8 @@ func IsDisallowClobOrderMsgInOtherTxs(targetMsg sdk.Msg) bool {
 		order := msg.GetOrder()
 		orderId := order.GetOrderId()
 		return !orderId.IsStatefulOrder() // not stateful -> returns true -> disallow
+	case *clobtypes.MsgBatchCancel:
+		return true
 	}
 	return false
 }

protocol/app/process/utils_disallow_msgs_test.go

@@ -25,7 +25,7 @@ func TestIsDisallowClobOrderMsgInOtherTxs(t *testing.T) {
 	for _, msg := range allMsgSamples {
 		result := process.IsDisallowClobOrderMsgInOtherTxs(msg)
 		switch msg.(type) {
-		case *clobtypes.MsgCancelOrder, *clobtypes.MsgPlaceOrder:
+		case *clobtypes.MsgCancelOrder, *clobtypes.MsgPlaceOrder, *clobtypes.MsgBatchCancel:
 			// The sample msgs are short-term orders, so we expect these to be disallowed.
 			require.True(t, result) // true -> disallow
 		default:

protocol/testutil/constants/messages.go

@@ -21,6 +21,9 @@ func init() {
 	_ = TestTxBuilder.SetMsgs(Msg_CancelOrder)
 	Msg_CancelOrder_TxBtyes, _ = TestEncodingCfg.TxConfig.TxEncoder()(TestTxBuilder.GetTx())
 
+	_ = TestTxBuilder.SetMsgs(Msg_BatchCancel)
+	Msg_BatchCancel_TxBtyes, _ = TestEncodingCfg.TxConfig.TxEncoder()(TestTxBuilder.GetTx())
+
 	_ = TestTxBuilder.SetMsgs(Msg_Send)
 	Msg_Send_TxBytes, _ = TestEncodingCfg.TxConfig.TxEncoder()(TestTxBuilder.GetTx())
 
@@ -54,6 +57,18 @@ var (
 	}
 	Msg_PlaceOrder_TxBtyes []byte
 
+	Msg_BatchCancel = &clobtypes.MsgBatchCancel{
+		SubaccountId: Alice_Num0,
+		ShortTermCancels: []clobtypes.OrderBatch{
+			{
+				ClobPairId: 0,
+				ClientIds:  []uint32{0},
+			},
+		},
+		GoodTilBlock: 5,
+	}
+	Msg_BatchCancel_TxBtyes []byte
+
 	Msg_PlaceOrder_LongTerm = &clobtypes.MsgPlaceOrder{
 		Order: LongTermOrder_Alice_Num0_Id0_Clob0_Buy5_Price10_GTBT15,
 	}

protocol/testutil/encoding/utils.go

@@ -1,9 +1,10 @@
 package encoding
 
 import (
-	"github.com/dydxprotocol/v4-chain/protocol/testutil/ante"
 	"testing"
 
+	"github.com/dydxprotocol/v4-chain/protocol/testutil/ante"
+
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
 	"cosmossdk.io/x/upgrade"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -73,6 +74,7 @@ func GetTestEncodingCfg() testutil.TestEncodingConfig {
 		&clobtypes.MsgProposedOperations{},
 		&clobtypes.MsgPlaceOrder{},
 		&clobtypes.MsgCancelOrder{},
+		&clobtypes.MsgBatchCancel{},
 
 		// Perpetuals.
 		&perpetualtypes.MsgAddPremiumVotes{},

protocol/x/clob/ante/clob.go

@@ -140,7 +140,6 @@ func (cd ClobDecorator) AnteHandle(
 			return next(ctx, tx, simulate)
 		}
 
-		fmt.Println("msg batch cancellll", msg)
 		ctx = log.AddPersistentTagsToLogger(ctx,
 			log.Handler, log.MsgBatchCancel,
 		)

protocol/x/clob/keeper/orders.go

@@ -80,7 +80,6 @@ func (k Keeper) BatchCancelShortTermOrder(
 			)
 		}
 	}
-	fmt.Println("good good")
 	subaccountId := msg.GetSubaccountId()
 	oneCancelSucceeded := false
 	for _, batchOrder := range msg.GetShortTermCancels() {
@@ -97,7 +96,6 @@ func (k Keeper) BatchCancelShortTermOrder(
 					GoodTilBlock: goodTilBlock,
 				},
 			}
-			fmt.Println("running st order cancel", msgCancelOrder)
 			// Run the short term order. If it errors, just log silently.
 			err := k.CancelShortTermOrder(
 				ctx,