Updating example to pull signature data from creator address endpoint

Author: Tanz0rz

sdk-clients/orderbook/api.go

@@ -51,7 +51,7 @@ func (api *api) CreateOrder(ctx context.Context, params CreateOrderParams) (*Cre
 // 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) {
+func (api *api) GetOrdersByCreatorAddress(ctx context.Context, params GetOrdersByCreatorAddressParams) ([]*OrderResponse, error) {
 	u := fmt.Sprintf("/orderbook/v4.0/%d/address/%s", api.chainId, params.CreatorAddress)
 
 	err := params.Validate()
@@ -65,7 +65,7 @@ func (api *api) GetOrdersByCreatorAddress(ctx context.Context, params GetOrdersB
 		U:      u,
 	}
 
-	var ordersResponse []OrderResponse
+	var ordersResponse []*OrderResponse
 	err = api.httpExecutor.ExecuteRequest(ctx, payload, &ordersResponse)
 	if err != nil {
 		return nil, err

sdk-clients/orderbook/examples/create_and_fill_order/main.go

@@ -91,20 +91,19 @@ func main() {
 	// Sleep to accommodate free-tier API keys
 	time.Sleep(time.Second)
 
-	getOrderResponse, err := client.GetOrdersByCreatorAddress(ctx, orderbook.GetOrdersByCreatorAddressParams{
+	ordersByCreatorResponse, err := client.GetOrdersByCreatorAddress(ctx, orderbook.GetOrdersByCreatorAddressParams{
 		CreatorAddress: client.Wallet.Address().Hex(),
 	})
 
-	fmt.Printf("Order created! \nOrder hash: %v\n", getOrderResponse[0].OrderHash)
+	fmt.Printf("Order created! \nOrder hash: %v\n", ordersByCreatorResponse[0].OrderHash)
 
 	// Sleep to accommodate free-tier API keys
 	time.Sleep(time.Second)
 
-	getOrderRresponse, err := client.GetOrder(ctx, orderbook.GetOrderParams{
-		OrderHash: getOrderResponse[0].OrderHash,
-	})
-
-	fillOrderData, err := client.GetFillOrderCalldata(getOrderRresponse, nil)
+	fillOrderData, err := client.GetFillOrderCalldata(ordersByCreatorResponse[0], nil)
+	if err != nil {
+		log.Fatalf("Failed to get fill order calldata: %v", err)
+	}
 
 	aggregationRouter, err := constants.Get1inchRouterFromChainId(chainId)
 	if err != nil {

sdk-clients/orderbook/normalization.go

@@ -50,6 +50,48 @@ func NormalizeGetOrderByHashResponse(resp *GetOrderByHashResponse) (*GetOrderByH
 	}, nil
 }
 
+func NormalizeOrderResponse(resp *OrderResponse) (*OrderResponseExtended, error) {
+	saltBigInt, ok := new(big.Int).SetString(resp.Data.Salt, 10)
+	if !ok {
+		saltBigInt, ok = new(big.Int).SetString(resp.Data.Salt[2:], 16)
+		if !ok {
+			return nil, fmt.Errorf("invalid salt value")
+		}
+	}
+	makingAmountBigInt, ok := new(big.Int).SetString(resp.Data.MakingAmount, 10)
+	if !ok {
+		return nil, fmt.Errorf("invalid making amount value")
+	}
+	takingAmountBigInt, ok := new(big.Int).SetString(resp.Data.TakingAmount, 10)
+	if !ok {
+		return nil, fmt.Errorf("invalid taking amount value")
+	}
+
+	makerAssetBigInt := AddressStringToBigInt(resp.Data.MakerAsset)
+	takerAssetBigInt := AddressStringToBigInt(resp.Data.TakerAsset)
+	makerBigInt := AddressStringToBigInt(resp.Data.Maker)
+	receiverBigInt := AddressStringToBigInt(resp.Data.Receiver)
+
+	makerTraits, err := hexutil.DecodeBig(resp.Data.MakerTraits)
+	if err != nil {
+		return nil, fmt.Errorf("invalid maker traits value")
+	}
+
+	return &OrderResponseExtended{
+		OrderResponse: *resp,
+		LimitOrderDataNormalized: NormalizedLimitOrderData{
+			Salt:         saltBigInt,
+			MakerAsset:   makerAssetBigInt,
+			TakerAsset:   takerAssetBigInt,
+			Maker:        makerBigInt,
+			Receiver:     receiverBigInt,
+			MakingAmount: makingAmountBigInt,
+			TakingAmount: takingAmountBigInt,
+			MakerTraits:  makerTraits,
+		},
+	}, nil
+}
+
 func AddressStringToBigInt(addressString string) *big.Int {
 	address := common.HexToAddress(addressString)
 	addressBytes := new(big.Int).SetBytes(address.Bytes())

sdk-clients/orderbook/orderbook_types_manual.go

@@ -92,6 +92,11 @@ type OrderResponse struct {
 	OrderInvalidReason   interface{} `json:"orderInvalidReason"`
 }
 
+type OrderResponseExtended struct {
+	OrderResponse
+	LimitOrderDataNormalized NormalizedLimitOrderData
+}
+
 type GetOrderByHashResponse struct {
 	ID                   int         `json:"id"`
 	OrderHash            string      `json:"orderHash"`
@@ -101,7 +106,6 @@ type GetOrderByHashResponse struct {
 	MakerAsset           string      `json:"makerAsset"`
 	OrderMaker           string      `json:"orderMaker"`
 	OrderStatus          int         `json:"orderStatus"`
-	Signature            string      `json:"signature"`
 	MakerAmount          string      `json:"makerAmount"`
 	RemainingMakerAmount string      `json:"remainingMakerAmount"`
 	MakerBalance         string      `json:"makerBalance"`

sdk-clients/orderbook/web3data.go

@@ -39,10 +39,15 @@ func (c *Client) GetSeriesNonce(ctx context.Context, publicAddress gethCommon.Ad
 	return nonce, nil
 }
 
-func (c *Client) GetFillOrderCalldata(getOrderResponse *GetOrderByHashResponseExtended, takerTraits *TakerTraits) ([]byte, error) {
+func (c *Client) GetFillOrderCalldata(orderResponse *OrderResponse, takerTraits *TakerTraits) ([]byte, error) {
+
+	orderResponseExtended, err := NormalizeOrderResponse(orderResponse)
+	if err != nil {
+		return nil, err
+	}
 
 	var function string
-	if getOrderResponse.Data.Extension == "0x" {
+	if orderResponseExtended.Data.Extension == "0x" {
 		function = "fillOrder"
 	} else {
 		if takerTraits == nil {
@@ -52,7 +57,7 @@ func (c *Client) GetFillOrderCalldata(getOrderResponse *GetOrderByHashResponseEx
 		function = "fillOrderArgs"
 	}
 
-	compressedSignature, err := CompressSignature(getOrderResponse.Signature[2:])
+	compressedSignature, err := CompressSignature(orderResponseExtended.Signature[2:])
 	if err != nil {
 		return nil, err
 	}
@@ -71,13 +76,13 @@ func (c *Client) GetFillOrderCalldata(getOrderResponse *GetOrderByHashResponseEx
 
 	switch function {
 	case "fillOrder":
-		fillOrderData, err = c.AggregationRouterV6.Pack(function, getOrderResponse.LimitOrderDataNormalized, rCompressed, vsCompressed, getOrderResponse.LimitOrderDataNormalized.TakingAmount, big.NewInt(0))
+		fillOrderData, err = c.AggregationRouterV6.Pack(function, orderResponseExtended.LimitOrderDataNormalized, rCompressed, vsCompressed, orderResponseExtended.LimitOrderDataNormalized.TakingAmount, big.NewInt(0))
 		if err != nil {
 			return nil, err
 		}
 	case "fillOrderArgs":
 		takerTraitsEncoded := takerTraits.Encode()
-		fillOrderData, err = c.AggregationRouterV6.Pack(function, getOrderResponse.LimitOrderDataNormalized, rCompressed, vsCompressed, getOrderResponse.LimitOrderDataNormalized.TakingAmount, takerTraitsEncoded.TraitFlags, takerTraitsEncoded.Args)
+		fillOrderData, err = c.AggregationRouterV6.Pack(function, orderResponseExtended.LimitOrderDataNormalized, rCompressed, vsCompressed, orderResponseExtended.LimitOrderDataNormalized.TakingAmount, takerTraitsEncoded.TraitFlags, takerTraitsEncoded.Args)
 		if err != nil {
 			return nil, err
 		}