Merge branch 'fusion-refactor' of github.com:1inch/1inch-sdk-go into fusion-refactor

Author: Tanz0rz

sdk-clients/orderbook/api.go

@@ -12,7 +12,7 @@ import (
 
 // CreateOrder creates an order in the Limit Order Protocol
 func (api *api) CreateOrder(ctx context.Context, params CreateOrderParams) (*CreateOrderResponse, error) {
-	u := fmt.Sprintf("/orderbook/v4.0/%d", api.chainId)
+	u := fmt.Sprintf("/orderbook/v4.1/%d", api.chainId)
 
 	err := params.Validate()
 	if err != nil {
@@ -49,8 +49,6 @@ func (api *api) CreateOrder(ctx context.Context, params CreateOrderParams) (*Cre
 	return &createOrderResponse, nil
 }
 
-// TODO Reusing the same request/response objects until the openapi spec is updated to include the correct object definitions
-
 // GetOrdersByCreatorAddress returns all orders created by a given address in the Limit Order Protocol
 func (api *api) GetOrdersByCreatorAddress(ctx context.Context, params GetOrdersByCreatorAddressParams) ([]*OrderResponse, error) {
 	u := fmt.Sprintf("/orderbook/v4.0/%d/address/%s", api.chainId, params.CreatorAddress)
@@ -77,7 +75,7 @@ func (api *api) GetOrdersByCreatorAddress(ctx context.Context, params GetOrdersB
 
 // GetOrder returns an order from Limit Order Protocol that matches a specific hash
 func (api *api) GetOrder(ctx context.Context, params GetOrderParams) (*GetOrderByHashResponseExtended, error) {
-	u := fmt.Sprintf("/orderbook/v4.0/%d/order/%s", api.chainId, params.OrderHash)
+	u := fmt.Sprintf("/orderbook/v4.1/%d/order/%s", api.chainId, params.OrderHash)
 
 	err := params.Validate()
 	if err != nil {
@@ -99,6 +97,30 @@ func (api *api) GetOrder(ctx context.Context, params GetOrderParams) (*GetOrderB
 	return NormalizeGetOrderByHashResponse(getOrderByHashResponse)
 }
 
+// GetOrderCount returns the number of orders for a given trading pair with a specific status
+func (api *api) GetOrderCount(ctx context.Context, params GetOrderCountParams) (*GetOrderCountResponse, error) {
+	u := fmt.Sprintf("/orderbook/v4.1/%d/count", api.chainId)
+
+	err := params.Validate()
+	if err != nil {
+		return nil, err
+	}
+
+	payload := common.RequestPayload{
+		Method: "GET",
+		Params: params,
+		U:      u,
+	}
+
+	var response GetOrderCountResponse
+	err = api.httpExecutor.ExecuteRequest(ctx, payload, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	return &response, nil
+}
+
 // GetOrderWithSignature first looks up an order by hash, then does a second request to get the signature data
 func (api *api) GetOrderWithSignature(ctx context.Context, params GetOrderParams) (*OrderExtendedWithSignature, error) {
 
@@ -115,7 +137,7 @@ func (api *api) GetOrderWithSignature(ctx context.Context, params GetOrderParams
 
 	// Second, lookup all orders by that creator (these orders will contain the signature data)
 	allOrdersByCreator, err := api.GetOrdersByCreatorAddress(ctx, GetOrdersByCreatorAddressParams{
-		CreatorAddress: order.OrderMaker,
+		CreatorAddress: order.Data.Maker,
 	})
 	if err != nil {
 		return nil, err
@@ -136,8 +158,8 @@ func (api *api) GetOrderWithSignature(ctx context.Context, params GetOrderParams
 }
 
 // GetAllOrders returns all orders in the Limit Order Protocol
-func (api *api) GetAllOrders(ctx context.Context, params GetAllOrdersParams) ([]OrderResponse, error) {
-	u := fmt.Sprintf("/orderbook/v3.0/%d/all", api.chainId)
+func (api *api) GetAllOrders(ctx context.Context, params GetAllOrdersParams) (*Orders, error) {
+	u := fmt.Sprintf("/orderbook/v4.1/%d/all", api.chainId)
 
 	err := params.Validate()
 	if err != nil {
@@ -150,92 +172,17 @@ func (api *api) GetAllOrders(ctx context.Context, params GetAllOrdersParams) ([]
 		U:      u,
 	}
 
-	var allOrdersResponse []OrderResponse
+	var allOrdersResponse Orders
 	err = api.httpExecutor.ExecuteRequest(ctx, payload, &allOrdersResponse)
 	if err != nil {
 		return nil, err
 	}
 
-	return allOrdersResponse, nil
-}
-
-// GetCount returns the number of orders in the Limit Order Protocol
-func (api *api) GetCount(ctx context.Context, params GetCountParams) (*CountResponse, error) {
-	u := fmt.Sprintf("/orderbook/v3.0/%d/count", api.chainId)
-
-	err := params.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	payload := common.RequestPayload{
-		Method: "GET",
-		Params: params,
-		U:      u,
-	}
-
-	var count CountResponse
-	err = api.httpExecutor.ExecuteRequest(ctx, payload, &count)
-	if err != nil {
-		return nil, err
-	}
-
-	return &count, nil
+	return &allOrdersResponse, nil
 }
 
-// GetEvent returns an event in the Limit Order Protocol by order hash
-func (api *api) GetEvent(ctx context.Context, params GetEventParams) (*EventResponse, error) {
-	u := fmt.Sprintf("/orderbook/v3.0/%d/events/%s", api.chainId, params.OrderHash)
-
-	err := params.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	payload := common.RequestPayload{
-		Method: "GET",
-		Params: params,
-		U:      u,
-	}
-
-	var event EventResponse
-	err = api.httpExecutor.ExecuteRequest(ctx, payload, &event)
-	if err != nil {
-		return nil, err
-	}
-
-	return &event, nil
-}
-
-// GetEvents returns all events in the Limit Order Protocol
-func (api *api) GetEvents(ctx context.Context, params GetEventsParams) ([]EventResponse, error) {
-	u := fmt.Sprintf("/orderbook/v3.0/%d/events", api.chainId)
-
-	err := params.Validate()
-	if err != nil {
-		return nil, err
-	}
-
-	payload := common.RequestPayload{
-		Method: "GET",
-		Params: params,
-		U:      u,
-	}
-
-	var events []EventResponse
-	err = api.httpExecutor.ExecuteRequest(ctx, payload, &events)
-	if err != nil {
-		return nil, err
-	}
-
-	return events, nil
-}
-
-// TODO untested endpoint
-
-// GetActiveOrdersWithPermit returns all orders in the Limit Order Protocol that are active and have a valid permit
-func (api *api) GetActiveOrdersWithPermit(ctx context.Context, params GetActiveOrdersWithPermitParams) ([]OrderResponse, error) {
-	u := fmt.Sprintf("/orderbook/v3.0/%d/has-active-orders-with-permit/%s/%s", api.chainId, params.Token, params.Wallet)
+func (api *api) GetFeeInfo(ctx context.Context, params GetFeeInfoParams) (*FeeInfoResponse, error) {
+	u := fmt.Sprintf("/orderbook/v4.0/%d/fee-info", api.chainId)
 
 	err := params.Validate()
 	if err != nil {
@@ -248,11 +195,11 @@ func (api *api) GetActiveOrdersWithPermit(ctx context.Context, params GetActiveO
 		U:      u,
 	}
 
-	var orders []OrderResponse
-	err = api.httpExecutor.ExecuteRequest(ctx, payload, &orders)
+	var feeInfo *FeeInfoResponse
+	err = api.httpExecutor.ExecuteRequest(ctx, payload, &feeInfo)
 	if err != nil {
 		return nil, err
 	}
 
-	return orders, nil
+	return feeInfo, nil
 }