remove margin broker messages

proto/elys/margin/tx.proto

@@ -13,8 +13,6 @@ import "elys/margin/types.proto";
 service Msg {
   rpc Open         (MsgOpen        ) returns (MsgOpenResponse        );
   rpc Close        (MsgClose       ) returns (MsgCloseResponse       );
-  rpc BrokerOpen         (MsgBrokerOpen        ) returns (MsgBrokerOpenResponse        );
-  rpc BrokerClose        (MsgBrokerClose       ) returns (MsgBrokerCloseResponse       );
   rpc UpdateParams (MsgUpdateParams) returns (MsgUpdateParamsResponse);
   rpc UpdatePools  (MsgUpdatePools ) returns (MsgUpdatePoolsResponse );
   rpc Whitelist    (MsgWhitelist   ) returns (MsgWhitelistResponse   );
@@ -49,37 +47,6 @@ message MsgCloseResponse {
   ];
 }
 
-message MsgBrokerOpen {
-  string   creator          = 1;
-  string   collateral_asset  = 2;
-  string   collateral_amount = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
-  string   borrow_asset      = 4;
-  Position position         = 5;
-  string   leverage         = 6 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  string   take_profit_price  = 7 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  string   owner = 8;
-}
-
-message MsgBrokerOpenResponse {
-  uint64 id = 1;
-}
-
-message MsgBrokerClose {
-  string creator = 1;
-  uint64 id      = 2;
-  string owner = 3;
-  cosmos.base.v1beta1.Coin amount = 4 [
-    (gogoproto.nullable) = false
-  ];
-}
-
-message MsgBrokerCloseResponse {
-  uint64 id = 1;
-  cosmos.base.v1beta1.Coin amount = 3 [
-    (gogoproto.nullable) = false
-  ];
-}
-
 message MsgUpdateParams {
 
   // authority is the address that controls the module (defaults to x/gov unless overwritten).

wasmbindings/types/types.go

@@ -274,10 +274,8 @@ type ElysMsg struct {
 	LeveragelpClose *leveragelptypes.MsgClose `json:"leveragelp_close,omitempty"`
 
 	// margin messages
-	MarginOpen        *margintypes.MsgOpen        `json:"margin_open,omitempty"`
-	MarginClose       *margintypes.MsgClose       `json:"margin_close,omitempty"`
-	MarginBrokerOpen  *margintypes.MsgBrokerOpen  `json:"margin_broker_open,omitempty"`
-	MarginBrokerClose *margintypes.MsgBrokerClose `json:"margin_broker_close,omitempty"`
+	MarginOpen  *margintypes.MsgOpen  `json:"margin_open,omitempty"`
+	MarginClose *margintypes.MsgClose `json:"margin_close,omitempty"`
 
 	// oracle messages
 	// parameter messages

x/margin/client/cli/tx.go

@@ -33,8 +33,6 @@ func GetTxCmd() *cobra.Command {
 
 	cmd.AddCommand(CmdOpen())
 	cmd.AddCommand(CmdClose())
-	cmd.AddCommand(CmdBrokerOpen())
-	cmd.AddCommand(CmdBrokerClose())
 	cmd.AddCommand(CmdUpdateParams())
 	cmd.AddCommand(CmdUpdatePools())
 	cmd.AddCommand(CmdWhitelist())

x/margin/client/wasm/messenger.go

@@ -29,10 +29,6 @@ func (m *Messenger) HandleMsg(ctx sdk.Context, contractAddr sdk.AccAddress, cont
 		return m.msgOpen(ctx, contractAddr, msg.MarginOpen)
 	case msg.MarginClose != nil:
 		return m.msgClose(ctx, contractAddr, msg.MarginClose)
-	case msg.MarginBrokerOpen != nil:
-		return m.msgBrokerOpen(ctx, contractAddr, msg.MarginBrokerOpen)
-	case msg.MarginBrokerClose != nil:
-		return m.msgBrokerClose(ctx, contractAddr, msg.MarginBrokerClose)
 	default:
 		// This handler cannot handle the message
 		return nil, nil, wasmbindingstypes.ErrCannotHandleMsg

x/margin/client/wasm/query_get_status.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (oq *Querier) queryGetStatus(ctx sdk.Context, query *types.StatusRequest) ([]byte, error) {
-	res, err := oq.keeper.GetStatus(ctx, query)
+	res, err := oq.keeper.GetStatus(sdk.WrapSDKContext(ctx), query)
 	if err != nil {
 		return nil, errorsmod.Wrap(err, "failed to get status")
 	}

x/margin/client/wasm/query_get_whitelist.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (oq *Querier) queryGetWhitelist(ctx sdk.Context, query *types.WhitelistRequest) ([]byte, error) {
-	res, err := oq.keeper.GetWhitelist(ctx, query)
+	res, err := oq.keeper.GetWhitelist(sdk.WrapSDKContext(ctx), query)
 	if err != nil {
 		return nil, errorsmod.Wrap(err, "failed to get whitelist")
 	}

x/margin/client/wasm/query_is_whitelisted.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (oq *Querier) queryIsWhitelisted(ctx sdk.Context, query *types.IsWhitelistedRequest) ([]byte, error) {
-	res, err := oq.keeper.IsWhitelisted(ctx, query)
+	res, err := oq.keeper.IsWhitelisted(sdk.WrapSDKContext(ctx), query)
 	if err != nil {
 		return nil, errorsmod.Wrap(err, "failed to get is whitelisted")
 	}

x/margin/client/wasm/query_mtp.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (oq *Querier) queryMtp(ctx sdk.Context, query *types.MTPRequest) ([]byte, error) {
-	res, err := oq.keeper.MTP(ctx, query)
+	res, err := oq.keeper.MTP(sdk.WrapSDKContext(ctx), query)
 	if err != nil {
 		return nil, errorsmod.Wrap(err, "failed to get mtp")
 	}