From ee4e1ea5136c02d4e334c5deeb7f64e8449cb270 Mon Sep 17 00:00:00 2001 From: Sam Jeston Date: Thu, 28 Sep 2023 14:34:34 +1000 Subject: [PATCH] [TD-927] update order book openapi client (#914) --- packages/orderbook/src/api-client/api-client.ts | 6 +++--- packages/orderbook/src/openapi/mapper.ts | 8 ++++---- .../openapi/sdk/models/CreateListingRequestBody.ts | 4 ++-- packages/orderbook/src/openapi/sdk/models/Fee.ts | 4 ++-- packages/orderbook/src/openapi/sdk/models/Order.ts | 8 ++++---- .../src/openapi/sdk/services/OrdersService.ts | 2 +- packages/orderbook/src/orderbook.ts | 2 +- .../orderbook/src/seaport/map-to-seaport-order.ts | 4 ++-- packages/orderbook/src/seaport/seaport.test.ts | 8 ++++---- packages/orderbook/src/types.ts | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/orderbook/src/api-client/api-client.ts b/packages/orderbook/src/api-client/api-client.ts index 458b662229..05f63c91b1 100644 --- a/packages/orderbook/src/api-client/api-client.ts +++ b/packages/orderbook/src/api-client/api-client.ts @@ -105,10 +105,10 @@ export class ImmutableApiClient { ], fees: makerFees.map((x) => ({ amount: x.amount, - fee_type: FeeType.MAKER_MARKETPLACE as unknown as Fee.fee_type, + fee_type: FeeType.MAKER_ECOSYSTEM as unknown as Fee.fee_type, recipient: x.recipient, })), - end_time: new Date( + end_at: new Date( parseInt(`${orderComponents.endTime.toString()}000`, 10), ).toISOString(), protocol_data: { @@ -127,7 +127,7 @@ export class ImmutableApiClient { }, ], signature: orderSignature, - start_time: new Date( + start_at: new Date( parseInt(`${orderComponents.startTime.toString()}000`, 10), ).toISOString(), }, diff --git a/packages/orderbook/src/openapi/mapper.ts b/packages/orderbook/src/openapi/mapper.ts index b7b870670e..6adf4b26f0 100644 --- a/packages/orderbook/src/openapi/mapper.ts +++ b/packages/orderbook/src/openapi/mapper.ts @@ -54,8 +54,8 @@ export function mapFromOpenApiOrder(order: OpenApiOrder): Order { type: fee.fee_type as unknown as FeeType, })), chain: order.chain, - createTime: order.create_time, - endTime: order.end_time, + createdAt: order.created_at, + endAt: order.end_at, protocolData: { counter: order.protocol_data.counter, orderType: order.protocol_data.order_type, @@ -65,9 +65,9 @@ export function mapFromOpenApiOrder(order: OpenApiOrder): Order { }, salt: order.salt, signature: order.signature, - startTime: order.start_time, + startAt: order.start_at, status: order.status, - updateTime: order.update_time, + updatedAt: order.updated_at, }; } diff --git a/packages/orderbook/src/openapi/sdk/models/CreateListingRequestBody.ts b/packages/orderbook/src/openapi/sdk/models/CreateListingRequestBody.ts index c47c9992c3..a3cdbe4336 100644 --- a/packages/orderbook/src/openapi/sdk/models/CreateListingRequestBody.ts +++ b/packages/orderbook/src/openapi/sdk/models/CreateListingRequestBody.ts @@ -20,7 +20,7 @@ export type CreateListingRequestBody = { /** * Time after which the Order is considered expired */ - end_time: string; + end_at: string; protocol_data: ProtocolData; /** * A random value added to the create Order request @@ -37,6 +37,6 @@ export type CreateListingRequestBody = { /** * Time after which Order is considered active */ - start_time: string; + start_at: string; }; diff --git a/packages/orderbook/src/openapi/sdk/models/Fee.ts b/packages/orderbook/src/openapi/sdk/models/Fee.ts index 99b5c4f5c4..85d8d66518 100644 --- a/packages/orderbook/src/openapi/sdk/models/Fee.ts +++ b/packages/orderbook/src/openapi/sdk/models/Fee.ts @@ -24,8 +24,8 @@ export namespace Fee { */ export enum fee_type { ROYALTY = 'ROYALTY', - MAKER_MARKETPLACE = 'MAKER_MARKETPLACE', - TAKER_MARKETPLACE = 'TAKER_MARKETPLACE', + MAKER_ECOSYSTEM = 'MAKER_ECOSYSTEM', + TAKER_ECOSYSTEM = 'TAKER_ECOSYSTEM', PROTOCOL = 'PROTOCOL', } diff --git a/packages/orderbook/src/openapi/sdk/models/Order.ts b/packages/orderbook/src/openapi/sdk/models/Order.ts index aaf30b595e..611e49eecc 100644 --- a/packages/orderbook/src/openapi/sdk/models/Order.ts +++ b/packages/orderbook/src/openapi/sdk/models/Order.ts @@ -16,11 +16,11 @@ export type Order = { /** * Time the Order is created */ - create_time: string; + created_at: string; /** * Time after which the Order is considered expired */ - end_time: string; + end_at: string; /** * Global Order identifier */ @@ -38,11 +38,11 @@ export type Order = { /** * Time after which Order is considered active */ - start_time: string; + start_at: string; status: OrderStatus; /** * Time the Order is last updated */ - update_time: string; + updated_at: string; }; diff --git a/packages/orderbook/src/openapi/sdk/services/OrdersService.ts b/packages/orderbook/src/openapi/sdk/services/OrdersService.ts index d2be336ae6..f951374dbc 100644 --- a/packages/orderbook/src/openapi/sdk/services/OrdersService.ts +++ b/packages/orderbook/src/openapi/sdk/services/OrdersService.ts @@ -209,7 +209,7 @@ export class OrdersService { /** * Trade field to sort by */ - sortBy?: 'created_at', + sortBy?: 'indexed_at', /** * Ascending or descending direction for sort */ diff --git a/packages/orderbook/src/orderbook.ts b/packages/orderbook/src/orderbook.ts index 1208c44e0f..9f1d7a3c34 100644 --- a/packages/orderbook/src/orderbook.ts +++ b/packages/orderbook/src/orderbook.ts @@ -206,7 +206,7 @@ export class Orderbook { fees: takerFees.map((fee) => ({ amount: fee.amount, fee_type: - FeeType.TAKER_MARKETPLACE as unknown as OpenApiFee.fee_type.TAKER_MARKETPLACE, + FeeType.TAKER_ECOSYSTEM as unknown as OpenApiFee.fee_type.TAKER_ECOSYSTEM, recipient: fee.recipient, })), }, diff --git a/packages/orderbook/src/seaport/map-to-seaport-order.ts b/packages/orderbook/src/seaport/map-to-seaport-order.ts index 7cd9a9e530..53d2ed9d98 100644 --- a/packages/orderbook/src/seaport/map-to-seaport-order.ts +++ b/packages/orderbook/src/seaport/map-to-seaport-order.ts @@ -71,9 +71,9 @@ export function mapImmutableOrderToSeaportOrderComponents( }; }), counter, - endTime: Math.round(new Date(order.end_time).getTime() / 1000).toString(), + endTime: Math.round(new Date(order.end_at).getTime() / 1000).toString(), startTime: Math.round( - new Date(order.start_time).getTime() / 1000, + new Date(order.start_at).getTime() / 1000, ).toString(), salt: order.salt, offerer: order.account_address, diff --git a/packages/orderbook/src/seaport/seaport.test.ts b/packages/orderbook/src/seaport/seaport.test.ts index e0560f4ab2..3be8ccc1be 100644 --- a/packages/orderbook/src/seaport/seaport.test.ts +++ b/packages/orderbook/src/seaport/seaport.test.ts @@ -392,8 +392,8 @@ describe('Seaport', () => { buy: [{ item_type: 'NATIVE', start_amount: '100' }], fees: [], chain: { id: '1', name: 'imtbl-zkevm-local' }, - create_time: new Date().toISOString(), - end_time: new Date().toISOString(), + created_at: new Date().toISOString(), + end_at: new Date().toISOString(), id: '1', protocol_data: { order_type: ProtocolData.order_type.FULL_RESTRICTED, @@ -412,8 +412,8 @@ describe('Seaport', () => { ], signature: randomAddress(), status: OrderStatus.ACTIVE, - start_time: new Date().toISOString(), - update_time: new Date().toISOString(), + start_at: new Date().toISOString(), + updated_at: new Date().toISOString(), }; beforeEach(() => { diff --git a/packages/orderbook/src/types.ts b/packages/orderbook/src/types.ts index 69b4b64f05..941f7c4e1a 100644 --- a/packages/orderbook/src/types.ts +++ b/packages/orderbook/src/types.ts @@ -60,8 +60,8 @@ Parameters[0], >; export enum FeeType { - MAKER_MARKETPLACE = OpenapiFee.fee_type.MAKER_MARKETPLACE, - TAKER_MARKETPLACE = OpenapiFee.fee_type.TAKER_MARKETPLACE, + MAKER_ECOSYSTEM = OpenapiFee.fee_type.MAKER_ECOSYSTEM, + TAKER_ECOSYSTEM = OpenapiFee.fee_type.TAKER_ECOSYSTEM, PROTOCOL = OpenapiFee.fee_type.PROTOCOL, ROYALTY = OpenapiFee.fee_type.ROYALTY, } @@ -134,16 +134,16 @@ export interface Order { id: string; name: string; }; - createTime: string; - updateTime: string; + createdAt: string; + updatedAt: string; /** * Time after which the Order is considered active */ - startTime: string; + startAt: string; /** * Time after which the Order is expired */ - endTime: string; + endAt: string; protocolData: { orderType: 'FULL_RESTRICTED'; zoneAddress: string;