npm - @drift-labs/common - Versions diffs - 1.0.16 → 1.0.18 - Mend

@drift-labs/common 1.0.16 → 1.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (88) hide show

package/lib/drift/utils/auctionParamsResponseMapper.d.ts CHANGED Viewed

@@ -11,7 +11,7 @@ export interface MappedAuctionParams {
     immediateOrCancel?: boolean;
     triggerPrice?: BN | null;
     triggerCondition?: OrderTriggerCondition;
-    oraclePriceOffset?: BN;
+    oraclePriceOffset?: number | null;
     auctionDuration: number | undefined;
     maxTs?: BN | null;
     auctionStartPrice: BN | undefined;
@@ -40,6 +40,7 @@ export interface ServerAuctionParamsResponse {
         params: ServerAuctionParams;
     };
 }
+export type AuctionParamsFetchedCallback = (urlSearchParams: URLSearchParams, response: ServerAuctionParamsResponse) => void;
 /**
  * Maps the server response from getOrderParams back to proper client-side types
  */

package/lib/drift/utils/auctionParamsResponseMapper.js CHANGED Viewed

@@ -14,6 +14,7 @@ const FIELD_MAPPING = {
     userOrderId: { type: 'number' },
     marketIndex: { type: 'number' },
     auctionDuration: { type: 'number' },
+    oraclePriceOffset: { type: 'number' },
     // Booleans
     reduceOnly: { type: 'boolean' },
     immediateOrCancel: { type: 'boolean' },
@@ -22,7 +23,6 @@ const FIELD_MAPPING = {
     auctionStartPrice: { type: 'bn' },
     auctionEndPrice: { type: 'bn' },
     // Nullable BNs
-    oraclePriceOffset: { type: 'bn_nullable' },
     triggerPrice: { type: 'bn_nullable' },
     maxTs: { type: 'bn_nullable' },
 };

package/lib/drift/utils/auctionParamsResponseMapper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auctionParamsResponseMapper.js","sourceRoot":"","sources":["../../../src/drift/utils/auctionParamsResponseMapper.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tBN,\n\tOrderType,\n\tMarketType,\n\tPositionDirection,\n\tPostOnlyParams,\n\tOrderTriggerCondition,\n} from '@drift-labs/sdk';\nimport { ENUM_UTILS } from '../../utils';\n\nexport interface MappedAuctionParams {\n\torderType: OrderType;\n\tmarketType: MarketType;\n\tuserOrderId?: number;\n\tdirection: PositionDirection;\n\tbaseAssetAmount: BN;\n\tmarketIndex: number;\n\treduceOnly?: boolean;\n\tpostOnly?: PostOnlyParams;\n\timmediateOrCancel?: boolean;\n\ttriggerPrice?: BN \| null;\n\ttriggerCondition?: OrderTriggerCondition;\n\toraclePriceOffset?: BN;\n\tauctionDuration: number \| undefined;\n\tmaxTs?: BN \| null;\n\tauctionStartPrice: BN \| undefined;\n\tauctionEndPrice: BN \| undefined;\n}\n\n// Field mapping configuration\ntype FieldType = 'enum' \| 'bn' \| 'number' \| 'boolean' \| 'bn_nullable';\n\ninterface FieldConfig {\n\ttype: FieldType;\n}\n\n// Define the type for the actual params object\ninterface ServerAuctionParams {\n\torderType?: string;\n\tmarketType?: string;\n\tuserOrderId?: number;\n\tdirection?: string;\n\tbaseAssetAmount?: string \| number;\n\tmarketIndex?: number;\n\treduceOnly?: boolean;\n\tpostOnly?: string;\n\timmediateOrCancel?: boolean;\n\ttriggerPrice?: string \| number \| null;\n\ttriggerCondition?: string;\n\toraclePriceOffset?: string \| number;\n\tauctionDuration?: number;\n\tmaxTs?: string \| number \| null;\n\tauctionStartPrice?: string \| number;\n\tauctionEndPrice?: string \| number;\n}\n\nexport interface ServerAuctionParamsResponse {\n\tdata: {\n\t\tparams: ServerAuctionParams;\n\t\t// Additional fields like entryPrice, bestPrice, etc. are ignored for now\n\t};\n}\n\nconst FIELD_MAPPING: Record<keyof ServerAuctionParams, FieldConfig> = {\n\t// Enums (string -> enum object)\n\torderType: { type: 'enum' },\n\tmarketType: { type: 'enum' },\n\tdirection: { type: 'enum' },\n\tpostOnly: { type: 'enum' },\n\ttriggerCondition: { type: 'enum' },\n\n\t// Numbers (keep as numbers)\n\tuserOrderId: { type: 'number' },\n\tmarketIndex: { type: 'number' },\n\tauctionDuration: { type: 'number' },\n\n\t// Booleans\n\treduceOnly: { type: 'boolean' },\n\timmediateOrCancel: { type: 'boolean' },\n\n\t// BNs (string/number -> BN)\n\tbaseAssetAmount: { type: 'bn' },\n\tauctionStartPrice: { type: 'bn' },\n\tauctionEndPrice: { type: 'bn' },\n\n\t// Nullable BNs\n\toraclePriceOffset: { type: 'bn_nullable' },\n\ttriggerPrice: { type: 'bn_nullable' },\n\tmaxTs: { type: 'bn_nullable' },\n};\n\n// Type conversion functions\nconst convertValue = (value: any, type: FieldType): any => {\n\tswitch (type) {\n\t\tcase 'enum':\n\t\t\ttry {\n\t\t\t\t// Convert string values to proper SDK enums\n\t\t\t\tlet enumResult;\n\t\t\t\tswitch (value) {\n\t\t\t\t\tcase 'oracle':\n\t\t\t\t\t\tenumResult = OrderType.ORACLE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'market':\n\t\t\t\t\t\tenumResult = OrderType.MARKET;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'limit':\n\t\t\t\t\t\tenumResult = OrderType.LIMIT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'trigger_market':\n\t\t\t\t\t\tenumResult = OrderType.TRIGGER_MARKET;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'trigger_limit':\n\t\t\t\t\t\tenumResult = OrderType.TRIGGER_LIMIT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'perp':\n\t\t\t\t\t\tenumResult = MarketType.PERP;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'spot':\n\t\t\t\t\t\tenumResult = MarketType.SPOT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'long':\n\t\t\t\t\t\tenumResult = PositionDirection.LONG;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'short':\n\t\t\t\t\t\tenumResult = PositionDirection.SHORT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'none':\n\t\t\t\t\t\tenumResult = PostOnlyParams.NONE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'must_post_only':\n\t\t\t\t\t\tenumResult = PostOnlyParams.MUST_POST_ONLY;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'try_post_only':\n\t\t\t\t\t\tenumResult = PostOnlyParams.TRY_POST_ONLY;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'above':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.ABOVE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'below':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.BELOW;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'triggered_above':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.TRIGGERED_ABOVE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'triggered_below':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.TRIGGERED_BELOW;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tdefault:\n\t\t\t\t\t\tconsole.warn(\n\t\t\t\t\t\t\t`⚠️ [Converter] Unknown enum value: ${value}, using ENUM_UTILS.toObj as fallback`\n\t\t\t\t\t\t);\n\t\t\t\t\t\tenumResult = ENUM_UTILS.toObj(value);\n\t\t\t\t}\n\t\t\t\treturn enumResult;\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(\n\t\t\t\t\t`❌ [Converter] Enum conversion failed for ${value}:`,\n\t\t\t\t\terror\n\t\t\t\t);\n\t\t\t\tthrow error;\n\t\t\t}\n\t\tcase 'bn':\n\t\t\tif (value === null \|\| value === undefined) {\n\t\t\t\t// Server returned null for a required BN field, this should cause fallback to client-side calculation\n\t\t\t\tthrow new Error(\n\t\t\t\t\t`Server returned ${\n\t\t\t\t\t\tvalue === null ? 'null' : 'undefined'\n\t\t\t\t\t} for required BN field, expected non-null value`\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn new BN(value.toString());\n\t\tcase 'bn_nullable':\n\t\t\treturn value === null \|\| value === undefined\n\t\t\t\t? null\n\t\t\t\t: new BN(value.toString());\n\t\tcase 'number':\n\t\t\treturn value;\n\t\tcase 'boolean':\n\t\t\treturn value;\n\t\tdefault:\n\t\t\treturn value;\n\t}\n};\n\n/*\n Maps the server response from getOrderParams back to proper client-side types\n */\nexport function mapAuctionParamsResponse(\n\tserverAuctionParams: ServerAuctionParams\n): MappedAuctionParams {\n\tconst mapped: Partial<MappedAuctionParams> = {};\n\n\t// Extract the actual params from the nested structure\n\tif (!serverAuctionParams) {\n\t\tthrow new Error('Invalid server response: missing data.params');\n\t}\n\n\t// Process each field based on its configuration\n\tObject.entries(FIELD_MAPPING).forEach(([fieldName, config]) => {\n\t\tconst serverValue =\n\t\t\tserverAuctionParams[fieldName as keyof ServerAuctionParams];\n\n\t\tif (serverValue !== undefined) {\n\t\t\ttry {\n\t\t\t\t(mapped as any)[fieldName] = convertValue(serverValue, config.type);\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(`🔴 [Mapper] Field conversion error:`, {\n\t\t\t\t\tfieldName,\n\t\t\t\t\tserverValue,\n\t\t\t\t\texpectedType: config.type,\n\t\t\t\t\tactualType: typeof serverValue,\n\t\t\t\t\tisNull: serverValue === null,\n\t\t\t\t\tisUndefined: serverValue === undefined,\n\t\t\t\t\tfullServerResponse: serverAuctionParams,\n\t\t\t\t});\n\t\t\t\tthrow new Error(\n\t\t\t\t\t`Failed to convert field '${fieldName}' (value: ${serverValue}, type: ${\n\t\t\t\t\t\tconfig.type\n\t\t\t\t\t}): ${error instanceof Error ? error.message : error}`\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t});\n\n\treturn mapped as MappedAuctionParams;\n}\n"]}
1	+ {"version":3,"file":"auctionParamsResponseMapper.js","sourceRoot":"","sources":["../../../src/drift/utils/auctionParamsResponseMapper.ts"],"names":[],"mappings":";;;AAAA,yCAOyB;AACzB,uCAAyC;AA4DzC,MAAM,aAAa,GAAmD;IACrE,gCAAgC;IAChC,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC5B,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1B,gBAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAElC,4BAA4B;IAC5B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC/B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC/B,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IACnC,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAErC,WAAW;IACX,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;IAC/B,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;IAEtC,4BAA4B;IAC5B,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IAC/B,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IACjC,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;IAE/B,eAAe;IACf,YAAY,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;IACrC,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;CAC9B,CAAC;AAEF,4BAA4B;AAC5B,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,IAAe,EAAO,EAAE;IACzD,QAAQ,IAAI,EAAE,CAAC;QACd,KAAK,MAAM;YACV,IAAI,CAAC;gBACJ,4CAA4C;gBAC5C,IAAI,UAAU,CAAC;gBACf,QAAQ,KAAK,EAAE,CAAC;oBACf,KAAK,QAAQ;wBACZ,UAAU,GAAG,eAAS,CAAC,MAAM,CAAC;wBAC9B,MAAM;oBACP,KAAK,QAAQ;wBACZ,UAAU,GAAG,eAAS,CAAC,MAAM,CAAC;wBAC9B,MAAM;oBACP,KAAK,OAAO;wBACX,UAAU,GAAG,eAAS,CAAC,KAAK,CAAC;wBAC7B,MAAM;oBACP,KAAK,gBAAgB;wBACpB,UAAU,GAAG,eAAS,CAAC,cAAc,CAAC;wBACtC,MAAM;oBACP,KAAK,eAAe;wBACnB,UAAU,GAAG,eAAS,CAAC,aAAa,CAAC;wBACrC,MAAM;oBACP,KAAK,MAAM;wBACV,UAAU,GAAG,gBAAU,CAAC,IAAI,CAAC;wBAC7B,MAAM;oBACP,KAAK,MAAM;wBACV,UAAU,GAAG,gBAAU,CAAC,IAAI,CAAC;wBAC7B,MAAM;oBACP,KAAK,MAAM;wBACV,UAAU,GAAG,uBAAiB,CAAC,IAAI,CAAC;wBACpC,MAAM;oBACP,KAAK,OAAO;wBACX,UAAU,GAAG,uBAAiB,CAAC,KAAK,CAAC;wBACrC,MAAM;oBACP,KAAK,MAAM;wBACV,UAAU,GAAG,oBAAc,CAAC,IAAI,CAAC;wBACjC,MAAM;oBACP,KAAK,gBAAgB;wBACpB,UAAU,GAAG,oBAAc,CAAC,cAAc,CAAC;wBAC3C,MAAM;oBACP,KAAK,eAAe;wBACnB,UAAU,GAAG,oBAAc,CAAC,aAAa,CAAC;wBAC1C,MAAM;oBACP,KAAK,OAAO;wBACX,UAAU,GAAG,2BAAqB,CAAC,KAAK,CAAC;wBACzC,MAAM;oBACP,KAAK,OAAO;wBACX,UAAU,GAAG,2BAAqB,CAAC,KAAK,CAAC;wBACzC,MAAM;oBACP,KAAK,iBAAiB;wBACrB,UAAU,GAAG,2BAAqB,CAAC,eAAe,CAAC;wBACnD,MAAM;oBACP,KAAK,iBAAiB;wBACrB,UAAU,GAAG,2BAAqB,CAAC,eAAe,CAAC;wBACnD,MAAM;oBACP;wBACC,OAAO,CAAC,IAAI,CACX,uCAAuC,KAAK,sCAAsC,CAClF,CAAC;wBACF,UAAU,GAAG,kBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACvC,CAAC;gBACD,OAAO,UAAU,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CACZ,4CAA4C,KAAK,GAAG,EACpD,KAAK,CACL,CAAC;gBACF,MAAM,KAAK,CAAC;YACb,CAAC;QACF,KAAK,IAAI;YACR,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC3C,sGAAsG;gBACtG,MAAM,IAAI,KAAK,CACd,mBACC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAC3B,iDAAiD,CACjD,CAAC;YACH,CAAC;YACD,OAAO,IAAI,QAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjC,KAAK,aAAa;YACjB,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gBAC3C,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,QAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7B,KAAK,QAAQ;YACZ,OAAO,KAAK,CAAC;QACd,KAAK,SAAS;YACb,OAAO,KAAK,CAAC;QACd;YACC,OAAO,KAAK,CAAC;IACf,CAAC;AACF,CAAC,CAAC;AAEF;;GAEG;AACH,SAAgB,wBAAwB,CACvC,mBAAwC;IAExC,MAAM,MAAM,GAAiC,EAAE,CAAC;IAEhD,sDAAsD;IACtD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IACjE,CAAC;IAED,gDAAgD;IAChD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE;QAC7D,MAAM,WAAW,GAChB,mBAAmB,CAAC,SAAsC,CAAC,CAAC;QAE7D,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAc,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE;oBACpD,SAAS;oBACT,WAAW;oBACX,YAAY,EAAE,MAAM,CAAC,IAAI;oBACzB,UAAU,EAAE,OAAO,WAAW;oBAC9B,MAAM,EAAE,WAAW,KAAK,IAAI;oBAC5B,WAAW,EAAE,WAAW,KAAK,SAAS;oBACtC,kBAAkB,EAAE,mBAAmB;iBACvC,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CACd,4BAA4B,SAAS,aAAa,WAAW,WAC5D,MAAM,CAAC,IACR,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CACtD,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,MAA6B,CAAC;AACtC,CAAC;AAtCD,4DAsCC","sourcesContent":["import {\n\tBN,\n\tOrderType,\n\tMarketType,\n\tPositionDirection,\n\tPostOnlyParams,\n\tOrderTriggerCondition,\n} from '@drift-labs/sdk';\nimport { ENUM_UTILS } from '../../utils';\n\nexport interface MappedAuctionParams {\n\torderType: OrderType;\n\tmarketType: MarketType;\n\tuserOrderId?: number;\n\tdirection: PositionDirection;\n\tbaseAssetAmount: BN;\n\tmarketIndex: number;\n\treduceOnly?: boolean;\n\tpostOnly?: PostOnlyParams;\n\timmediateOrCancel?: boolean;\n\ttriggerPrice?: BN \| null;\n\ttriggerCondition?: OrderTriggerCondition;\n\toraclePriceOffset?: number \| null;\n\tauctionDuration: number \| undefined;\n\tmaxTs?: BN \| null;\n\tauctionStartPrice: BN \| undefined;\n\tauctionEndPrice: BN \| undefined;\n}\n\n// Field mapping configuration\ntype FieldType = 'enum' \| 'bn' \| 'number' \| 'boolean' \| 'bn_nullable';\n\ninterface FieldConfig {\n\ttype: FieldType;\n}\n\n// Define the type for the actual params object\ninterface ServerAuctionParams {\n\torderType?: string;\n\tmarketType?: string;\n\tuserOrderId?: number;\n\tdirection?: string;\n\tbaseAssetAmount?: string \| number;\n\tmarketIndex?: number;\n\treduceOnly?: boolean;\n\tpostOnly?: string;\n\timmediateOrCancel?: boolean;\n\ttriggerPrice?: string \| number \| null;\n\ttriggerCondition?: string;\n\toraclePriceOffset?: string \| number;\n\tauctionDuration?: number;\n\tmaxTs?: string \| number \| null;\n\tauctionStartPrice?: string \| number;\n\tauctionEndPrice?: string \| number;\n}\n\nexport interface ServerAuctionParamsResponse {\n\tdata: {\n\t\tparams: ServerAuctionParams;\n\t\t// Additional fields like entryPrice, bestPrice, etc. are ignored for now\n\t};\n}\n\nexport type AuctionParamsFetchedCallback = (\n\turlSearchParams: URLSearchParams,\n\tresponse: ServerAuctionParamsResponse\n) => void;\n\nconst FIELD_MAPPING: Record<keyof ServerAuctionParams, FieldConfig> = {\n\t// Enums (string -> enum object)\n\torderType: { type: 'enum' },\n\tmarketType: { type: 'enum' },\n\tdirection: { type: 'enum' },\n\tpostOnly: { type: 'enum' },\n\ttriggerCondition: { type: 'enum' },\n\n\t// Numbers (keep as numbers)\n\tuserOrderId: { type: 'number' },\n\tmarketIndex: { type: 'number' },\n\tauctionDuration: { type: 'number' },\n\toraclePriceOffset: { type: 'number' },\n\n\t// Booleans\n\treduceOnly: { type: 'boolean' },\n\timmediateOrCancel: { type: 'boolean' },\n\n\t// BNs (string/number -> BN)\n\tbaseAssetAmount: { type: 'bn' },\n\tauctionStartPrice: { type: 'bn' },\n\tauctionEndPrice: { type: 'bn' },\n\n\t// Nullable BNs\n\ttriggerPrice: { type: 'bn_nullable' },\n\tmaxTs: { type: 'bn_nullable' },\n};\n\n// Type conversion functions\nconst convertValue = (value: any, type: FieldType): any => {\n\tswitch (type) {\n\t\tcase 'enum':\n\t\t\ttry {\n\t\t\t\t// Convert string values to proper SDK enums\n\t\t\t\tlet enumResult;\n\t\t\t\tswitch (value) {\n\t\t\t\t\tcase 'oracle':\n\t\t\t\t\t\tenumResult = OrderType.ORACLE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'market':\n\t\t\t\t\t\tenumResult = OrderType.MARKET;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'limit':\n\t\t\t\t\t\tenumResult = OrderType.LIMIT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'trigger_market':\n\t\t\t\t\t\tenumResult = OrderType.TRIGGER_MARKET;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'trigger_limit':\n\t\t\t\t\t\tenumResult = OrderType.TRIGGER_LIMIT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'perp':\n\t\t\t\t\t\tenumResult = MarketType.PERP;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'spot':\n\t\t\t\t\t\tenumResult = MarketType.SPOT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'long':\n\t\t\t\t\t\tenumResult = PositionDirection.LONG;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'short':\n\t\t\t\t\t\tenumResult = PositionDirection.SHORT;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'none':\n\t\t\t\t\t\tenumResult = PostOnlyParams.NONE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'must_post_only':\n\t\t\t\t\t\tenumResult = PostOnlyParams.MUST_POST_ONLY;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'try_post_only':\n\t\t\t\t\t\tenumResult = PostOnlyParams.TRY_POST_ONLY;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'above':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.ABOVE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'below':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.BELOW;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'triggered_above':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.TRIGGERED_ABOVE;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tcase 'triggered_below':\n\t\t\t\t\t\tenumResult = OrderTriggerCondition.TRIGGERED_BELOW;\n\t\t\t\t\t\tbreak;\n\t\t\t\t\tdefault:\n\t\t\t\t\t\tconsole.warn(\n\t\t\t\t\t\t\t`⚠️ [Converter] Unknown enum value: ${value}, using ENUM_UTILS.toObj as fallback`\n\t\t\t\t\t\t);\n\t\t\t\t\t\tenumResult = ENUM_UTILS.toObj(value);\n\t\t\t\t}\n\t\t\t\treturn enumResult;\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(\n\t\t\t\t\t`❌ [Converter] Enum conversion failed for ${value}:`,\n\t\t\t\t\terror\n\t\t\t\t);\n\t\t\t\tthrow error;\n\t\t\t}\n\t\tcase 'bn':\n\t\t\tif (value === null \|\| value === undefined) {\n\t\t\t\t// Server returned null for a required BN field, this should cause fallback to client-side calculation\n\t\t\t\tthrow new Error(\n\t\t\t\t\t`Server returned ${\n\t\t\t\t\t\tvalue === null ? 'null' : 'undefined'\n\t\t\t\t\t} for required BN field, expected non-null value`\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn new BN(value.toString());\n\t\tcase 'bn_nullable':\n\t\t\treturn value === null \|\| value === undefined\n\t\t\t\t? null\n\t\t\t\t: new BN(value.toString());\n\t\tcase 'number':\n\t\t\treturn value;\n\t\tcase 'boolean':\n\t\t\treturn value;\n\t\tdefault:\n\t\t\treturn value;\n\t}\n};\n\n/*\n Maps the server response from getOrderParams back to proper client-side types\n */\nexport function mapAuctionParamsResponse(\n\tserverAuctionParams: ServerAuctionParams\n): MappedAuctionParams {\n\tconst mapped: Partial<MappedAuctionParams> = {};\n\n\t// Extract the actual params from the nested structure\n\tif (!serverAuctionParams) {\n\t\tthrow new Error('Invalid server response: missing data.params');\n\t}\n\n\t// Process each field based on its configuration\n\tObject.entries(FIELD_MAPPING).forEach(([fieldName, config]) => {\n\t\tconst serverValue =\n\t\t\tserverAuctionParams[fieldName as keyof ServerAuctionParams];\n\n\t\tif (serverValue !== undefined) {\n\t\t\ttry {\n\t\t\t\t(mapped as any)[fieldName] = convertValue(serverValue, config.type);\n\t\t\t} catch (error) {\n\t\t\t\tconsole.error(`🔴 [Mapper] Field conversion error:`, {\n\t\t\t\t\tfieldName,\n\t\t\t\t\tserverValue,\n\t\t\t\t\texpectedType: config.type,\n\t\t\t\t\tactualType: typeof serverValue,\n\t\t\t\t\tisNull: serverValue === null,\n\t\t\t\t\tisUndefined: serverValue === undefined,\n\t\t\t\t\tfullServerResponse: serverAuctionParams,\n\t\t\t\t});\n\t\t\t\tthrow new Error(\n\t\t\t\t\t`Failed to convert field '${fieldName}' (value: ${serverValue}, type: ${\n\t\t\t\t\t\tconfig.type\n\t\t\t\t\t}): ${error instanceof Error ? error.message : error}`\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t});\n\n\treturn mapped as MappedAuctionParams;\n}\n"]}

