diff --git a/core/src/exchanges/gemini-titan/index.ts b/core/src/exchanges/gemini-titan/index.ts index 1fa4336c..abf55dca 100644 --- a/core/src/exchanges/gemini-titan/index.ts +++ b/core/src/exchanges/gemini-titan/index.ts @@ -172,7 +172,7 @@ export class GeminiTitanExchange extends PredictionMarketExchange { side: 'buy', type: 'limit', amount: 0, - status: 'cancelled', + status: 'canceled', filled: 0, remaining: 0, timestamp: Date.now(), diff --git a/core/src/exchanges/gemini-titan/normalizer.ts b/core/src/exchanges/gemini-titan/normalizer.ts index bccbcb87..c92c1276 100644 --- a/core/src/exchanges/gemini-titan/normalizer.ts +++ b/core/src/exchanges/gemini-titan/normalizer.ts @@ -39,8 +39,8 @@ function mapOrderStatus(geminiStatus: string): Order['status'] { case 'open': return 'open'; case 'accepted': return 'open'; case 'filled': return 'filled'; - case 'cancelled': return 'cancelled'; - case 'canceled': return 'cancelled'; + case 'cancelled': return 'canceled'; + case 'canceled': return 'canceled'; case 'rejected': return 'rejected'; default: return 'open'; } diff --git a/core/src/exchanges/hyperliquid/index.ts b/core/src/exchanges/hyperliquid/index.ts index 665968f4..54814288 100644 --- a/core/src/exchanges/hyperliquid/index.ts +++ b/core/src/exchanges/hyperliquid/index.ts @@ -288,7 +288,7 @@ export class HyperliquidExchange extends PredictionMarketExchange { side: 'buy', type: 'limit', amount: 0, - status: 'cancelled', + status: 'canceled', filled: 0, remaining: 0, timestamp: Date.now(), diff --git a/core/src/exchanges/kalshi/index.ts b/core/src/exchanges/kalshi/index.ts index 450eef35..f8c09144 100644 --- a/core/src/exchanges/kalshi/index.ts +++ b/core/src/exchanges/kalshi/index.ts @@ -352,7 +352,7 @@ export class KalshiExchange extends PredictionMarketExchange { side: order.side === 'yes' ? 'buy' : 'sell', type: 'limit', amount: order.count, - status: 'cancelled', + status: 'canceled', filled: order.count - (order.remaining_count || 0), remaining: 0, timestamp: new Date(order.created_time).getTime(), diff --git a/core/src/exchanges/kalshi/normalizer.ts b/core/src/exchanges/kalshi/normalizer.ts index eaf23f82..74a2a2c1 100644 --- a/core/src/exchanges/kalshi/normalizer.ts +++ b/core/src/exchanges/kalshi/normalizer.ts @@ -275,11 +275,11 @@ export class KalshiNormalizer implements IExchangeNormalizer { return Array.from(this._orders.values()) - .filter(o => o.status === 'filled' || o.status === 'cancelled' || o.status === 'rejected') + .filter(o => o.status === 'filled' || o.status === 'canceled' || o.status === 'rejected') .map(o => ({ ...o })); } diff --git a/core/src/exchanges/opinion/index.ts b/core/src/exchanges/opinion/index.ts index 1f24dad9..97941042 100644 --- a/core/src/exchanges/opinion/index.ts +++ b/core/src/exchanges/opinion/index.ts @@ -376,7 +376,7 @@ export class OpinionExchange extends PredictionMarketExchange { side: 'buy', type: 'limit', amount: 0, - status: 'cancelled', + status: 'canceled', filled: 0, remaining: 0, timestamp: Date.now(), diff --git a/core/src/exchanges/opinion/utils.ts b/core/src/exchanges/opinion/utils.ts index 5425b554..07868d4c 100644 --- a/core/src/exchanges/opinion/utils.ts +++ b/core/src/exchanges/opinion/utils.ts @@ -54,12 +54,12 @@ export function mapIntervalToOpinion(interval: CandleInterval): string { } // Map Opinion order status code to pmxt status string -export function mapOrderStatus(status: number): 'pending' | 'open' | 'filled' | 'cancelled' | 'rejected' { +export function mapOrderStatus(status: number): 'pending' | 'open' | 'filled' | 'canceled' | 'rejected' { switch (status) { case OPINION_ORDER_STATUS.PENDING: return 'pending'; case OPINION_ORDER_STATUS.FILLED: return 'filled'; - case OPINION_ORDER_STATUS.CANCELED: return 'cancelled'; - case OPINION_ORDER_STATUS.EXPIRED: return 'cancelled'; // expired -> cancelled + case OPINION_ORDER_STATUS.CANCELED: return 'canceled'; + case OPINION_ORDER_STATUS.EXPIRED: return 'canceled'; // expired -> canceled case OPINION_ORDER_STATUS.FAILED: return 'rejected'; // failed -> rejected default: return 'pending'; } diff --git a/core/src/exchanges/polymarket/index.ts b/core/src/exchanges/polymarket/index.ts index 02e555ef..8e70e09d 100644 --- a/core/src/exchanges/polymarket/index.ts +++ b/core/src/exchanges/polymarket/index.ts @@ -330,7 +330,7 @@ export class PolymarketExchange extends PredictionMarketExchange { side: 'buy', type: 'limit', amount: 0, - status: 'cancelled', + status: 'canceled', filled: 0, remaining: 0, timestamp: Date.now(), diff --git a/core/src/exchanges/polymarket_us/normalizer.ts b/core/src/exchanges/polymarket_us/normalizer.ts index baa417f0..9c7dad69 100644 --- a/core/src/exchanges/polymarket_us/normalizer.ts +++ b/core/src/exchanges/polymarket_us/normalizer.ts @@ -254,15 +254,15 @@ function mapOrderType(type: OrderType): 'market' | 'limit' { return type === 'ORDER_TYPE_MARKET' ? 'market' : 'limit'; } -// PMXT Order.status values: 'pending' | 'open' | 'filled' | 'cancelled' | 'rejected' -// Note: PMXT has no 'expired' status; expired orders are mapped to 'cancelled'. -function mapOrderStatus(state: OrderState): 'pending' | 'open' | 'filled' | 'cancelled' | 'rejected' { +// PMXT Order.status values: 'pending' | 'open' | 'filled' | 'canceled' | 'rejected' +// Note: PMXT has no 'expired' status; expired orders are mapped to 'canceled'. +function mapOrderStatus(state: OrderState): 'pending' | 'open' | 'filled' | 'canceled' | 'rejected' { switch (state) { case 'ORDER_STATE_FILLED': return 'filled'; case 'ORDER_STATE_CANCELED': case 'ORDER_STATE_EXPIRED': - return 'cancelled'; + return 'canceled'; case 'ORDER_STATE_REJECTED': return 'rejected'; case 'ORDER_STATE_NEW': diff --git a/core/src/exchanges/probable/index.ts b/core/src/exchanges/probable/index.ts index 882cf421..e2ddfd5c 100644 --- a/core/src/exchanges/probable/index.ts +++ b/core/src/exchanges/probable/index.ts @@ -309,7 +309,7 @@ export class ProbableExchange extends PredictionMarketExchange { side: 'buy', type: 'limit', amount: 0, - status: 'cancelled', + status: 'canceled', filled: 0, remaining: 0, timestamp: Date.now(), @@ -490,12 +490,12 @@ function parseCompoundId(compoundId: string): [string, string | undefined] { return [compoundId.substring(0, colonIndex), compoundId.substring(colonIndex + 1)]; } -function mapOrderStatus(status: string): 'pending' | 'open' | 'filled' | 'cancelled' | 'rejected' { +function mapOrderStatus(status: string): 'pending' | 'open' | 'filled' | 'canceled' | 'rejected' { if (!status) return 'open'; const lower = status.toLowerCase(); if (lower === 'new' || lower === 'open' || lower === 'partially_filled') return 'open'; if (lower === 'filled' || lower === 'trade') return 'filled'; - if (lower === 'canceled' || lower === 'cancelled' || lower === 'expired') return 'cancelled'; + if (lower === 'canceled' || lower === 'cancelled' || lower === 'expired') return 'canceled'; if (lower === 'rejected') return 'rejected'; return 'open'; } diff --git a/core/src/exchanges/smarkets/normalizer.ts b/core/src/exchanges/smarkets/normalizer.ts index d9871615..c578364a 100644 --- a/core/src/exchanges/smarkets/normalizer.ts +++ b/core/src/exchanges/smarkets/normalizer.ts @@ -232,7 +232,7 @@ export class SmarketsNormalizer implements IExchangeNormalizer 0 && availableQty === 0) { status = 'filled'; } else if (totalExecuted > 0) { @@ -287,7 +287,7 @@ export class SmarketsNormalizer implements IExchangeNormalizer { // --------------------------------------------------------------------------- describe('Cancel', () => { - it('cancelling an open resting order sets status to cancelled', async () => { + it('cancelling an open resting order sets status to canceled', async () => { const ex = makeExchange({ limitOrderMode: 'resting' }); const order = await ex.createOrder({ marketId: MARKET_ID, @@ -386,8 +386,8 @@ describe('Cancel', () => { amount: 10, }); - const cancelled = await ex.cancelOrder(order.id); - expect(cancelled.status).toBe('cancelled'); + const canceled = await ex.cancelOrder(order.id); + expect(canceled.status).toBe('canceled'); }); it('cancelling returns locked funds to available', async () => { @@ -903,7 +903,7 @@ describe('Order query methods', () => { expect(open.some(o => o.id === orderB.id)).toBe(true); }); - it('fetchClosedOrders returns filled and cancelled orders', async () => { + it('fetchClosedOrders returns filled and canceled orders', async () => { const ex = makeExchange({ limitOrderMode: 'resting', balance: 1000 }); const orderA = await ex.createOrder({ diff --git a/docs/api-reference/openapi.json b/docs/api-reference/openapi.json index 72d2d4d8..91bc091c 100644 --- a/docs/api-reference/openapi.json +++ b/docs/api-reference/openapi.json @@ -10307,7 +10307,7 @@ "pending", "open", "filled", - "cancelled", + "canceled", "rejected" ], "description": "Lifecycle status of the order." diff --git a/sdks/python/pmxt/models.py b/sdks/python/pmxt/models.py index 1a7f8b16..45f07229 100644 --- a/sdks/python/pmxt/models.py +++ b/sdks/python/pmxt/models.py @@ -364,7 +364,7 @@ class PaginatedEventsResult: @dataclass class Order: - """An order (open, filled, or cancelled).""" + """An order (open, filled, or canceled).""" id: str """Order ID""" @@ -385,7 +385,7 @@ class Order: """Order amount (contracts)""" status: str - """Order status (pending, open, filled, cancelled, rejected)""" + """Order status (pending, open, filled, canceled, rejected)""" filled: float """Amount filled""" diff --git a/sdks/python/tests/test_converters.py b/sdks/python/tests/test_converters.py index 06ee22d4..70090757 100644 --- a/sdks/python/tests/test_converters.py +++ b/sdks/python/tests/test_converters.py @@ -896,7 +896,7 @@ def test_distinct_field_values(self): "side": "buy", "type": "limit", "amount": 111.0, - "status": "cancelled", + "status": "canceled", "filled": 22.0, "remaining": 89.0, "timestamp": 3333333333333, @@ -910,7 +910,7 @@ def test_distinct_field_values(self): assert order.side == "buy" assert order.type == "limit" assert order.amount == 111.0 - assert order.status == "cancelled" + assert order.status == "canceled" assert order.filled == 22.0 assert order.remaining == 89.0 assert order.timestamp == 3333333333333 diff --git a/sdks/typescript/pmxt/models.ts b/sdks/typescript/pmxt/models.ts index 8d7bbaee..4e0b08aa 100644 --- a/sdks/typescript/pmxt/models.ts +++ b/sdks/typescript/pmxt/models.ts @@ -271,7 +271,7 @@ export interface Trade { } /** - * An order (open, filled, or cancelled). + * An order (open, filled, or canceled). */ export interface Order { /** Order ID */