Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TD962 Update fulfillment-data usage for single order fulfillment #922

Merged
merged 2 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/orderbook/src/api-client/api-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
ListListingsParams,
ListTradesParams,
} from '../types';
import { FulfillmentDataResult } from '../openapi/sdk/models/FulfillmentDataResult';
import { FulfillableOrder } from '../openapi/sdk/models/FulfillableOrder';
import { UnfulfillableOrder } from '../openapi/sdk/models/UnfulfillableOrder';
import { FulfillmentDataRequest } from '../openapi/sdk/models/FulfillmentDataRequest';
import { ItemType, SEAPORT_CONTRACT_VERSION_V1_5 } from '../seaport';

Expand All @@ -26,7 +27,12 @@ export class ImmutableApiClient {

async fulfillmentData(
requests: Array<FulfillmentDataRequest>,
): Promise<{ result: FulfillmentDataResult[] }> {
): Promise<{
result: {
fulfillable_orders: Array<FulfillableOrder>;
Sam-Jeston marked this conversation as resolved.
Show resolved Hide resolved
unfulfillable_orders: Array<UnfulfillableOrder>;
};
}> {
return this.orderbookService.fulfillmentData({
chainName: this.chainName,
requestBody: requests,
Expand Down
3 changes: 2 additions & 1 deletion packages/orderbook/src/openapi/sdk/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export type { ERC20Item } from './models/ERC20Item';
export type { ERC721Item } from './models/ERC721Item';
export type { Error } from './models/Error';
export { Fee } from './models/Fee';
export type { FulfillableOrder } from './models/FulfillableOrder';
export type { FulfillmentDataRequest } from './models/FulfillmentDataRequest';
export type { FulfillmentDataResult } from './models/FulfillmentDataResult';
export type { Item } from './models/Item';
export type { ListingResult } from './models/ListingResult';
export type { ListListingsResult } from './models/ListListingsResult';
Expand All @@ -32,5 +32,6 @@ export { ProtocolData } from './models/ProtocolData';
export type { Trade } from './models/Trade';
export type { TradeBlockchainMetadata } from './models/TradeBlockchainMetadata';
export type { TradeResult } from './models/TradeResult';
export type { UnfulfillableOrder } from './models/UnfulfillableOrder';

export { OrdersService } from './services/OrdersService';
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import type { Order } from './Order';

export type FulfillmentDataResult = {
export type FulfillableOrder = {
extra_data: string;
order: Order;
};
Expand Down
15 changes: 15 additions & 0 deletions packages/orderbook/src/openapi/sdk/models/UnfulfillableOrder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type UnfulfillableOrder = {
/**
* OrderID for the requested but unfulfillable order
*/
order_id: string;
/**
* Nullable string containing error reason if the signing is unsuccessful for the order
*/
reason: string;
};

Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
/* eslint-disable */
import type { ChainName } from '../models/ChainName';
import type { CreateListingRequestBody } from '../models/CreateListingRequestBody';
import type { FulfillableOrder } from '../models/FulfillableOrder';
import type { FulfillmentDataRequest } from '../models/FulfillmentDataRequest';
import type { FulfillmentDataResult } from '../models/FulfillmentDataResult';
import type { ListingResult } from '../models/ListingResult';
import type { ListListingsResult } from '../models/ListListingsResult';
import type { ListTradeResult } from '../models/ListTradeResult';
import type { OrderStatus } from '../models/OrderStatus';
import type { PageCursor } from '../models/PageCursor';
import type { PageSize } from '../models/PageSize';
import type { TradeResult } from '../models/TradeResult';
import type { UnfulfillableOrder } from '../models/UnfulfillableOrder';

import type { CancelablePromise } from '../core/CancelablePromise';
import type { BaseHttpRequest } from '../core/BaseHttpRequest';
Expand Down Expand Up @@ -168,7 +169,10 @@ export class OrdersService {
chainName: ChainName,
requestBody: Array<FulfillmentDataRequest>,
}): CancelablePromise<{
result: Array<FulfillmentDataResult>;
result: {
fulfillable_orders: Array<FulfillableOrder>;
unfulfillable_orders: Array<UnfulfillableOrder>;
};
}> {
return this.httpRequest.request({
method: 'POST',
Expand Down
10 changes: 6 additions & 4 deletions packages/orderbook/src/orderbook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,14 @@ export class Orderbook {
},
]);

if (fulfillmentDataRes.result.length !== 1) {
throw new Error('unexpected fulfillment data result length');
if (fulfillmentDataRes.result.unfulfillable_orders?.length > 0) {
throw new Error(`Unable to prepare fulfillment date: ${fulfillmentDataRes.result.unfulfillable_orders[0].reason}`);
} else if (fulfillmentDataRes.result.fulfillable_orders?.length !== 1) {
throw new Error('unexpected fulfillable order result length');
}

const extraData = fulfillmentDataRes.result[0].extra_data;
const orderResult = fulfillmentDataRes.result[0].order;
const extraData = fulfillmentDataRes.result.fulfillable_orders[0].extra_data;
const orderResult = fulfillmentDataRes.result.fulfillable_orders[0].order;

if (orderResult.status !== OrderStatus.ACTIVE) {
throw new Error(
Expand Down