Mirror/orionprotocol-sdk
1
0
Fork 0
mirror of https://github.com/orionprotocol/sdk.git synced 2026-04-10 13:07:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Schema minor fix

Browse Source
This commit is contained in:
Aleksandr Kraiz
2023-02-18 21:01:45 +04:00
parent 3b5daa9e1b
commit 5fc8d488ee
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@orionprotocol/sdk", "name": "@orionprotocol/sdk",
"version": "0.17.12", "version": "0.17.13",
"description": "Orion Protocol SDK", "description": "Orion Protocol SDK",
"main": "./lib/esm/index.js", "main": "./lib/esm/index.js",
"module": "./lib/esm/index.js", "module": "./lib/esm/index.js",

23
src/services/OrionAggregator/schemas/orderSchema.ts
View File

@@ -29,7 +29,7 @@ const blockchainOrderSchema = z.object({
buySide: z.union([z.literal(1), z.literal(0)]), buySide: z.union([z.literal(1), z.literal(0)]),
signature: z.string().refine(ethers.utils.isHexString, (value) => ({ signature: z.string().refine(ethers.utils.isHexString, (value) => ({
message: `blockchainOrder.signature must be a hex string, got ${value}`, message: `blockchainOrder.signature must be a hex string, got ${value}`,
})), })).nullable(),
isPersonalSign: z.boolean(), isPersonalSign: z.boolean(),
needWithdraw: z.boolean(), needWithdraw: z.boolean(),
}); });
@@ -41,8 +41,8 @@ const tradeInfoSchema = z.object({
price: z.number().nonnegative(), price: z.number().nonnegative(),
creationTime: z.number(), creationTime: z.number(),
updateTime: z.number(), updateTime: z.number(),
matchedBlockchainOrder: blockchainOrderSchema, matchedBlockchainOrder: blockchainOrderSchema.optional(),
matchedSubOrderId: z.number().int().nonnegative(), matchedSubOrderId: z.number().int().nonnegative().optional(),
exchangeTradeInfo: z.boolean(), exchangeTradeInfo: z.boolean(),
poolTradeInfo: z.boolean(), poolTradeInfo: z.boolean(),
}); });
@@ -60,6 +60,9 @@ const baseOrderSchema = z.object({
internalOnly: z.boolean(), internalOnly: z.boolean(),
}) })
const selfBrokers = exchanges.map((exchange) => `SELF_BROKER_${exchange}` as const);
type SelfBroker = typeof selfBrokers[number];
const isSelfBroker = (value: string): value is SelfBroker => selfBrokers.some((broker) => broker === value);
const subOrderSchema = baseOrderSchema.extend({ const subOrderSchema = baseOrderSchema.extend({
price: z.number(), price: z.number(),
id: z.number(), id: z.number(),
@@ -68,9 +71,17 @@ const subOrderSchema = baseOrderSchema.extend({
})), })),
exchange: z.enum(exchanges), exchange: z.enum(exchanges),
brokerAddress: brokerAddress:
z.literal('ORION_BROKER').or(z.string().refine(ethers.utils.isAddress, (value) => ({ // https://github.com/orionprotocol/orion-aggregator/blob/98f543e59b7bbf14d8db0417c6af5cf7575f3956/src/main/java/io/orionprotocol/aggregator/model/Exchange.java#L116
message: `subOrder.subOrders.[n].brokerAddress must be an address, got ${value}`, z.enum(['ORION_BROKER', 'SELF_BROKER'])
}))), .or(z.custom<SelfBroker>((value) => {
if (typeof value === 'string' && isSelfBroker(value)) {
return true;
}
return false;
}))
.or(z.string().refine(ethers.utils.isAddress, (value) => ({
message: `subOrder.subOrders.[n].brokerAddress must be an address, got ${value}`,
}))),
tradesInfo: z.record( tradesInfo: z.record(
z.string().uuid(), z.string().uuid(),
tradeInfoSchema tradeInfoSchema