package/lib/drift/utils/orderParams.js CHANGED Viewed

@@ -96,7 +96,7 @@ function buildNonMarketOrderParams({ marketIndex, marketType, direction, baseAss
             throw new Error('TRIGGER_MARKET orders require triggerPrice');
         }
         const triggerCondition = getTriggerCondition(direction, orderType);
-        const hasLimitPrice = !!orderConfig.limitPrice;
+        const hasLimitPrice = !!orderConfig.limitPrice && !orderConfig.limitPrice.isZero();
         if (hasLimitPrice) {
             return (0, sdk_1.getTriggerLimitOrderParams)({
                 marketIndex,

package/lib/drift/utils/orderParams.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orderParams.js","sourceRoot":"","sources":["../../../src/drift/utils/orderParams.ts"],"names":[],"mappings":"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~~GAAG~~,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;~~QAE/C~~,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,IAAA,gCAA0B,EAAC;gBACjC,WAAW;gBACX,UAAU;gBACV,SAAS;gBACT,eAAe;gBACf,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,KAAK,EAAE,WAAW,CAAC,UAAW;gBAC9B,gBAAgB;gBAChB,UAAU;gBACV,QAAQ;gBACR,WAAW;aACX,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,OAAO,IAAA,iCAA2B,EAAC;gBAClC,WAAW;gBACX,UAAU;gBACV,SAAS;gBACT,eAAe;gBACf,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,KAAK,EAAE,WAAW,CAAC,UAAU;gBAC7B,gBAAgB;gBAChB,UAAU;gBACV,QAAQ;gBACR,WAAW;aACX,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,IAAA,yBAAmB,EAAC;YAC1B,WAAW;YACX,UAAU;YACV,SAAS;YACT,eAAe;YACf,KAAK,EAAE,UAAI;YACX,iBAAiB,EAAE,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YAC3D,WAAW;YACX,QAAQ;YACR,UAAU;SACV,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,2BAA2B,SAAS,EAAE,CAAC,CAAC;AACzD,CAAC;~~AAtFD~~,~~8DAsFC~~","sourcesContent":["import {\n\tBN,\n\tPositionDirection,\n\tPostOnlyParams,\n\tOptionalOrderParams,\n\tgetLimitOrderParams,\n\tgetTriggerMarketOrderParams,\n\tgetTriggerLimitOrderParams,\n\tOrderTriggerCondition,\n\tZERO,\n} from '@drift-labs/sdk';\nimport { ENUM_UTILS } from '../../utils';\nimport { NonMarketOrderParamsConfig } from '../base/actions/trade/openPerpOrder/types';\n\n/*\n Converts amount and assetType to base asset amount\n * @param amount - The amount to convert\n * @param assetType - 'base' or 'quote'\n * @param limitPrice - Required when assetType is 'quote' for conversion\n * @returns Base asset amount\n /\nexport function convertToBaseAssetAmount(\n\tamount: BN,\n\tassetType: 'base' \| 'quote',\n\tlimitPrice?: BN\n): BN {\n\tif (assetType === 'quote') {\n\t\tif (!limitPrice \|\| limitPrice.isZero()) {\n\t\t\tthrow new Error(\n\t\t\t\t'When using quote asset type, limitPrice is required for conversion to base amount'\n\t\t\t);\n\t\t}\n\t\t// Convert quote amount to base amount: quoteAmount / price = baseAmount\n\t\t// Using PRICE_PRECISION as the limit price is in price precision\n\t\tconst PRICE_PRECISION = new BN(10).pow(new BN(6));\n\t\treturn amount.mul(PRICE_PRECISION).div(limitPrice);\n\t} else {\n\t\t// Base amount, use directly\n\t\treturn amount;\n\t}\n}\n\n/\n Resolves amount parameters from either new (amount + assetType) or legacy (baseAssetAmount) approach\n /\nexport function resolveBaseAssetAmount(params: {\n\tamount?: BN;\n\tassetType?: 'base' \| 'quote';\n\tbaseAssetAmount?: BN;\n\tlimitPrice?: BN;\n}): BN {\n\tconst { amount, assetType, baseAssetAmount, limitPrice } = params;\n\n\tif (amount && assetType) {\n\t\t// New approach: convert if needed\n\t\treturn convertToBaseAssetAmount(amount, assetType, limitPrice);\n\t} else if (baseAssetAmount) {\n\t\t// Legacy approach\n\t\treturn baseAssetAmount;\n\t} else {\n\t\tthrow new Error(\n\t\t\t'Either (amount + assetType) or baseAssetAmount must be provided'\n\t\t);\n\t}\n}\n\n/\n Determine trigger condition based on direction\n * For stop orders: ABOVE when long, BELOW when short\n * For take profit orders: BELOW when long, ABOVE when short\n /\nconst getTriggerCondition = (\n\tdirection: PositionDirection,\n\ttpOrSl: 'takeProfit' \| 'stopLoss'\n) => {\n\tconst isTakeProfit = tpOrSl === 'takeProfit';\n\tconst isLong = ENUM_UTILS.match(direction, PositionDirection.LONG);\n\n\tif (isTakeProfit) {\n\t\tif (isLong) {\n\t\t\treturn OrderTriggerCondition.BELOW;\n\t\t} else {\n\t\t\treturn OrderTriggerCondition.ABOVE;\n\t\t}\n\t} else {\n\t\t// Stop loss\n\t\tif (isLong) {\n\t\t\treturn OrderTriggerCondition.ABOVE;\n\t\t} else {\n\t\t\treturn OrderTriggerCondition.BELOW;\n\t\t}\n\t}\n};\n\n/\n Builds proper order parameters for non-market orders using the same logic as the UI\n */\nexport function buildNonMarketOrderParams({\n\tmarketIndex,\n\tmarketType,\n\tdirection,\n\tbaseAssetAmount,\n\torderConfig,\n\treduceOnly = false,\n\tpostOnly = PostOnlyParams.NONE,\n\tuserOrderId = 0,\n}: NonMarketOrderParamsConfig): OptionalOrderParams {\n\tconst orderType = orderConfig.orderType;\n\n\t// Build order params based on order type using SDK functions\n\tif (orderType === 'limit') {\n\t\tif (!orderConfig.limitPrice) {\n\t\t\tthrow new Error('LIMIT orders require limitPrice');\n\t\t}\n\n\t\treturn getLimitOrderParams({\n\t\t\tmarketIndex,\n\t\t\tmarketType,\n\t\t\tdirection,\n\t\t\tbaseAssetAmount,\n\t\t\tprice: orderConfig.limitPrice,\n\t\t\treduceOnly,\n\t\t\tpostOnly,\n\t\t\tuserOrderId,\n\t\t});\n\t}\n\n\tif (orderType === 'takeProfit' \|\| orderType === 'stopLoss') {\n\t\tif (!orderConfig.triggerPrice) {\n\t\t\tthrow new Error('TRIGGER_MARKET orders require triggerPrice');\n\t\t}\n\n\t\tconst triggerCondition = getTriggerCondition(direction, orderType);\n\t\tconst hasLimitPrice = !!orderConfig.limitPrice;\n\n\t\tif (hasLimitPrice) {\n\t\t\treturn getTriggerLimitOrderParams({\n\t\t\t\tmarketIndex,\n\t\t\t\tmarketType,\n\t\t\t\tdirection,\n\t\t\t\tbaseAssetAmount,\n\t\t\t\ttriggerPrice: orderConfig.triggerPrice,\n\t\t\t\tprice: orderConfig.limitPrice!,\n\t\t\t\ttriggerCondition,\n\t\t\t\treduceOnly,\n\t\t\t\tpostOnly,\n\t\t\t\tuserOrderId,\n\t\t\t});\n\t\t} else {\n\t\t\treturn getTriggerMarketOrderParams({\n\t\t\t\tmarketIndex,\n\t\t\t\tmarketType,\n\t\t\t\tdirection,\n\t\t\t\tbaseAssetAmount,\n\t\t\t\ttriggerPrice: orderConfig.triggerPrice,\n\t\t\t\tprice: orderConfig.limitPrice,\n\t\t\t\ttriggerCondition,\n\t\t\t\treduceOnly,\n\t\t\t\tpostOnly,\n\t\t\t\tuserOrderId,\n\t\t\t});\n\t\t}\n\t}\n\n\tif (orderType === 'oracleLimit') {\n\t\tif (!orderConfig.oraclePriceOffset) {\n\t\t\tthrow new Error('ORACLE orders require oraclePriceOffset');\n\t\t}\n\n\t\treturn getLimitOrderParams({\n\t\t\tmarketIndex,\n\t\t\tmarketType,\n\t\t\tdirection,\n\t\t\tbaseAssetAmount,\n\t\t\tprice: ZERO,\n\t\t\toraclePriceOffset: orderConfig.oraclePriceOffset.toNumber(),\n\t\t\tuserOrderId,\n\t\t\tpostOnly,\n\t\t\treduceOnly,\n\t\t});\n\t}\n\n\tthrow new Error(`Unsupported order type: ${orderType}`);\n}\n"]}
1	+ {"version":3,"file":"orderParams.js","sourceRoot":"","sources":["../../../src/drift/utils/orderParams.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tBN,\n\tPositionDirection,\n\tPostOnlyParams,\n\tOptionalOrderParams,\n\tgetLimitOrderParams,\n\tgetTriggerMarketOrderParams,\n\tgetTriggerLimitOrderParams,\n\tOrderTriggerCondition,\n\tZERO,\n} from '@drift-labs/sdk';\nimport { ENUM_UTILS } from '../../utils';\nimport { NonMarketOrderParamsConfig } from '../base/actions/trade/openPerpOrder/types';\n\n/*\n Converts amount and assetType to base asset amount\n * @param amount - The amount to convert\n * @param assetType - 'base' or 'quote'\n * @param limitPrice - Required when assetType is 'quote' for conversion\n * @returns Base asset amount\n /\nexport function convertToBaseAssetAmount(\n\tamount: BN,\n\tassetType: 'base' \| 'quote',\n\tlimitPrice?: BN\n): BN {\n\tif (assetType === 'quote') {\n\t\tif (!limitPrice \|\| limitPrice.isZero()) {\n\t\t\tthrow new Error(\n\t\t\t\t'When using quote asset type, limitPrice is required for conversion to base amount'\n\t\t\t);\n\t\t}\n\t\t// Convert quote amount to base amount: quoteAmount / price = baseAmount\n\t\t// Using PRICE_PRECISION as the limit price is in price precision\n\t\tconst PRICE_PRECISION = new BN(10).pow(new BN(6));\n\t\treturn amount.mul(PRICE_PRECISION).div(limitPrice);\n\t} else {\n\t\t// Base amount, use directly\n\t\treturn amount;\n\t}\n}\n\n/\n Resolves amount parameters from either new (amount + assetType) or legacy (baseAssetAmount) approach\n /\nexport function resolveBaseAssetAmount(params: {\n\tamount?: BN;\n\tassetType?: 'base' \| 'quote';\n\tbaseAssetAmount?: BN;\n\tlimitPrice?: BN;\n}): BN {\n\tconst { amount, assetType, baseAssetAmount, limitPrice } = params;\n\n\tif (amount && assetType) {\n\t\t// New approach: convert if needed\n\t\treturn convertToBaseAssetAmount(amount, assetType, limitPrice);\n\t} else if (baseAssetAmount) {\n\t\t// Legacy approach\n\t\treturn baseAssetAmount;\n\t} else {\n\t\tthrow new Error(\n\t\t\t'Either (amount + assetType) or baseAssetAmount must be provided'\n\t\t);\n\t}\n}\n\n/\n Determine trigger condition based on direction\n * For stop orders: ABOVE when long, BELOW when short\n * For take profit orders: BELOW when long, ABOVE when short\n /\nconst getTriggerCondition = (\n\tdirection: PositionDirection,\n\ttpOrSl: 'takeProfit' \| 'stopLoss'\n) => {\n\tconst isTakeProfit = tpOrSl === 'takeProfit';\n\tconst isLong = ENUM_UTILS.match(direction, PositionDirection.LONG);\n\n\tif (isTakeProfit) {\n\t\tif (isLong) {\n\t\t\treturn OrderTriggerCondition.BELOW;\n\t\t} else {\n\t\t\treturn OrderTriggerCondition.ABOVE;\n\t\t}\n\t} else {\n\t\t// Stop loss\n\t\tif (isLong) {\n\t\t\treturn OrderTriggerCondition.ABOVE;\n\t\t} else {\n\t\t\treturn OrderTriggerCondition.BELOW;\n\t\t}\n\t}\n};\n\n/\n Builds proper order parameters for non-market orders using the same logic as the UI\n */\nexport function buildNonMarketOrderParams({\n\tmarketIndex,\n\tmarketType,\n\tdirection,\n\tbaseAssetAmount,\n\torderConfig,\n\treduceOnly = false,\n\tpostOnly = PostOnlyParams.NONE,\n\tuserOrderId = 0,\n}: NonMarketOrderParamsConfig): OptionalOrderParams {\n\tconst orderType = orderConfig.orderType;\n\n\t// Build order params based on order type using SDK functions\n\tif (orderType === 'limit') {\n\t\tif (!orderConfig.limitPrice) {\n\t\t\tthrow new Error('LIMIT orders require limitPrice');\n\t\t}\n\n\t\treturn getLimitOrderParams({\n\t\t\tmarketIndex,\n\t\t\tmarketType,\n\t\t\tdirection,\n\t\t\tbaseAssetAmount,\n\t\t\tprice: orderConfig.limitPrice,\n\t\t\treduceOnly,\n\t\t\tpostOnly,\n\t\t\tuserOrderId,\n\t\t});\n\t}\n\n\tif (orderType === 'takeProfit' \|\| orderType === 'stopLoss') {\n\t\tif (!orderConfig.triggerPrice) {\n\t\t\tthrow new Error('TRIGGER_MARKET orders require triggerPrice');\n\t\t}\n\n\t\tconst triggerCondition = getTriggerCondition(direction, orderType);\n\t\tconst hasLimitPrice =\n\t\t\t!!orderConfig.limitPrice && !orderConfig.limitPrice.isZero();\n\n\t\tif (hasLimitPrice) {\n\t\t\treturn getTriggerLimitOrderParams({\n\t\t\t\tmarketIndex,\n\t\t\t\tmarketType,\n\t\t\t\tdirection,\n\t\t\t\tbaseAssetAmount,\n\t\t\t\ttriggerPrice: orderConfig.triggerPrice,\n\t\t\t\tprice: orderConfig.limitPrice!,\n\t\t\t\ttriggerCondition,\n\t\t\t\treduceOnly,\n\t\t\t\tpostOnly,\n\t\t\t\tuserOrderId,\n\t\t\t});\n\t\t} else {\n\t\t\treturn getTriggerMarketOrderParams({\n\t\t\t\tmarketIndex,\n\t\t\t\tmarketType,\n\t\t\t\tdirection,\n\t\t\t\tbaseAssetAmount,\n\t\t\t\ttriggerPrice: orderConfig.triggerPrice,\n\t\t\t\tprice: orderConfig.limitPrice,\n\t\t\t\ttriggerCondition,\n\t\t\t\treduceOnly,\n\t\t\t\tpostOnly,\n\t\t\t\tuserOrderId,\n\t\t\t});\n\t\t}\n\t}\n\n\tif (orderType === 'oracleLimit') {\n\t\tif (!orderConfig.oraclePriceOffset) {\n\t\t\tthrow new Error('ORACLE orders require oraclePriceOffset');\n\t\t}\n\n\t\treturn getLimitOrderParams({\n\t\t\tmarketIndex,\n\t\t\tmarketType,\n\t\t\tdirection,\n\t\t\tbaseAssetAmount,\n\t\t\tprice: ZERO,\n\t\t\toraclePriceOffset: orderConfig.oraclePriceOffset.toNumber(),\n\t\t\tuserOrderId,\n\t\t\tpostOnly,\n\t\t\treduceOnly,\n\t\t});\n\t}\n\n\tthrow new Error(`Unsupported order type: ${orderType}`);\n}\n"]}

package/lib/serializableTypes.d.ts CHANGED Viewed

@@ -158,6 +158,7 @@ export declare class UISerializableOrderRecordV2 {
     lastActionExplanation: OrderActionExplanation;
     lastActionStatus: string;
     status: string;
+    cumulativeFee: BigNum | null;
     static onDeserialized(data: JsonObject, instance: UISerializableOrderRecordV2): void;
 }
 export declare class UISerializableOrderActionRecordBase {

package/lib/serializableTypes.js CHANGED Viewed

@@ -894,6 +894,10 @@ __decorate([
     (0, cerializr_1.autoserializeAs)(String),
     __metadata("design:type", String)
 ], UISerializableOrderRecordV2.prototype, "status", void 0);
+__decorate([
+    (0, cerializr_1.autoserializeUsing)(NullableQuoteBigNumSerializeAndDeserializeFns),
+    __metadata("design:type", sdk_1.BigNum)
+], UISerializableOrderRecordV2.prototype, "cumulativeFee", void 0);
 class UISerializableOrderActionRecordBase {
 }
 exports.UISerializableOrderActionRecordBase = UISerializableOrderActionRecordBase;