zklighter-perps 1.0.15 → 1.0.16

package/.openapi-generator/FILES

@@ -7,10 +7,12 @@ apis/RootApi.ts
 apis/TransactionApi.ts
 apis/index.ts
 index.ts
+models/Account.ts
 models/AccountMarketStats.ts
 models/AccountPnL.ts
 models/AccountPosition.ts
 models/AccountStats.ts
+models/Accounts.ts
 models/Block.ts
 models/Blocks.ts
 models/Candlestick.ts
@@ -27,8 +29,6 @@ models/Fundings.ts
 models/L1ProviderInfo.ts
 models/Layer1BasicInfo.ts
 models/Layer2BasicInfo.ts
-models/MainAccount.ts
-models/MainAccounts.ts
 models/MarketInfo.ts
 models/NextNonce.ts
 models/Order.ts
@@ -68,7 +68,6 @@ models/ReqGetRangeWithIndex.ts
 models/ReqGetRangeWithIndexSortable.ts
 models/ReqGetRecentTrades.ts
 models/ReqGetRollbacks.ts
-models/ReqGetSubAccount.ts
 models/ReqGetTrades.ts
 models/ReqGetTx.ts
 models/ReqSearch.ts
@@ -79,7 +78,6 @@ models/Search.ts
 models/SignBody.ts
 models/SimpleOrder.ts
 models/Status.ts
-models/SubAccount.ts
 models/SubAccounts.ts
 models/Trade.ts
 models/Trades.ts

package/apis/AccountApi.ts

