Merge branch 'master' into docsupdate

src/types/request/v5-trade.ts

@@ -19,7 +19,7 @@ export interface OrderParamsV5 {
   qty: string;
   price?: string;
   triggerDirection?: 1 | 2;
-  orderFilter?: 'Order' | 'tpslOrder';
+  orderFilter?: OrderFilterV5;
   triggerPrice?: string;
   triggerBy?: OrderTriggerByV5;
   orderIv?: string;

src/types/response/v5-user.ts

@@ -45,6 +45,7 @@ export interface ApiKeyInfoV5 {
   vipLevel?: string;
   mktMakerLevel?: string;
   affiliateID?: number;
+  isMaster: boolean;
 }
 
 export interface UpdateApiKeyResultV5 {

src/types/v5-shared.ts

@@ -11,7 +11,7 @@ export type InstrumentStatusV5 =
   | 'Delivering'
   | 'Closed';
 
-export type OrderFilterV5 = 'Order' | 'tpslOrder';
+export type OrderFilterV5 = 'Order' | 'tpslOrder' | 'StopOrder';
 export type OrderSideV5 = 'Buy' | 'Sell';
 export type OrderTypeV5 = 'Market' | 'Limit';
 export type OrderTimeInForceV5 = 'GTC' | 'IOC' | 'FOK' | 'PostOnly';