diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 4fb87b2fc..88615da60 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -273,18 +273,6 @@ type DexQuery struct { PoolMetadata *dextypes.QueryGetPoolMetadataRequest `json:"pool_metadata"` // Queries a list of PoolMetadata items. PoolMetadataAll *dextypes.QueryAllPoolMetadataRequest `json:"pool_metadata_all"` - /// Simulates MsgDeposit - SimulateDeposit *dextypes.QuerySimulateDepositRequest `json:"simulate_deposit"` - /// Simulates MsgWithdrawal - SimulateWithdrawal *dextypes.QuerySimulateWithdrawalRequest `json:"simulate_withdrawal"` - /// Simulates MsgPlaceLimitOrder - SimulatePlaceLimitOrder *QuerySimulatePlaceLimitOrderRequest `json:"simulate_place_limit_order"` - /// Simulates MsgWithdrawFilledLimitOrder - SimulateWithdrawFilledLimitOrder *dextypes.QuerySimulateWithdrawFilledLimitOrderRequest `json:"simulate_withdraw_filled_limit_order"` - /// Simulates MsgCancelLimitOrder - SimulateCancelLimitOrder *dextypes.QuerySimulateCancelLimitOrderRequest `json:"simulate_cancel_limit_order"` - /// Simulates MsgMultiHopSwap - SimulateMultiHopSwap *dextypes.QuerySimulateMultiHopSwapRequest `json:"simulate_multi_hop_swap"` } // QueryEstimatePlaceLimitOrderRequest is a copy dextypes.QueryEstimatePlaceLimitOrderRequest with altered ExpirationTime field, @@ -301,7 +289,3 @@ type QueryEstimatePlaceLimitOrderRequest struct { ExpirationTime *uint64 `json:"expiration_time,omitempty"` MaxAmountOut *math.Int `json:"max_amount_out"` } - -type QuerySimulatePlaceLimitOrderRequest struct { - Msg *MsgPlaceLimitOrder `json:"msg"` -} diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 1bf73d369..b7f34fc64 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -16,7 +16,6 @@ import ( sdkquery "github.com/cosmos/cosmos-sdk/types/query" dextypes "github.com/neutron-org/neutron/v4/x/dex/types" - dexutils "github.com/neutron-org/neutron/v4/x/dex/utils" contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" @@ -202,50 +201,6 @@ func (qp *QueryPlugin) DexQuery(ctx sdk.Context, query bindings.DexQuery) (data data, err = dexQuery(ctx, query.TickLiquidityAll, qp.dexKeeper.TickLiquidityAll) case query.UserDepositsAll != nil: data, err = dexQuery(ctx, query.UserDepositsAll, qp.dexKeeper.UserDepositsAll) - case query.SimulateDeposit != nil: - data, err = dexQuery(ctx, query.SimulateDeposit, qp.dexKeeper.SimulateDeposit) - case query.SimulateWithdrawal != nil: - data, err = dexQuery(ctx, query.SimulateWithdrawal, qp.dexKeeper.SimulateWithdrawal) - case query.SimulatePlaceLimitOrder != nil: - q := dextypes.QuerySimulatePlaceLimitOrderRequest{ - Msg: &dextypes.MsgPlaceLimitOrder{ - TokenIn: query.SimulatePlaceLimitOrder.Msg.TokenIn, - TokenOut: query.SimulatePlaceLimitOrder.Msg.TokenOut, - //nolint: staticcheck // TODO: remove in next release - TickIndexInToOut: query.SimulatePlaceLimitOrder.Msg.TickIndexInToOut, - AmountIn: query.SimulatePlaceLimitOrder.Msg.AmountIn, - MaxAmountOut: query.SimulatePlaceLimitOrder.Msg.MaxAmountOut, - }, - } - orderTypeInt, ok := dextypes.LimitOrderType_value[query.SimulatePlaceLimitOrder.Msg.OrderType] - if !ok { - return nil, errors.Wrap(dextypes.ErrInvalidOrderType, - fmt.Sprintf( - "got \"%s\", expected one of %s", - query.SimulatePlaceLimitOrder.Msg.OrderType, - strings.Join(maps.Keys(dextypes.LimitOrderType_value), ", ")), - ) - } - q.Msg.OrderType = dextypes.LimitOrderType(orderTypeInt) - if query.SimulatePlaceLimitOrder.Msg.ExpirationTime != nil { - t := time.Unix(int64(*query.SimulatePlaceLimitOrder.Msg.ExpirationTime), 0) - q.Msg.ExpirationTime = &t - } - if limitPriceStr := query.SimulatePlaceLimitOrder.Msg.LimitSellPrice; limitPriceStr != "" { - limitPriceDec, err := dexutils.ParsePrecDecScientificNotation(limitPriceStr) - if err != nil { - return nil, errors.Wrapf(err, "cannot parse string %s for limit price", limitPriceStr) - } - q.Msg.LimitSellPrice = &limitPriceDec - } - data, err = dexQuery(ctx, &q, qp.dexKeeper.SimulatePlaceLimitOrder) - case query.SimulateWithdrawFilledLimitOrder != nil: - data, err = dexQuery(ctx, query.SimulateWithdrawFilledLimitOrder, qp.dexKeeper.SimulateWithdrawFilledLimitOrder) - case query.SimulateCancelLimitOrder != nil: - data, err = dexQuery(ctx, query.SimulateCancelLimitOrder, qp.dexKeeper.SimulateCancelLimitOrder) - case query.SimulateMultiHopSwap != nil: - data, err = dexQuery(ctx, query.SimulateMultiHopSwap, qp.dexKeeper.SimulateMultiHopSwap) - default: return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown neutron.dex query type"} } diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 1fa16677c..13d8ab761 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -90,12 +90,6 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries { "/neutron.dex.Query/PoolByID": &dextypes.QueryPoolResponse{}, "/neutron.dex.Query/PoolMetadata": &dextypes.QueryGetPoolMetadataResponse{}, "/neutron.dex.Query/PoolMetadataAll": &dextypes.QueryAllPoolMetadataResponse{}, - "/neutron.dex.Query/SimulateDeposit": &dextypes.QuerySimulateDepositResponse{}, - "/neutron.dex.Query/SimulateWithdrawal": &dextypes.QuerySimulateWithdrawalResponse{}, - "/neutron.dex.Query/SimulatePlaceLimitOrder": &dextypes.QuerySimulatePlaceLimitOrderResponse{}, - "/neutron.dex.Query/SimulateWithdrawFilledLimitOrder": &dextypes.QuerySimulateWithdrawFilledLimitOrderResponse{}, - "/neutron.dex.Query/SimulateCancelLimitOrder": &dextypes.QuerySimulateCancelLimitOrderResponse{}, - "/neutron.dex.Query/SimulateMultiHopSwap": &dextypes.QuerySimulateMultiHopSwapResponse{}, // oracle "/slinky.oracle.v1.Query/GetAllCurrencyPairs": &oracletypes.GetAllCurrencyPairsResponse{}, diff --git a/x/dex/types/wasm.go b/x/dex/types/wasm.go index 6688d94b2..3b35d87be 100644 --- a/x/dex/types/wasm.go +++ b/x/dex/types/wasm.go @@ -203,57 +203,3 @@ func (t *QueryAllLimitOrderTrancheUserByAddressResponse) MarshalBinding() ([]byt } return json.Marshal(&allLimitOrders) } - -func (t *QuerySimulateDepositRequest) MarshalBinding() ([]byte, error) { - type QuerySimulateDepositRequestBinding struct { - Msg *MsgDeposit `json:"msg,omitempty"` - } - - metadata := QuerySimulateDepositRequestBinding(*t) - return json.Marshal(&metadata) -} - -func (t *QuerySimulateWithdrawalRequest) MarshalBinding() ([]byte, error) { - type QuerySimulateWithdrawalRequestBinding struct { - Msg *MsgWithdrawal `json:"msg,omitempty"` - } - - metadata := QuerySimulateWithdrawalRequestBinding(*t) - return json.Marshal(&metadata) -} - -func (t *QuerySimulatePlaceLimitOrderRequest) MarshalBinding() ([]byte, error) { - type QuerySimulatePlaceLimitOrderRequestBinding struct { - Msg *MsgPlaceLimitOrder `json:"msg,omitempty"` - } - - metadata := QuerySimulatePlaceLimitOrderRequestBinding(*t) - return json.Marshal(&metadata) -} - -func (t *QuerySimulateWithdrawFilledLimitOrderRequest) MarshalBinding() ([]byte, error) { - type QuerySimulateWithdrawFilledLimitOrderRequestBinding struct { - Msg *MsgWithdrawFilledLimitOrder `json:"msg,omitempty"` - } - - metadata := QuerySimulateWithdrawFilledLimitOrderRequestBinding(*t) - return json.Marshal(&metadata) -} - -func (t *QuerySimulateCancelLimitOrderRequest) MarshalBinding() ([]byte, error) { - type QuerySimulateCancelLimitOrderRequestBinding struct { - Msg *MsgCancelLimitOrder `json:"msg,omitempty"` - } - - metadata := QuerySimulateCancelLimitOrderRequestBinding(*t) - return json.Marshal(&metadata) -} - -func (t *QuerySimulateMultiHopSwapRequest) MarshalBinding() ([]byte, error) { - type QuerySimulateMultiHopSwapRequestBinding struct { - Msg *MsgMultiHopSwap `json:"msg,omitempty"` - } - - metadata := QuerySimulateMultiHopSwapRequestBinding(*t) - return json.Marshal(&metadata) -}