@@ -16,8 +16,8 @@
 import * as runtime from '../runtime';
 import type {
   AccountPnL,
+  Accounts,
   DetailedAccounts,
-  MainAccounts,
   Permission,
   ResultCode,
   SubAccounts,
@@ -25,10 +25,10 @@ import type {
 import {
     AccountPnLFromJSON,
     AccountPnLToJSON,
+    AccountsFromJSON,
+    AccountsToJSON,
     DetailedAccountsFromJSON,
     DetailedAccountsToJSON,
-    MainAccountsFromJSON,
-    MainAccountsToJSON,
     PermissionFromJSON,
     PermissionToJSON,
     ResultCodeFromJSON,
@@ -44,7 +44,6 @@ export interface DoFaucetRequest {
 export interface GetAccountRequest {
     by: GetAccountByEnum;
     value: string;
-    sub_account_index: number;
 }
 
 export interface GetAccountPnlRequest {
@@ -117,7 +116,7 @@ export class AccountApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get account by main account\'s l1_address or index and sub account\'s index. Returns detailed account info
+     * Get account by account\'s l1_address or index. Returns detailed account info
      * GetAccount
      */
     async getAccountRaw(requestParameters: GetAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<DetailedAccounts>> {
@@ -135,13 +134,6 @@ export class AccountApi extends runtime.BaseAPI {
             );
         }
 
-        if (requestParameters['sub_account_index'] == null) {
-            throw new runtime.RequiredError(
-                'sub_account_index',
-                'Required parameter "sub_account_index" was null or undefined when calling getAccount().'
-            );
-        }
-
         const queryParameters: any = {};
 
         if (requestParameters['by'] != null) {
@@ -152,10 +144,6 @@ export class AccountApi extends runtime.BaseAPI {
             queryParameters['value'] = requestParameters['value'];
         }
 
-        if (requestParameters['sub_account_index'] != null) {
-            queryParameters['sub_account_index'] = requestParameters['sub_account_index'];
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         const response = await this.request({
@@ -169,7 +157,7 @@ export class AccountApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get account by main account\'s l1_address or index and sub account\'s index. Returns detailed account info
+     * Get account by account\'s l1_address or index. Returns detailed account info
      * GetAccount
      */
     async getAccount(requestParameters: GetAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<DetailedAccounts> {
@@ -272,10 +260,10 @@ export class AccountApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get accounts returns main accounts by account index
+     * Get accounts returns accounts by account index
      * GetAccounts
      */
-    async getAccountsRaw(requestParameters: GetAccountsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<MainAccounts>> {
+    async getAccountsRaw(requestParameters: GetAccountsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Accounts>> {
         if (requestParameters['limit'] == null) {
             throw new runtime.RequiredError(
                 'limit',
@@ -306,20 +294,20 @@ export class AccountApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => MainAccountsFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => AccountsFromJSON(jsonValue));
     }
 
     /**
-     * Get accounts returns main accounts by account index
+     * Get accounts returns accounts by account index
      * GetAccounts
      */
-    async getAccounts(requestParameters: GetAccountsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<MainAccounts> {
+    async getAccounts(requestParameters: GetAccountsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Accounts> {
         const response = await this.getAccountsRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get accounts by l1_address returns main account and its sub accounts
+     * Get accounts by l1_address returns all accounts associated with the given L1 address
      * GetAccountsByL1Address
      */
     async getAccountsByL1AddressRaw(requestParameters: GetAccountsByL1AddressRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<SubAccounts>> {
@@ -349,7 +337,7 @@ export class AccountApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get accounts by l1_address returns main account and its sub accounts
+     * Get accounts by l1_address returns all accounts associated with the given L1 address
      * GetAccountsByL1Address
      */
     async getAccountsByL1Address(requestParameters: GetAccountsByL1AddressRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SubAccounts> {

package/apis/OrderApi.ts

@@ -42,13 +42,11 @@ import {
 
 export interface GetAccountActiveOrdersRequest {
     account_index: number;
-    sub_account_index: number;
     market_id: number;
 }
 
 export interface GetAccountInactiveOrdersRequest {
     account_index: number;
-    sub_account_index: number;
     filter: GetAccountInactiveOrdersFilterEnum;
     limit: number;
     market_id?: number;
@@ -107,13 +105,6 @@ export class OrderApi extends runtime.BaseAPI {
             );
         }
 
-        if (requestParameters['sub_account_index'] == null) {
-            throw new runtime.RequiredError(
-                'sub_account_index',
-                'Required parameter "sub_account_index" was null or undefined when calling getAccountActiveOrders().'
-            );
-        }
-
         if (requestParameters['market_id'] == null) {
             throw new runtime.RequiredError(
                 'market_id',
@@ -127,10 +118,6 @@ export class OrderApi extends runtime.BaseAPI {
             queryParameters['account_index'] = requestParameters['account_index'];
         }
 
-        if (requestParameters['sub_account_index'] != null) {
-            queryParameters['sub_account_index'] = requestParameters['sub_account_index'];
-        }
-
         if (requestParameters['market_id'] != null) {
             queryParameters['market_id'] = requestParameters['market_id'];
         }
@@ -168,13 +155,6 @@ export class OrderApi extends runtime.BaseAPI {
             );
         }
 
-        if (requestParameters['sub_account_index'] == null) {
-            throw new runtime.RequiredError(
-                'sub_account_index',
-                'Required parameter "sub_account_index" was null or undefined when calling getAccountInactiveOrders().'
-            );
-        }
-
         if (requestParameters['filter'] == null) {
             throw new runtime.RequiredError(
                 'filter',
@@ -195,10 +175,6 @@ export class OrderApi extends runtime.BaseAPI {
             queryParameters['account_index'] = requestParameters['account_index'];
         }
 
-        if (requestParameters['sub_account_index'] != null) {
-            queryParameters['sub_account_index'] = requestParameters['sub_account_index'];
-        }
-
         if (requestParameters['filter'] != null) {
             queryParameters['filter'] = requestParameters['filter'];
         }

package/apis/TransactionApi.ts

@@ -66,7 +66,7 @@ export interface GetL2SignatureBodyRequest {
 
 export interface GetNextNonceRequest {
     account_index: number;
-    sub_account_index: number;
+    api_key_index: number;
 }
 
 export interface GetPendingTxsRequest {
@@ -353,10 +353,10 @@ export class TransactionApi extends runtime.BaseAPI {
             );
         }
 
-        if (requestParameters['sub_account_index'] == null) {
+        if (requestParameters['api_key_index'] == null) {
             throw new runtime.RequiredError(
-                'sub_account_index',
-                'Required parameter "sub_account_index" was null or undefined when calling getNextNonce().'
+                'api_key_index',
+                'Required parameter "api_key_index" was null or undefined when calling getNextNonce().'
             );
         }
 
@@ -366,8 +366,8 @@ export class TransactionApi extends runtime.BaseAPI {
             queryParameters['account_index'] = requestParameters['account_index'];
         }
 
-        if (requestParameters['sub_account_index'] != null) {
-            queryParameters['sub_account_index'] = requestParameters['sub_account_index'];
+        if (requestParameters['api_key_index'] != null) {
+            queryParameters['api_key_index'] = requestParameters['api_key_index'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};

package/models/Account.ts

@@ -0,0 +1,104 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface Account
+ */
+export interface Account {
+    /**
+     * 
+     * @type {number}
+     * @memberof Account
+     */
+    code?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Account
+     */
+    message?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof Account
+     */
+    index: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Account
+     */
+    l1_address: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof Account
+     */
+    status: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Account
+     */
+    collateral: string;
+}
+
+/**
+ * Check if a given object implements the Account interface.
+ */
+export function instanceOfAccount(value: object): value is Account {
+    if (!('index' in value) || value['index'] === undefined) return false;
+    if (!('l1_address' in value) || value['l1_address'] === undefined) return false;
+    if (!('status' in value) || value['status'] === undefined) return false;
+    if (!('collateral' in value) || value['collateral'] === undefined) return false;
+    return true;
+}
+
+export function AccountFromJSON(json: any): Account {
+    return AccountFromJSONTyped(json, false);
+}
+
+export function AccountFromJSONTyped(json: any, ignoreDiscriminator: boolean): Account {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'code': json['code'] == null ? undefined : json['code'],
+        'message': json['message'] == null ? undefined : json['message'],
+        'index': json['index'],
+        'l1_address': json['l1_address'],
+        'status': json['status'],
+        'collateral': json['collateral'],
+    };
+}
+
+export function AccountToJSON(value?: Account | null): any {
+    if (value == null) {
+        return value;
+    }
+    return {
+        
+        'code': value['code'],
+        'message': value['message'],
+        'index': value['index'],
+        'l1_address': value['l1_address'],
+        'status': value['status'],
+        'collateral': value['collateral'],
+    };
+}
+

package/models/Accounts.ts

@@ -0,0 +1,93 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { mapValues } from '../runtime';
+import type { Account } from './Account';
+import {
+    AccountFromJSON,
+    AccountFromJSONTyped,
+    AccountToJSON,
+} from './Account';
+
+/**
+ * 
+ * @export
+ * @interface Accounts
+ */
+export interface Accounts {
+    /**
+     * 
+     * @type {number}
+     * @memberof Accounts
+     */
+    code?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Accounts
+     */
+    message?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof Accounts
+     */
+    total: number;
+    /**
+     * 
+     * @type {Array<Account>}
+     * @memberof Accounts
+     */
+    accounts: Array<Account>;
+}
+
+/**
+ * Check if a given object implements the Accounts interface.
+ */
+export function instanceOfAccounts(value: object): value is Accounts {
+    if (!('total' in value) || value['total'] === undefined) return false;
+    if (!('accounts' in value) || value['accounts'] === undefined) return false;
+    return true;
+}
+
+export function AccountsFromJSON(json: any): Accounts {
+    return AccountsFromJSONTyped(json, false);
+}
+
+export function AccountsFromJSONTyped(json: any, ignoreDiscriminator: boolean): Accounts {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'code': json['code'] == null ? undefined : json['code'],
+        'message': json['message'] == null ? undefined : json['message'],
+        'total': json['total'],
+        'accounts': ((json['accounts'] as Array<any>).map(AccountFromJSON)),
+    };
+}
+
+export function AccountsToJSON(value?: Accounts | null): any {
+    if (value == null) {
+        return value;
+    }
+    return {
+        
+        'code': value['code'],
+        'message': value['message'],
+        'total': value['total'],
+        'accounts': ((value['accounts'] as Array<any>).map(AccountToJSON)),
+    };
+}
+

package/models/DetailedAccount.ts

@@ -50,30 +50,12 @@ export interface DetailedAccount {
      * @memberof DetailedAccount
      */
     index?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof DetailedAccount
-     */
-    sub_account_index?: number;
     /**
      * 
      * @type {string}
      * @memberof DetailedAccount
      */
     l1_address?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof DetailedAccount
-     */
-    pk?: string;
-    /**
-     * 
-     * @type {number}
-     * @memberof DetailedAccount
-     */
-    nonce?: number;
     /**
      * 
      * @type {number}
@@ -86,12 +68,6 @@ export interface DetailedAccount {
      * @memberof DetailedAccount
      */
     collateral?: string;
-    /**
-     * 
-     * @type {number}
-     * @memberof DetailedAccount
-     */
-    collateral_type?: number;
     /**
      * 
      * @type {Array<AccountPosition>}
@@ -135,13 +111,9 @@ export function DetailedAccountFromJSONTyped(json: any, ignoreDiscriminator: boo
         'code': json['code'] == null ? undefined : json['code'],
         'message': json['message'] == null ? undefined : json['message'],
         'index': json['index'] == null ? undefined : json['index'],
-        'sub_account_index': json['sub_account_index'] == null ? undefined : json['sub_account_index'],
         'l1_address': json['l1_address'] == null ? undefined : json['l1_address'],
-        'pk': json['pk'] == null ? undefined : json['pk'],
-        'nonce': json['nonce'] == null ? undefined : json['nonce'],
         'status': json['status'] == null ? undefined : json['status'],
         'collateral': json['collateral'] == null ? undefined : json['collateral'],
-        'collateral_type': json['collateral_type'] == null ? undefined : json['collateral_type'],
         'positions': ((json['positions'] as Array<any>).map(AccountPositionFromJSON)),
         'total_asset_value': json['total_asset_value'],
         'market_stats': ((json['market_stats'] as Array<any>).map(AccountMarketStatsFromJSON)),
@@ -157,13 +129,9 @@ export function DetailedAccountToJSON(value?: DetailedAccount | null): any {
         'code': value['code'],
         'message': value['message'],
         'index': value['index'],
-        'sub_account_index': value['sub_account_index'],
         'l1_address': value['l1_address'],
-        'pk': value['pk'],
-        'nonce': value['nonce'],
         'status': value['status'],
         'collateral': value['collateral'],
-        'collateral_type': value['collateral_type'],
         'positions': ((value['positions'] as Array<any>).map(AccountPositionToJSON)),
         'total_asset_value': value['total_asset_value'],
         'market_stats': ((value['market_stats'] as Array<any>).map(AccountMarketStatsToJSON)),

package/models/Order.ts

@@ -25,12 +25,6 @@ export interface Order {
      * @memberof Order
      */
     market_index: number;
-    /**
-     *  TODO: should we return this?
-     * @type {number}
-     * @memberof Order
-     */
-    ownerMainAccountIndex?: number;
     /**
      * 
      * @type {number}
@@ -178,7 +172,6 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
     return {
         
         'market_index': json['market_index'],
-        'ownerMainAccountIndex': json['ownerMainAccountIndex'] == null ? undefined : json['ownerMainAccountIndex'],
         'owner_account_index': json['owner_account_index'],
         'initial_base_amount': json['initial_base_amount'],
         'remaining_base_amount': json['remaining_base_amount'],
@@ -204,7 +197,6 @@ export function OrderToJSON(value?: Order | null): any {
     return {
         
         'market_index': value['market_index'],
-        'ownerMainAccountIndex': value['ownerMainAccountIndex'],
         'owner_account_index': value['owner_account_index'],
         'initial_base_amount': value['initial_base_amount'],
         'remaining_base_amount': value['remaining_base_amount'],

package/models/ReqGetAccountActiveOrders.ts

@@ -25,12 +25,6 @@ export interface ReqGetAccountActiveOrders {
      * @memberof ReqGetAccountActiveOrders
      */
     account_index: number;
-    /**
-     *  NilSubAccountIndex
-     * @type {number}
-     * @memberof ReqGetAccountActiveOrders
-     */
-    sub_account_index: number;
     /**
      * 
      * @type {number}
@@ -44,7 +38,6 @@ export interface ReqGetAccountActiveOrders {
  */
 export function instanceOfReqGetAccountActiveOrders(value: object): value is ReqGetAccountActiveOrders {
     if (!('account_index' in value) || value['account_index'] === undefined) return false;
-    if (!('sub_account_index' in value) || value['sub_account_index'] === undefined) return false;
     if (!('market_id' in value) || value['market_id'] === undefined) return false;
     return true;
 }
@@ -60,7 +53,6 @@ export function ReqGetAccountActiveOrdersFromJSONTyped(json: any, ignoreDiscrimi
     return {
         
         'account_index': json['account_index'],
-        'sub_account_index': json['sub_account_index'],
         'market_id': json['market_id'],
     };
 }
@@ -72,7 +64,6 @@ export function ReqGetAccountActiveOrdersToJSON(value?: ReqGetAccountActiveOrder
     return {
         
         'account_index': value['account_index'],
-        'sub_account_index': value['sub_account_index'],
         'market_id': value['market_id'],
     };
 }

package/models/ReqGetAccountInactiveOrders.ts

@@ -25,12 +25,6 @@ export interface ReqGetAccountInactiveOrders {
      * @memberof ReqGetAccountInactiveOrders
      */
     account_index: number;
-    /**
-     *  NilSubAccountIndex
-     * @type {number}
-     * @memberof ReqGetAccountInactiveOrders
-     */
-    sub_account_index: number;
     /**
      * 
      * @type {string}
@@ -73,7 +67,6 @@ export type ReqGetAccountInactiveOrdersFilterEnum = typeof ReqGetAccountInactive
  */
 export function instanceOfReqGetAccountInactiveOrders(value: object): value is ReqGetAccountInactiveOrders {
     if (!('account_index' in value) || value['account_index'] === undefined) return false;
-    if (!('sub_account_index' in value) || value['sub_account_index'] === undefined) return false;
     if (!('filter' in value) || value['filter'] === undefined) return false;
     if (!('limit' in value) || value['limit'] === undefined) return false;
     return true;
@@ -90,7 +83,6 @@ export function ReqGetAccountInactiveOrdersFromJSONTyped(json: any, ignoreDiscri
     return {
         
         'account_index': json['account_index'],
-        'sub_account_index': json['sub_account_index'],
         'filter': json['filter'],
         'market_id': json['market_id'] == null ? undefined : json['market_id'],
         'cursor': json['cursor'] == null ? undefined : json['cursor'],
@@ -105,7 +97,6 @@ export function ReqGetAccountInactiveOrdersToJSON(value?: ReqGetAccountInactiveO
     return {
         
         'account_index': value['account_index'],
-        'sub_account_index': value['sub_account_index'],
         'filter': value['filter'],
         'market_id': value['market_id'],
         'cursor': value['cursor'],

package/models/ReqGetNextNonce.ts

@@ -30,7 +30,7 @@ export interface ReqGetNextNonce {
      * @type {number}
      * @memberof ReqGetNextNonce
      */
-    sub_account_index: number;
+    api_key_index: number;
 }
 
 /**
@@ -38,7 +38,7 @@ export interface ReqGetNextNonce {
  */
 export function instanceOfReqGetNextNonce(value: object): value is ReqGetNextNonce {
     if (!('account_index' in value) || value['account_index'] === undefined) return false;
-    if (!('sub_account_index' in value) || value['sub_account_index'] === undefined) return false;
+    if (!('api_key_index' in value) || value['api_key_index'] === undefined) return false;
     return true;
 }
 
@@ -53,7 +53,7 @@ export function ReqGetNextNonceFromJSONTyped(json: any, ignoreDiscriminator: boo
     return {
         
         'account_index': json['account_index'],
-        'sub_account_index': json['sub_account_index'],
+        'api_key_index': json['api_key_index'],
     };
 }
 
@@ -64,7 +64,7 @@ export function ReqGetNextNonceToJSON(value?: ReqGetNextNonce | null): any {
     return {
         
         'account_index': value['account_index'],
-        'sub_account_index': value['sub_account_index'],
+        'api_key_index': value['api_key_index'],
     };
 }
 

package/models/SimpleOrder.ts

@@ -25,12 +25,6 @@ export interface SimpleOrder {
      * @memberof SimpleOrder
      */
     owner_account_index: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof SimpleOrder
-     */
-    owner_sub_account_index: number;
     /**
      * 
      * @type {string}
@@ -62,7 +56,6 @@ export interface SimpleOrder {
  */
 export function instanceOfSimpleOrder(value: object): value is SimpleOrder {
     if (!('owner_account_index' in value) || value['owner_account_index'] === undefined) return false;
-    if (!('owner_sub_account_index' in value) || value['owner_sub_account_index'] === undefined) return false;
     if (!('initial_base_amount' in value) || value['initial_base_amount'] === undefined) return false;
     if (!('remaining_base_amount' in value) || value['remaining_base_amount'] === undefined) return false;
     if (!('price' in value) || value['price'] === undefined) return false;
@@ -81,7 +74,6 @@ export function SimpleOrderFromJSONTyped(json: any, ignoreDiscriminator: boolean
     return {
         
         'owner_account_index': json['owner_account_index'],
-        'owner_sub_account_index': json['owner_sub_account_index'],
         'initial_base_amount': json['initial_base_amount'],
         'remaining_base_amount': json['remaining_base_amount'],
         'price': json['price'],
@@ -96,7 +88,6 @@ export function SimpleOrderToJSON(value?: SimpleOrder | null): any {
     return {
         
         'owner_account_index': value['owner_account_index'],
-        'owner_sub_account_index': value['owner_sub_account_index'],
         'initial_base_amount': value['initial_base_amount'],
         'remaining_base_amount': value['remaining_base_amount'],
         'price': value['price'],

package/models/SubAccounts.ts

@@ -13,12 +13,12 @@
  */
 
 import { mapValues } from '../runtime';
-import type { SubAccount } from './SubAccount';
+import type { Account } from './Account';
 import {
-    SubAccountFromJSON,
-    SubAccountFromJSONTyped,
-    SubAccountToJSON,
-} from './SubAccount';
+    AccountFromJSON,
+    AccountFromJSONTyped,
+    AccountToJSON,
+} from './Account';
 
 /**
  * 
@@ -38,12 +38,6 @@ export interface SubAccounts {
      * @memberof SubAccounts
      */
     message?: string;
-    /**
-     * 
-     * @type {number}
-     * @memberof SubAccounts
-     */
-    index: number;
     /**
      * 
      * @type {string}
@@ -52,25 +46,17 @@ export interface SubAccounts {
     l1_address: string;
     /**
      * 
-     * @type {number}
-     * @memberof SubAccounts
-     */
-    status: number;
-    /**
-     * 
-     * @type {Array<SubAccount>}
+     * @type {Array<Account>}
      * @memberof SubAccounts
      */
-    sub_accounts: Array<SubAccount>;
+    sub_accounts: Array<Account>;
 }
 
 /**
  * Check if a given object implements the SubAccounts interface.
  */
 export function instanceOfSubAccounts(value: object): value is SubAccounts {
-    if (!('index' in value) || value['index'] === undefined) return false;
     if (!('l1_address' in value) || value['l1_address'] === undefined) return false;
-    if (!('status' in value) || value['status'] === undefined) return false;
     if (!('sub_accounts' in value) || value['sub_accounts'] === undefined) return false;
     return true;
 }
@@ -87,10 +73,8 @@ export function SubAccountsFromJSONTyped(json: any, ignoreDiscriminator: boolean
         
         'code': json['code'] == null ? undefined : json['code'],
         'message': json['message'] == null ? undefined : json['message'],
-        'index': json['index'],
         'l1_address': json['l1_address'],
-        'status': json['status'],
-        'sub_accounts': ((json['sub_accounts'] as Array<any>).map(SubAccountFromJSON)),
+        'sub_accounts': ((json['sub_accounts'] as Array<any>).map(AccountFromJSON)),
     };
 }
 
@@ -102,10 +86,8 @@ export function SubAccountsToJSON(value?: SubAccounts | null): any {
         
         'code': value['code'],
         'message': value['message'],
-        'index': value['index'],
         'l1_address': value['l1_address'],
-        'status': value['status'],
-        'sub_accounts': ((value['sub_accounts'] as Array<any>).map(SubAccountToJSON)),
+        'sub_accounts': ((value['sub_accounts'] as Array<any>).map(AccountToJSON)),
     };
 }
 

package/models/index.ts

@@ -1,9 +1,11 @@
 /* tslint:disable */
 /* eslint-disable */
+export * from './Account';
 export * from './AccountMarketStats';
 export * from './AccountPnL';
 export * from './AccountPosition';
 export * from './AccountStats';
+export * from './Accounts';
 export * from './Block';
 export * from './Blocks';
 export * from './Candlestick';
@@ -20,8 +22,6 @@ export * from './Fundings';
 export * from './L1ProviderInfo';
 export * from './Layer1BasicInfo';
 export * from './Layer2BasicInfo';
-export * from './MainAccount';
-export * from './MainAccounts';
 export * from './MarketInfo';
 export * from './NextNonce';
 export * from './Order';
@@ -61,7 +61,6 @@ export * from './ReqGetRangeWithIndex';
 export * from './ReqGetRangeWithIndexSortable';
 export * from './ReqGetRecentTrades';
 export * from './ReqGetRollbacks';
-export * from './ReqGetSubAccount';
 export * from './ReqGetTrades';
 export * from './ReqGetTx';
 export * from './ReqSearch';
@@ -72,7 +71,6 @@ export * from './Search';
 export * from './SignBody';
 export * from './SimpleOrder';
 export * from './Status';
-export * from './SubAccount';
 export * from './SubAccounts';
 export * from './Trade';
 export * from './Trades';

package/openapi.json

@@ -73,15 +73,6 @@
             "in": "query",
             "required": true,
             "type": "string"
-          },
-          {
-            "name": "sub_account_index",
-            "description": " NilSubAccountIndex",
-            "in": "query",
-            "required": true,
-            "type": "integer",
-            "format": "uint8",
-            "default": "255"
           }
         ],
         "tags": [
@@ -90,7 +81,7 @@
         "consumes": [
           "multipart/form-data"
         ],
-        "description": "Get account by main account's l1_address or index and sub account's index. Returns detailed account info"
+        "description": "Get account by account's l1_address or index. Returns detailed account info"
       }
     },
     "/api/v1/accountActiveOrders": {
@@ -119,15 +110,6 @@
             "type": "integer",
             "format": "int32"
           },
-          {
-            "name": "sub_account_index",
-            "description": " NilSubAccountIndex",
-            "in": "query",
-            "required": true,
-            "type": "integer",
-            "format": "uint8",
-            "default": "255"
-          },
           {
             "name": "market_id",
             "in": "query",
@@ -171,15 +153,6 @@
             "type": "integer",
             "format": "int32"
           },
-          {
-            "name": "sub_account_index",
-            "description": " NilSubAccountIndex",
-            "in": "query",
-            "required": true,
-            "type": "integer",
-            "format": "uint8",
-            "default": "255"
-          },
           {
             "name": "filter",
             "in": "query",
@@ -408,7 +381,7 @@
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/MainAccounts"
+              "$ref": "#/definitions/Accounts"
             }
           },
           "400": {
@@ -453,7 +426,7 @@
         "consumes": [
           "multipart/form-data"
         ],
-        "description": "Get accounts returns main accounts by account index"
+        "description": "Get accounts returns accounts by account index"
       }
     },
     "/api/v1/accountsByL1Address": {
@@ -488,7 +461,7 @@
         "consumes": [
           "multipart/form-data"
         ],
-        "description": "Get accounts by l1_address returns main account and its sub accounts"
+        "description": "Get accounts by l1_address returns all accounts associated with the given L1 address"
       }
     },
     "/api/v1/block": {
@@ -968,7 +941,7 @@
             "format": "int32"
           },
           {
-            "name": "sub_account_index",
+            "name": "api_key_index",
             "in": "query",
             "required": true,
             "type": "integer",
@@ -1703,6 +1676,44 @@
     }
   },
   "definitions": {
+    "Account": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32",
+          "example": "100"
+        },
+        "message": {
+          "type": "string"
+        },
+        "index": {
+          "type": "integer",
+          "format": "int32",
+          "example": "1"
+        },
+        "l1_address": {
+          "type": "string",
+          "example": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
+        },
+        "status": {
+          "type": "integer",
+          "format": "int32",
+          "example": "1"
+        },
+        "collateral": {
+          "type": "string",
+          "example": "46342"
+        }
+      },
+      "title": "Account",
+      "required": [
+        "index",
+        "l1_address",
+        "status",
+        "collateral"
+      ]
+    },
     "AccountMarketStats": {
       "type": "object",
       "properties": {
@@ -1873,6 +1884,35 @@
         "buying_power"
       ]
     },
+    "Accounts": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32",
+          "example": "100"
+        },
+        "message": {
+          "type": "string"
+        },
+        "total": {
+          "type": "integer",
+          "format": "int32",
+          "example": "1"
+        },
+        "accounts": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Account"
+          }
+        }
+      },
+      "title": "Accounts",
+      "required": [
+        "total",
+        "accounts"
+      ]
+    },
     "Block": {
       "type": "object",
       "properties": {
@@ -2113,38 +2153,19 @@
           "format": "int32",
           "example": "1"
         },
-        "sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
         "l1_address": {
           "type": "string",
           "example": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
         },
-        "pk": {
-          "type": "string",
-          "example": "3ac126b0a0a3cc8cb367ef67a5c77389a85e08e20ce8da3edf34d022e9bf1ab8"
-        },
-        "nonce": {
-          "type": "integer",
-          "format": "int64",
-          "example": "722"
-        },
         "status": {
           "type": "integer",
-          "format": "uint8",
+          "format": "int32",
           "example": "1"
         },
         "collateral": {
           "type": "string",
           "example": "46342"
         },
-        "collateral_type": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
         "positions": {
           "type": "array",
           "items": {
@@ -2524,68 +2545,6 @@
         "total_transaction_count"
       ]
     },
-    "MainAccount": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32",
-          "example": "100"
-        },
-        "message": {
-          "type": "string"
-        },
-        "index": {
-          "type": "integer",
-          "format": "int32",
-          "example": "1"
-        },
-        "l1_address": {
-          "type": "string",
-          "example": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
-        },
-        "status": {
-          "type": "integer",
-          "format": "int32",
-          "example": "1"
-        }
-      },
-      "title": "MainAccount",
-      "required": [
-        "index",
-        "l1_address",
-        "status"
-      ]
-    },
-    "MainAccounts": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "integer",
-          "format": "int32",
-          "example": "100"
-        },
-        "message": {
-          "type": "string"
-        },
-        "total": {
-          "type": "integer",
-          "format": "int32",
-          "example": "1"
-        },
-        "accounts": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/MainAccount"
-          }
-        }
-      },
-      "title": "MainAccounts",
-      "required": [
-        "total",
-        "accounts"
-      ]
-    },
     "MarketInfo": {
       "type": "object",
       "properties": {
@@ -2686,14 +2645,9 @@
           "format": "uin16",
           "example": "1"
         },
-        "ownerMainAccountIndex": {
-          "type": "integer",
-          "format": "int64",
-          "description": " TODO: should we return this?"
-        },
         "owner_account_index": {
           "type": "integer",
-          "format": "int64",
+          "format": "int32",
           "example": "1"
         },
         "initial_base_amount": {
@@ -2772,7 +2726,6 @@
       "title": "Order",
       "required": [
         "market_index",
-        
         "owner_account_index",
         "initial_base_amount",
         "remaining_base_amount",
@@ -3039,7 +2992,7 @@
         },
         "daily_chart": {
           "type": "object",
-          "example": "{1640995200: 3024.66}",
+          "example": "{1640995200:3024.66}",
           "additionalProperties": {
             "type": "number",
             "format": "double"
@@ -3324,12 +3277,6 @@
           "type": "integer",
           "format": "int32"
         },
-        "sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "default": "255",
-          "description": " NilSubAccountIndex"
-        },
         "market_id": {
           "type": "integer",
           "format": "uin16"
@@ -3338,7 +3285,6 @@
       "title": "ReqGetAccountActiveOrders",
       "required": [
         "account_index",
-        "sub_account_index",
         "market_id"
       ]
     },
@@ -3361,12 +3307,6 @@
           "type": "integer",
           "format": "int32"
         },
-        "sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "default": "255",
-          "description": " NilSubAccountIndex"
-        },
         "filter": {
           "type": "string",
           "enum": [
@@ -3391,7 +3331,6 @@
       "title": "ReqGetAccountInactiveOrders",
       "required": [
         "account_index",
-        "sub_account_index",
         "filter",
         "limit"
       ]
@@ -3685,7 +3624,7 @@
           "type": "integer",
           "format": "int32"
         },
-        "sub_account_index": {
+        "api_key_index": {
           "type": "integer",
           "format": "uint8"
         }
@@ -3693,7 +3632,7 @@
       "title": "ReqGetNextNonce",
       "required": [
         "account_index",
-        "sub_account_index"
+        "api_key_index"
       ]
     },
     "ReqGetOrderBookDetails": {
@@ -3888,33 +3827,6 @@
         "limit"
       ]
     },
-    "ReqGetSubAccount": {
-      "type": "object",
-      "properties": {
-        "by": {
-          "type": "string",
-          "enum": [
-            "index",
-            "l1_address"
-          ]
-        },
-        "value": {
-          "type": "string"
-        },
-        "sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "default": "255",
-          "description": " NilSubAccountIndex"
-        }
-      },
-      "title": "ReqGetSubAccount",
-      "required": [
-        "by",
-        "value",
-        "sub_account_index"
-      ]
-    },
     "ReqGetTrades": {
       "type": "object",
       "properties": {
@@ -4146,11 +4058,6 @@
           "format": "int32",
           "example": "1"
         },
-        "owner_sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
         "initial_base_amount": {
           "type": "string",
           "example": "0.1"
@@ -4172,7 +4079,6 @@
       "title": "SimpleOrder",
       "required": [
         "owner_account_index",
-        "owner_sub_account_index",
         "initial_base_amount",
         "remaining_base_amount",
         "price",
@@ -4199,59 +4105,6 @@
         "network_id"
       ]
     },
-    "SubAccount": {
-      "type": "object",
-      "properties": {
-        "index": {
-          "type": "integer",
-          "format": "int32",
-          "example": "1"
-        },
-        "sub_account_index": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
-        "l1_address": {
-          "type": "string",
-          "example": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
-        },
-        "pk": {
-          "type": "string",
-          "example": "3ac126b0a0a3cc8cb367ef67a5c77389a85e08e20ce8da3edf34d022e9bf1ab8"
-        },
-        "nonce": {
-          "type": "integer",
-          "format": "int64",
-          "example": "722"
-        },
-        "status": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
-        "collateral": {
-          "type": "string",
-          "example": "46342"
-        },
-        "collateral_type": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        }
-      },
-      "title": "SubAccount",
-      "required": [
-        "index",
-        "sub_account_index",
-        "l1_address",
-        "pk",
-        "nonce",
-        "status",
-        "collateral",
-        "collateral_type"
-      ]
-    },
     "SubAccounts": {
       "type": "object",
       "properties": {
@@ -4263,33 +4116,21 @@
         "message": {
           "type": "string"
         },
-        "index": {
-          "type": "integer",
-          "format": "int32",
-          "example": "1"
-        },
         "l1_address": {
           "type": "string",
           "example": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
         },
-        "status": {
-          "type": "integer",
-          "format": "uint8",
-          "example": "1"
-        },
         "sub_accounts": {
           "type": "array",
           "example": "1",
           "items": {
-            "$ref": "#/definitions/SubAccount"
+            "$ref": "#/definitions/Account"
           }
         }
       },
       "title": "SubAccounts",
       "required": [
-        "index",
         "l1_address",
-        "status",
         "sub_accounts"
       ]
     },
@@ -4330,12 +4171,12 @@
         },
         "maker_account_id": {
           "type": "integer",
-          "format": "int64",
+          "format": "int32",
           "example": "1"
         },
         "taker_account_id": {
           "type": "integer",
-          "format": "int64",
+          "format": "int32",
           "example": "3"
         },
         "is_maker_ask": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zklighter-perps",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "zkLighter Perps SDK",
   "main": "index.ts",
   "directories": {