@nadohq/engine-client 0.1.0-alpha.3 → 0.1.0-alpha.31

package/dist/EngineBaseClient.cjs

@@ -33,15 +33,16 @@ __export(EngineBaseClient_exports, {
   EngineBaseClient: () => EngineBaseClient
 });
 module.exports = __toCommonJS(EngineBaseClient_exports);
-var import_contracts = require("@nadohq/contracts");
-var import_utils = require("@nadohq/utils");
+var import_shared = require("@nadohq/shared");
 var import_axios = __toESM(require("axios"), 1);
 var import_EngineServerFailureError = require("./types/EngineServerFailureError.cjs");
 var EngineBaseClient = class {
   constructor(opts) {
     this.opts = opts;
     this.axiosInstance = import_axios.default.create({
-      withCredentials: true
+      withCredentials: true,
+      // We have custom logic to validate response status and create an appropriate error
+      validateStatus: () => true
     });
   }
   /**
@@ -55,7 +56,7 @@ var EngineBaseClient = class {
   async getTxNonce(address) {
     const addr = address ?? this.opts.walletClient?.account.address;
     if (!addr) {
-      throw new import_utils.WalletNotProvidedError();
+      throw new import_shared.WalletNotProvidedError();
     }
     return (await this.getNonces({
       address: addr
@@ -136,9 +137,9 @@ var EngineBaseClient = class {
   async sign(requestType, verifyingContract, chainId, params) {
     const walletClient = this.opts.linkedSignerWalletClient ?? this.opts.walletClient;
     if (!walletClient) {
-      throw new import_utils.WalletNotProvidedError();
+      throw new import_shared.WalletNotProvidedError();
     }
-    return (0, import_contracts.getSignedTransactionRequest)({
+    return (0, import_shared.getSignedTransactionRequest)({
       chainId,
       requestParams: params,
       requestType,
@@ -149,7 +150,7 @@ var EngineBaseClient = class {
   checkResponseStatus(response) {
     if (response.status !== 200 || !response.data) {
       throw Error(
-        `Unexpected response from server: ${response.status} ${response.statusText}`
+        `Unexpected response from server: ${response.status} ${response.statusText}. Data: ${response.data}`
       );
     }
   }

package/dist/EngineBaseClient.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/EngineBaseClient.ts"],"sourcesContent":["import {\n  getSignedTransactionRequest,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n  WalletClientWithAccount,\n} from '@nadohq/contracts';\nimport { WalletNotProvidedError } from '@nadohq/utils';\nimport axios, { AxiosInstance, AxiosResponse } from 'axios';\nimport {\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteRequestType,\n  EngineServerExecuteResult,\n  EngineServerExecuteSuccessResult,\n  EngineServerQueryRequest,\n  EngineServerQueryRequestByType,\n  EngineServerQueryRequestType,\n  EngineServerQueryResponse,\n  EngineServerQueryResponseByType,\n  EngineServerQuerySuccessResponse,\n  GetEngineNoncesParams,\n  GetEngineNoncesResponse,\n} from './types';\nimport { EngineServerFailureError } from './types/EngineServerFailureError';\n\nexport interface EngineClientOpts {\n  // Server URL\n  url: string;\n  // Wallet client for EIP712 signing\n  walletClient?: WalletClientWithAccount;\n  // Linked signer registered through the engine, if provided, execute requests will use this signer\n  linkedSignerWalletClient?: WalletClientWithAccount;\n}\n\n// Only 1 key can be defined per execute request\ntype EngineExecuteRequestBody = Partial<EngineServerExecuteRequestByType>;\n\ntype EngineQueryRequestResponse<\n  T extends EngineServerQueryRequestType = EngineServerQueryRequestType,\n> = EngineServerQueryResponse<T>;\n\n/**\n * Base client for all engine requests\n */\nexport class EngineBaseClient {\n  readonly opts: EngineClientOpts;\n  readonly axiosInstance: AxiosInstance;\n\n  constructor(opts: EngineClientOpts) {\n    this.opts = opts;\n    this.axiosInstance = axios.create({\n      withCredentials: true,\n    });\n  }\n\n  /**\n   * Sets the linked signer for execute requests\n   *\n   * @param linkedSignerWalletClient The linkedSigner to use for all signatures. Set to null to revert to the chain signer\n   */\n  public setLinkedSigner(\n    linkedSignerWalletClient: WalletClientWithAccount | null,\n  ) {\n    this.opts.linkedSignerWalletClient = linkedSignerWalletClient ?? undefined;\n  }\n\n  public async getTxNonce(address?: string): Promise<string> {\n    const addr = address ?? this.opts.walletClient?.account.address;\n\n    if (!addr) {\n      throw new WalletNotProvidedError();\n    }\n\n    return (\n      await this.getNonces({\n        address: addr,\n      })\n    ).txNonce;\n  }\n\n  public async getNonces(\n    params: GetEngineNoncesParams,\n  ): Promise<GetEngineNoncesResponse> {\n    const baseResp = await this.query('nonces', params);\n\n    return {\n      orderNonce: baseResp.order_nonce,\n      txNonce: baseResp.tx_nonce,\n    };\n  }\n\n  /**\n   * Queries the engine, all query params are stringified into the query string\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async query<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): Promise<EngineServerQueryResponseByType[TRequestType]> {\n    const request = this.getQueryRequest(requestType, params);\n    const response = await this.axiosInstance.post<EngineQueryRequestResponse>(\n      `${this.opts.url}/query`,\n      request,\n    );\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus throws on failure responses so the cast to the success response is acceptable here\n    const successResponse = response as AxiosResponse<\n      EngineServerQuerySuccessResponse<TRequestType>\n    >;\n\n    return successResponse.data.data;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing a query request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getQueryRequest<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): EngineServerQueryRequest<TRequestType> {\n    return {\n      type: requestType,\n      ...params,\n    };\n  }\n\n  /**\n   * POSTs an execute message to the engine and returns the successful response. Throws the failure response wrapped\n   * in an EngineServerFailureError on failure.\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async execute<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): Promise<EngineServerExecuteSuccessResult<TRequestType>> {\n    const reqBody = this.getExecuteRequest(requestType, params);\n    const response = await this.axiosInstance.post<\n      EngineServerExecuteResult<TRequestType>\n    >(`${this.opts.url}/execute`, reqBody);\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus catches the failure result and throws the error, so the cast to the success response is acceptable here\n    return response.data as EngineServerExecuteSuccessResult<TRequestType>;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing an execute request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getExecuteRequest<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): EngineExecuteRequestBody {\n    return {\n      [requestType]: params,\n    };\n  }\n\n  /**\n   * Signs a given request with the signer provided to the engine\n   *\n   * @param requestType\n   * @param verifyingContract\n   * @param chainId\n   * @param params\n   * @public\n   */\n  public async sign<T extends SignableRequestType>(\n    requestType: T,\n    verifyingContract: string,\n    chainId: number,\n    params: SignableRequestTypeToParams[T],\n  ) {\n    // Use the linked signer if provided, otherwise use the default signer provided to the engine\n    const walletClient =\n      this.opts.linkedSignerWalletClient ?? this.opts.walletClient;\n\n    if (!walletClient) {\n      throw new WalletNotProvidedError();\n    }\n\n    return getSignedTransactionRequest({\n      chainId,\n      requestParams: params,\n      requestType,\n      walletClient,\n      verifyingContract,\n    });\n  }\n\n  private checkResponseStatus(response: AxiosResponse) {\n    if (response.status !== 200 || !response.data) {\n      throw Error(\n        `Unexpected response from server: ${response.status} ${response.statusText}`,\n      );\n    }\n  }\n\n  private checkServerStatus(\n    response: AxiosResponse<\n      EngineServerExecuteResult | EngineQueryRequestResponse\n    >,\n  ) {\n    if (response.data.status !== 'success') {\n      throw new EngineServerFailureError(response.data);\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAKO;AACP,mBAAuC;AACvC,mBAAoD;AAepD,sCAAyC;AAqBlC,IAAM,mBAAN,MAAuB;AAAA,EAI5B,YAAY,MAAwB;AAClC,SAAK,OAAO;AACZ,SAAK,gBAAgB,aAAAA,QAAM,OAAO;AAAA,MAChC,iBAAiB;AAAA,IACnB,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOO,gBACL,0BACA;AACA,SAAK,KAAK,2BAA2B,4BAA4B;AAAA,EACnE;AAAA,EAEA,MAAa,WAAW,SAAmC;AACzD,UAAM,OAAO,WAAW,KAAK,KAAK,cAAc,QAAQ;AAExD,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,oCAAuB;AAAA,IACnC;AAEA,YACE,MAAM,KAAK,UAAU;AAAA,MACnB,SAAS;AAAA,IACX,CAAC,GACD;AAAA,EACJ;AAAA,EAEA,MAAa,UACX,QACkC;AAClC,UAAM,WAAW,MAAM,KAAK,MAAM,UAAU,MAAM;AAElD,WAAO;AAAA,MACL,YAAY,SAAS;AAAA,MACrB,SAAS,SAAS;AAAA,IACpB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAa,MACX,aACA,QACwD;AACxD,UAAM,UAAU,KAAK,gBAAgB,aAAa,MAAM;AACxD,UAAM,WAAW,MAAM,KAAK,cAAc;AAAA,MACxC,GAAG,KAAK,KAAK,GAAG;AAAA,MAChB;AAAA,IACF;AAEA,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,UAAM,kBAAkB;AAIxB,WAAO,gBAAgB,KAAK;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,gBACL,aACA,QACwC;AACxC,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,IACL;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAa,QACX,aACA,QACyD;AACzD,UAAM,UAAU,KAAK,kBAAkB,aAAa,MAAM;AAC1D,UAAM,WAAW,MAAM,KAAK,cAAc,KAExC,GAAG,KAAK,KAAK,GAAG,YAAY,OAAO;AAErC,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,WAAO,SAAS;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,kBACL,aACA,QAC0B;AAC1B,WAAO;AAAA,MACL,CAAC,WAAW,GAAG;AAAA,IACjB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,MAAa,KACX,aACA,mBACA,SACA,QACA;AAEA,UAAM,eACJ,KAAK,KAAK,4BAA4B,KAAK,KAAK;AAElD,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,oCAAuB;AAAA,IACnC;AAEA,eAAO,8CAA4B;AAAA,MACjC;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,UAAyB;AACnD,QAAI,SAAS,WAAW,OAAO,CAAC,SAAS,MAAM;AAC7C,YAAM;AAAA,QACJ,oCAAoC,SAAS,MAAM,IAAI,SAAS,UAAU;AAAA,MAC5E;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,kBACN,UAGA;AACA,QAAI,SAAS,KAAK,WAAW,WAAW;AACtC,YAAM,IAAI,yDAAyB,SAAS,IAAI;AAAA,IAClD;AAAA,EACF;AACF;","names":["axios"]}
+{"version":3,"sources":["../src/EngineBaseClient.ts"],"sourcesContent":["import {\n  getSignedTransactionRequest,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n  WalletClientWithAccount,\n  WalletNotProvidedError,\n} from '@nadohq/shared';\nimport axios, { AxiosInstance, AxiosResponse } from 'axios';\nimport {\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteRequestType,\n  EngineServerExecuteResult,\n  EngineServerExecuteSuccessResult,\n  EngineServerQueryRequest,\n  EngineServerQueryRequestByType,\n  EngineServerQueryRequestType,\n  EngineServerQueryResponse,\n  EngineServerQueryResponseByType,\n  EngineServerQuerySuccessResponse,\n  GetEngineNoncesParams,\n  GetEngineNoncesResponse,\n} from './types';\nimport { EngineServerFailureError } from './types/EngineServerFailureError';\n\nexport interface EngineClientOpts {\n  // Server URL\n  url: string;\n  // Wallet client for EIP712 signing\n  walletClient?: WalletClientWithAccount;\n  // Linked signer registered through the engine, if provided, execute requests will use this signer\n  linkedSignerWalletClient?: WalletClientWithAccount;\n}\n\n// Only 1 key can be defined per execute request\ntype EngineExecuteRequestBody = Partial<EngineServerExecuteRequestByType>;\n\ntype EngineQueryRequestResponse<\n  T extends EngineServerQueryRequestType = EngineServerQueryRequestType,\n> = EngineServerQueryResponse<T>;\n\n/**\n * Base client for all engine requests\n */\nexport class EngineBaseClient {\n  readonly opts: EngineClientOpts;\n  readonly axiosInstance: AxiosInstance;\n\n  constructor(opts: EngineClientOpts) {\n    this.opts = opts;\n    this.axiosInstance = axios.create({\n      withCredentials: true,\n      // We have custom logic to validate response status and create an appropriate error\n      validateStatus: () => true,\n    });\n  }\n\n  /**\n   * Sets the linked signer for execute requests\n   *\n   * @param linkedSignerWalletClient The linkedSigner to use for all signatures. Set to null to revert to the chain signer\n   */\n  public setLinkedSigner(\n    linkedSignerWalletClient: WalletClientWithAccount | null,\n  ) {\n    this.opts.linkedSignerWalletClient = linkedSignerWalletClient ?? undefined;\n  }\n\n  public async getTxNonce(address?: string): Promise<string> {\n    const addr = address ?? this.opts.walletClient?.account.address;\n\n    if (!addr) {\n      throw new WalletNotProvidedError();\n    }\n\n    return (\n      await this.getNonces({\n        address: addr,\n      })\n    ).txNonce;\n  }\n\n  public async getNonces(\n    params: GetEngineNoncesParams,\n  ): Promise<GetEngineNoncesResponse> {\n    const baseResp = await this.query('nonces', params);\n\n    return {\n      orderNonce: baseResp.order_nonce,\n      txNonce: baseResp.tx_nonce,\n    };\n  }\n\n  /**\n   * Queries the engine, all query params are stringified into the query string\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async query<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): Promise<EngineServerQueryResponseByType[TRequestType]> {\n    const request = this.getQueryRequest(requestType, params);\n    const response = await this.axiosInstance.post<EngineQueryRequestResponse>(\n      `${this.opts.url}/query`,\n      request,\n    );\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus throws on failure responses so the cast to the success response is acceptable here\n    const successResponse = response as AxiosResponse<\n      EngineServerQuerySuccessResponse<TRequestType>\n    >;\n\n    return successResponse.data.data;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing a query request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getQueryRequest<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): EngineServerQueryRequest<TRequestType> {\n    return {\n      type: requestType,\n      ...params,\n    };\n  }\n\n  /**\n   * POSTs an execute message to the engine and returns the successful response. Throws the failure response wrapped\n   * in an EngineServerFailureError on failure.\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async execute<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): Promise<EngineServerExecuteSuccessResult<TRequestType>> {\n    const reqBody = this.getExecuteRequest(requestType, params);\n    const response = await this.axiosInstance.post<\n      EngineServerExecuteResult<TRequestType>\n    >(`${this.opts.url}/execute`, reqBody);\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus catches the failure result and throws the error, so the cast to the success response is acceptable here\n    return response.data as EngineServerExecuteSuccessResult<TRequestType>;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing an execute request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getExecuteRequest<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): EngineExecuteRequestBody {\n    return {\n      [requestType]: params,\n    };\n  }\n\n  /**\n   * Signs a given request with the signer provided to the engine\n   *\n   * @param requestType\n   * @param verifyingContract\n   * @param chainId\n   * @param params\n   * @public\n   */\n  public async sign<T extends SignableRequestType>(\n    requestType: T,\n    verifyingContract: string,\n    chainId: number,\n    params: SignableRequestTypeToParams[T],\n  ) {\n    // Use the linked signer if provided, otherwise use the default signer provided to the engine\n    const walletClient =\n      this.opts.linkedSignerWalletClient ?? this.opts.walletClient;\n\n    if (!walletClient) {\n      throw new WalletNotProvidedError();\n    }\n\n    return getSignedTransactionRequest({\n      chainId,\n      requestParams: params,\n      requestType,\n      walletClient,\n      verifyingContract,\n    });\n  }\n\n  private checkResponseStatus(response: AxiosResponse) {\n    if (response.status !== 200 || !response.data) {\n      throw Error(\n        `Unexpected response from server: ${response.status} ${response.statusText}. Data: ${response.data}`,\n      );\n    }\n  }\n\n  private checkServerStatus(\n    response: AxiosResponse<\n      EngineServerExecuteResult | EngineQueryRequestResponse\n    >,\n  ) {\n    if (response.data.status !== 'success') {\n      throw new EngineServerFailureError(response.data);\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAMO;AACP,mBAAoD;AAepD,sCAAyC;AAqBlC,IAAM,mBAAN,MAAuB;AAAA,EAI5B,YAAY,MAAwB;AAClC,SAAK,OAAO;AACZ,SAAK,gBAAgB,aAAAA,QAAM,OAAO;AAAA,MAChC,iBAAiB;AAAA;AAAA,MAEjB,gBAAgB,MAAM;AAAA,IACxB,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOO,gBACL,0BACA;AACA,SAAK,KAAK,2BAA2B,4BAA4B;AAAA,EACnE;AAAA,EAEA,MAAa,WAAW,SAAmC;AACzD,UAAM,OAAO,WAAW,KAAK,KAAK,cAAc,QAAQ;AAExD,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,qCAAuB;AAAA,IACnC;AAEA,YACE,MAAM,KAAK,UAAU;AAAA,MACnB,SAAS;AAAA,IACX,CAAC,GACD;AAAA,EACJ;AAAA,EAEA,MAAa,UACX,QACkC;AAClC,UAAM,WAAW,MAAM,KAAK,MAAM,UAAU,MAAM;AAElD,WAAO;AAAA,MACL,YAAY,SAAS;AAAA,MACrB,SAAS,SAAS;AAAA,IACpB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAa,MACX,aACA,QACwD;AACxD,UAAM,UAAU,KAAK,gBAAgB,aAAa,MAAM;AACxD,UAAM,WAAW,MAAM,KAAK,cAAc;AAAA,MACxC,GAAG,KAAK,KAAK,GAAG;AAAA,MAChB;AAAA,IACF;AAEA,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,UAAM,kBAAkB;AAIxB,WAAO,gBAAgB,KAAK;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,gBACL,aACA,QACwC;AACxC,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,IACL;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAa,QACX,aACA,QACyD;AACzD,UAAM,UAAU,KAAK,kBAAkB,aAAa,MAAM;AAC1D,UAAM,WAAW,MAAM,KAAK,cAAc,KAExC,GAAG,KAAK,KAAK,GAAG,YAAY,OAAO;AAErC,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,WAAO,SAAS;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,kBACL,aACA,QAC0B;AAC1B,WAAO;AAAA,MACL,CAAC,WAAW,GAAG;AAAA,IACjB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,MAAa,KACX,aACA,mBACA,SACA,QACA;AAEA,UAAM,eACJ,KAAK,KAAK,4BAA4B,KAAK,KAAK;AAElD,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,qCAAuB;AAAA,IACnC;AAEA,eAAO,2CAA4B;AAAA,MACjC;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,UAAyB;AACnD,QAAI,SAAS,WAAW,OAAO,CAAC,SAAS,MAAM;AAC7C,YAAM;AAAA,QACJ,oCAAoC,SAAS,MAAM,IAAI,SAAS,UAAU,WAAW,SAAS,IAAI;AAAA,MACpG;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,kBACN,UAGA;AACA,QAAI,SAAS,KAAK,WAAW,WAAW;AACtC,YAAM,IAAI,yDAAyB,SAAS,IAAI;AAAA,IAClD;AAAA,EACF;AACF;","names":["axios"]}

package/dist/EngineBaseClient.d.cts

@@ -1,9 +1,8 @@
-import { WalletClientWithAccount, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/contracts';
+import { WalletClientWithAccount, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/shared';
 import { AxiosInstance } from 'axios';
-import { GetEngineNoncesParams, GetEngineNoncesResponse } from './types/clientQueryTypes.cjs';
 import { EngineServerExecuteRequestType, EngineServerExecuteRequestByType, EngineServerExecuteSuccessResult } from './types/serverExecuteTypes.cjs';
+import { GetEngineNoncesParams, GetEngineNoncesResponse } from './types/clientQueryTypes.cjs';
 import { EngineServerQueryRequestType, EngineServerQueryRequestByType, EngineServerQueryResponseByType, EngineServerQueryRequest } from './types/serverQueryTypes.cjs';
-import '@nadohq/utils';
 import './types/serverQueryModelTypes.cjs';
 
 interface EngineClientOpts {

package/dist/EngineBaseClient.d.ts

@@ -1,9 +1,8 @@
-import { WalletClientWithAccount, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/contracts';
+import { WalletClientWithAccount, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/shared';
 import { AxiosInstance } from 'axios';
-import { GetEngineNoncesParams, GetEngineNoncesResponse } from './types/clientQueryTypes.js';
 import { EngineServerExecuteRequestType, EngineServerExecuteRequestByType, EngineServerExecuteSuccessResult } from './types/serverExecuteTypes.js';
+import { GetEngineNoncesParams, GetEngineNoncesResponse } from './types/clientQueryTypes.js';
 import { EngineServerQueryRequestType, EngineServerQueryRequestByType, EngineServerQueryResponseByType, EngineServerQueryRequest } from './types/serverQueryTypes.js';
-import '@nadohq/utils';
 import './types/serverQueryModelTypes.js';
 
 interface EngineClientOpts {

package/dist/EngineBaseClient.js

@@ -1,15 +1,17 @@
 // src/EngineBaseClient.ts
 import {
-  getSignedTransactionRequest
-} from "@nadohq/contracts";
-import { WalletNotProvidedError } from "@nadohq/utils";
+  getSignedTransactionRequest,
+  WalletNotProvidedError
+} from "@nadohq/shared";
 import axios from "axios";
 import { EngineServerFailureError } from "./types/EngineServerFailureError.js";
 var EngineBaseClient = class {
   constructor(opts) {
     this.opts = opts;
     this.axiosInstance = axios.create({
-      withCredentials: true
+      withCredentials: true,
+      // We have custom logic to validate response status and create an appropriate error
+      validateStatus: () => true
     });
   }
   /**
@@ -117,7 +119,7 @@ var EngineBaseClient = class {
   checkResponseStatus(response) {
     if (response.status !== 200 || !response.data) {
       throw Error(
-        `Unexpected response from server: ${response.status} ${response.statusText}`
+        `Unexpected response from server: ${response.status} ${response.statusText}. Data: ${response.data}`
       );
     }
   }

package/dist/EngineBaseClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/EngineBaseClient.ts"],"sourcesContent":["import {\n  getSignedTransactionRequest,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n  WalletClientWithAccount,\n} from '@nadohq/contracts';\nimport { WalletNotProvidedError } from '@nadohq/utils';\nimport axios, { AxiosInstance, AxiosResponse } from 'axios';\nimport {\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteRequestType,\n  EngineServerExecuteResult,\n  EngineServerExecuteSuccessResult,\n  EngineServerQueryRequest,\n  EngineServerQueryRequestByType,\n  EngineServerQueryRequestType,\n  EngineServerQueryResponse,\n  EngineServerQueryResponseByType,\n  EngineServerQuerySuccessResponse,\n  GetEngineNoncesParams,\n  GetEngineNoncesResponse,\n} from './types';\nimport { EngineServerFailureError } from './types/EngineServerFailureError';\n\nexport interface EngineClientOpts {\n  // Server URL\n  url: string;\n  // Wallet client for EIP712 signing\n  walletClient?: WalletClientWithAccount;\n  // Linked signer registered through the engine, if provided, execute requests will use this signer\n  linkedSignerWalletClient?: WalletClientWithAccount;\n}\n\n// Only 1 key can be defined per execute request\ntype EngineExecuteRequestBody = Partial<EngineServerExecuteRequestByType>;\n\ntype EngineQueryRequestResponse<\n  T extends EngineServerQueryRequestType = EngineServerQueryRequestType,\n> = EngineServerQueryResponse<T>;\n\n/**\n * Base client for all engine requests\n */\nexport class EngineBaseClient {\n  readonly opts: EngineClientOpts;\n  readonly axiosInstance: AxiosInstance;\n\n  constructor(opts: EngineClientOpts) {\n    this.opts = opts;\n    this.axiosInstance = axios.create({\n      withCredentials: true,\n    });\n  }\n\n  /**\n   * Sets the linked signer for execute requests\n   *\n   * @param linkedSignerWalletClient The linkedSigner to use for all signatures. Set to null to revert to the chain signer\n   */\n  public setLinkedSigner(\n    linkedSignerWalletClient: WalletClientWithAccount | null,\n  ) {\n    this.opts.linkedSignerWalletClient = linkedSignerWalletClient ?? undefined;\n  }\n\n  public async getTxNonce(address?: string): Promise<string> {\n    const addr = address ?? this.opts.walletClient?.account.address;\n\n    if (!addr) {\n      throw new WalletNotProvidedError();\n    }\n\n    return (\n      await this.getNonces({\n        address: addr,\n      })\n    ).txNonce;\n  }\n\n  public async getNonces(\n    params: GetEngineNoncesParams,\n  ): Promise<GetEngineNoncesResponse> {\n    const baseResp = await this.query('nonces', params);\n\n    return {\n      orderNonce: baseResp.order_nonce,\n      txNonce: baseResp.tx_nonce,\n    };\n  }\n\n  /**\n   * Queries the engine, all query params are stringified into the query string\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async query<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): Promise<EngineServerQueryResponseByType[TRequestType]> {\n    const request = this.getQueryRequest(requestType, params);\n    const response = await this.axiosInstance.post<EngineQueryRequestResponse>(\n      `${this.opts.url}/query`,\n      request,\n    );\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus throws on failure responses so the cast to the success response is acceptable here\n    const successResponse = response as AxiosResponse<\n      EngineServerQuerySuccessResponse<TRequestType>\n    >;\n\n    return successResponse.data.data;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing a query request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getQueryRequest<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): EngineServerQueryRequest<TRequestType> {\n    return {\n      type: requestType,\n      ...params,\n    };\n  }\n\n  /**\n   * POSTs an execute message to the engine and returns the successful response. Throws the failure response wrapped\n   * in an EngineServerFailureError on failure.\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async execute<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): Promise<EngineServerExecuteSuccessResult<TRequestType>> {\n    const reqBody = this.getExecuteRequest(requestType, params);\n    const response = await this.axiosInstance.post<\n      EngineServerExecuteResult<TRequestType>\n    >(`${this.opts.url}/execute`, reqBody);\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus catches the failure result and throws the error, so the cast to the success response is acceptable here\n    return response.data as EngineServerExecuteSuccessResult<TRequestType>;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing an execute request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getExecuteRequest<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): EngineExecuteRequestBody {\n    return {\n      [requestType]: params,\n    };\n  }\n\n  /**\n   * Signs a given request with the signer provided to the engine\n   *\n   * @param requestType\n   * @param verifyingContract\n   * @param chainId\n   * @param params\n   * @public\n   */\n  public async sign<T extends SignableRequestType>(\n    requestType: T,\n    verifyingContract: string,\n    chainId: number,\n    params: SignableRequestTypeToParams[T],\n  ) {\n    // Use the linked signer if provided, otherwise use the default signer provided to the engine\n    const walletClient =\n      this.opts.linkedSignerWalletClient ?? this.opts.walletClient;\n\n    if (!walletClient) {\n      throw new WalletNotProvidedError();\n    }\n\n    return getSignedTransactionRequest({\n      chainId,\n      requestParams: params,\n      requestType,\n      walletClient,\n      verifyingContract,\n    });\n  }\n\n  private checkResponseStatus(response: AxiosResponse) {\n    if (response.status !== 200 || !response.data) {\n      throw Error(\n        `Unexpected response from server: ${response.status} ${response.statusText}`,\n      );\n    }\n  }\n\n  private checkServerStatus(\n    response: AxiosResponse<\n      EngineServerExecuteResult | EngineQueryRequestResponse\n    >,\n  ) {\n    if (response.data.status !== 'success') {\n      throw new EngineServerFailureError(response.data);\n    }\n  }\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,OAIK;AACP,SAAS,8BAA8B;AACvC,OAAO,WAA6C;AAepD,SAAS,gCAAgC;AAqBlC,IAAM,mBAAN,MAAuB;AAAA,EAI5B,YAAY,MAAwB;AAClC,SAAK,OAAO;AACZ,SAAK,gBAAgB,MAAM,OAAO;AAAA,MAChC,iBAAiB;AAAA,IACnB,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOO,gBACL,0BACA;AACA,SAAK,KAAK,2BAA2B,4BAA4B;AAAA,EACnE;AAAA,EAEA,MAAa,WAAW,SAAmC;AACzD,UAAM,OAAO,WAAW,KAAK,KAAK,cAAc,QAAQ;AAExD,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,uBAAuB;AAAA,IACnC;AAEA,YACE,MAAM,KAAK,UAAU;AAAA,MACnB,SAAS;AAAA,IACX,CAAC,GACD;AAAA,EACJ;AAAA,EAEA,MAAa,UACX,QACkC;AAClC,UAAM,WAAW,MAAM,KAAK,MAAM,UAAU,MAAM;AAElD,WAAO;AAAA,MACL,YAAY,SAAS;AAAA,MACrB,SAAS,SAAS;AAAA,IACpB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAa,MACX,aACA,QACwD;AACxD,UAAM,UAAU,KAAK,gBAAgB,aAAa,MAAM;AACxD,UAAM,WAAW,MAAM,KAAK,cAAc;AAAA,MACxC,GAAG,KAAK,KAAK,GAAG;AAAA,MAChB;AAAA,IACF;AAEA,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,UAAM,kBAAkB;AAIxB,WAAO,gBAAgB,KAAK;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,gBACL,aACA,QACwC;AACxC,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,IACL;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAa,QACX,aACA,QACyD;AACzD,UAAM,UAAU,KAAK,kBAAkB,aAAa,MAAM;AAC1D,UAAM,WAAW,MAAM,KAAK,cAAc,KAExC,GAAG,KAAK,KAAK,GAAG,YAAY,OAAO;AAErC,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,WAAO,SAAS;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,kBACL,aACA,QAC0B;AAC1B,WAAO;AAAA,MACL,CAAC,WAAW,GAAG;AAAA,IACjB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,MAAa,KACX,aACA,mBACA,SACA,QACA;AAEA,UAAM,eACJ,KAAK,KAAK,4BAA4B,KAAK,KAAK;AAElD,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,uBAAuB;AAAA,IACnC;AAEA,WAAO,4BAA4B;AAAA,MACjC;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,UAAyB;AACnD,QAAI,SAAS,WAAW,OAAO,CAAC,SAAS,MAAM;AAC7C,YAAM;AAAA,QACJ,oCAAoC,SAAS,MAAM,IAAI,SAAS,UAAU;AAAA,MAC5E;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,kBACN,UAGA;AACA,QAAI,SAAS,KAAK,WAAW,WAAW;AACtC,YAAM,IAAI,yBAAyB,SAAS,IAAI;AAAA,IAClD;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../src/EngineBaseClient.ts"],"sourcesContent":["import {\n  getSignedTransactionRequest,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n  WalletClientWithAccount,\n  WalletNotProvidedError,\n} from '@nadohq/shared';\nimport axios, { AxiosInstance, AxiosResponse } from 'axios';\nimport {\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteRequestType,\n  EngineServerExecuteResult,\n  EngineServerExecuteSuccessResult,\n  EngineServerQueryRequest,\n  EngineServerQueryRequestByType,\n  EngineServerQueryRequestType,\n  EngineServerQueryResponse,\n  EngineServerQueryResponseByType,\n  EngineServerQuerySuccessResponse,\n  GetEngineNoncesParams,\n  GetEngineNoncesResponse,\n} from './types';\nimport { EngineServerFailureError } from './types/EngineServerFailureError';\n\nexport interface EngineClientOpts {\n  // Server URL\n  url: string;\n  // Wallet client for EIP712 signing\n  walletClient?: WalletClientWithAccount;\n  // Linked signer registered through the engine, if provided, execute requests will use this signer\n  linkedSignerWalletClient?: WalletClientWithAccount;\n}\n\n// Only 1 key can be defined per execute request\ntype EngineExecuteRequestBody = Partial<EngineServerExecuteRequestByType>;\n\ntype EngineQueryRequestResponse<\n  T extends EngineServerQueryRequestType = EngineServerQueryRequestType,\n> = EngineServerQueryResponse<T>;\n\n/**\n * Base client for all engine requests\n */\nexport class EngineBaseClient {\n  readonly opts: EngineClientOpts;\n  readonly axiosInstance: AxiosInstance;\n\n  constructor(opts: EngineClientOpts) {\n    this.opts = opts;\n    this.axiosInstance = axios.create({\n      withCredentials: true,\n      // We have custom logic to validate response status and create an appropriate error\n      validateStatus: () => true,\n    });\n  }\n\n  /**\n   * Sets the linked signer for execute requests\n   *\n   * @param linkedSignerWalletClient The linkedSigner to use for all signatures. Set to null to revert to the chain signer\n   */\n  public setLinkedSigner(\n    linkedSignerWalletClient: WalletClientWithAccount | null,\n  ) {\n    this.opts.linkedSignerWalletClient = linkedSignerWalletClient ?? undefined;\n  }\n\n  public async getTxNonce(address?: string): Promise<string> {\n    const addr = address ?? this.opts.walletClient?.account.address;\n\n    if (!addr) {\n      throw new WalletNotProvidedError();\n    }\n\n    return (\n      await this.getNonces({\n        address: addr,\n      })\n    ).txNonce;\n  }\n\n  public async getNonces(\n    params: GetEngineNoncesParams,\n  ): Promise<GetEngineNoncesResponse> {\n    const baseResp = await this.query('nonces', params);\n\n    return {\n      orderNonce: baseResp.order_nonce,\n      txNonce: baseResp.tx_nonce,\n    };\n  }\n\n  /**\n   * Queries the engine, all query params are stringified into the query string\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async query<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): Promise<EngineServerQueryResponseByType[TRequestType]> {\n    const request = this.getQueryRequest(requestType, params);\n    const response = await this.axiosInstance.post<EngineQueryRequestResponse>(\n      `${this.opts.url}/query`,\n      request,\n    );\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus throws on failure responses so the cast to the success response is acceptable here\n    const successResponse = response as AxiosResponse<\n      EngineServerQuerySuccessResponse<TRequestType>\n    >;\n\n    return successResponse.data.data;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing a query request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getQueryRequest<TRequestType extends EngineServerQueryRequestType>(\n    requestType: TRequestType,\n    params: EngineServerQueryRequestByType[TRequestType],\n  ): EngineServerQueryRequest<TRequestType> {\n    return {\n      type: requestType,\n      ...params,\n    };\n  }\n\n  /**\n   * POSTs an execute message to the engine and returns the successful response. Throws the failure response wrapped\n   * in an EngineServerFailureError on failure.\n   *\n   * @param requestType\n   * @param params\n   * @public\n   */\n  public async execute<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): Promise<EngineServerExecuteSuccessResult<TRequestType>> {\n    const reqBody = this.getExecuteRequest(requestType, params);\n    const response = await this.axiosInstance.post<\n      EngineServerExecuteResult<TRequestType>\n    >(`${this.opts.url}/execute`, reqBody);\n\n    this.checkResponseStatus(response);\n    this.checkServerStatus(response);\n\n    // checkServerStatus catches the failure result and throws the error, so the cast to the success response is acceptable here\n    return response.data as EngineServerExecuteSuccessResult<TRequestType>;\n  }\n\n  /**\n   * A simple, typechecked fn for constructing an execute request in the format expected by the server.\n   *\n   * @param requestType\n   * @param params\n   */\n  public getExecuteRequest<TRequestType extends EngineServerExecuteRequestType>(\n    requestType: TRequestType,\n    params: EngineServerExecuteRequestByType[TRequestType],\n  ): EngineExecuteRequestBody {\n    return {\n      [requestType]: params,\n    };\n  }\n\n  /**\n   * Signs a given request with the signer provided to the engine\n   *\n   * @param requestType\n   * @param verifyingContract\n   * @param chainId\n   * @param params\n   * @public\n   */\n  public async sign<T extends SignableRequestType>(\n    requestType: T,\n    verifyingContract: string,\n    chainId: number,\n    params: SignableRequestTypeToParams[T],\n  ) {\n    // Use the linked signer if provided, otherwise use the default signer provided to the engine\n    const walletClient =\n      this.opts.linkedSignerWalletClient ?? this.opts.walletClient;\n\n    if (!walletClient) {\n      throw new WalletNotProvidedError();\n    }\n\n    return getSignedTransactionRequest({\n      chainId,\n      requestParams: params,\n      requestType,\n      walletClient,\n      verifyingContract,\n    });\n  }\n\n  private checkResponseStatus(response: AxiosResponse) {\n    if (response.status !== 200 || !response.data) {\n      throw Error(\n        `Unexpected response from server: ${response.status} ${response.statusText}. Data: ${response.data}`,\n      );\n    }\n  }\n\n  private checkServerStatus(\n    response: AxiosResponse<\n      EngineServerExecuteResult | EngineQueryRequestResponse\n    >,\n  ) {\n    if (response.data.status !== 'success') {\n      throw new EngineServerFailureError(response.data);\n    }\n  }\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EAIA;AAAA,OACK;AACP,OAAO,WAA6C;AAepD,SAAS,gCAAgC;AAqBlC,IAAM,mBAAN,MAAuB;AAAA,EAI5B,YAAY,MAAwB;AAClC,SAAK,OAAO;AACZ,SAAK,gBAAgB,MAAM,OAAO;AAAA,MAChC,iBAAiB;AAAA;AAAA,MAEjB,gBAAgB,MAAM;AAAA,IACxB,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOO,gBACL,0BACA;AACA,SAAK,KAAK,2BAA2B,4BAA4B;AAAA,EACnE;AAAA,EAEA,MAAa,WAAW,SAAmC;AACzD,UAAM,OAAO,WAAW,KAAK,KAAK,cAAc,QAAQ;AAExD,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,uBAAuB;AAAA,IACnC;AAEA,YACE,MAAM,KAAK,UAAU;AAAA,MACnB,SAAS;AAAA,IACX,CAAC,GACD;AAAA,EACJ;AAAA,EAEA,MAAa,UACX,QACkC;AAClC,UAAM,WAAW,MAAM,KAAK,MAAM,UAAU,MAAM;AAElD,WAAO;AAAA,MACL,YAAY,SAAS;AAAA,MACrB,SAAS,SAAS;AAAA,IACpB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAa,MACX,aACA,QACwD;AACxD,UAAM,UAAU,KAAK,gBAAgB,aAAa,MAAM;AACxD,UAAM,WAAW,MAAM,KAAK,cAAc;AAAA,MACxC,GAAG,KAAK,KAAK,GAAG;AAAA,MAChB;AAAA,IACF;AAEA,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,UAAM,kBAAkB;AAIxB,WAAO,gBAAgB,KAAK;AAAA,EAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,gBACL,aACA,QACwC;AACxC,WAAO;AAAA,MACL,MAAM;AAAA,MACN,GAAG;AAAA,IACL;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAa,QACX,aACA,QACyD;AACzD,UAAM,UAAU,KAAK,kBAAkB,aAAa,MAAM;AAC1D,UAAM,WAAW,MAAM,KAAK,cAAc,KAExC,GAAG,KAAK,KAAK,GAAG,YAAY,OAAO;AAErC,SAAK,oBAAoB,QAAQ;AACjC,SAAK,kBAAkB,QAAQ;AAG/B,WAAO,SAAS;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQO,kBACL,aACA,QAC0B;AAC1B,WAAO;AAAA,MACL,CAAC,WAAW,GAAG;AAAA,IACjB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,MAAa,KACX,aACA,mBACA,SACA,QACA;AAEA,UAAM,eACJ,KAAK,KAAK,4BAA4B,KAAK,KAAK;AAElD,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,uBAAuB;AAAA,IACnC;AAEA,WAAO,4BAA4B;AAAA,MACjC;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,oBAAoB,UAAyB;AACnD,QAAI,SAAS,WAAW,OAAO,CAAC,SAAS,MAAM;AAC7C,YAAM;AAAA,QACJ,oCAAoC,SAAS,MAAM,IAAI,SAAS,UAAU,WAAW,SAAS,IAAI;AAAA,MACpG;AAAA,IACF;AAAA,EACF;AAAA,EAEQ,kBACN,UAGA;AACA,QAAI,SAAS,KAAK,WAAW,WAAW;AACtC,YAAM,IAAI,yBAAyB,SAAS,IAAI;AAAA,IAClD;AAAA,EACF;AACF;","names":[]}

package/dist/EngineClient.d.cts

@@ -3,14 +3,13 @@ import { EngineExecuteClient } from './EngineExecuteClient.cjs';
 import { EngineQueryClient } from './EngineQueryClient.cjs';
 import { EngineWebClient } from './EngineWebClient.cjs';
 import './types/clientExecuteTypes.cjs';
-import '@nadohq/contracts';
+import '@nadohq/shared';
 import './types/serverExecuteTypes.cjs';
 import './types/serverQueryTypes.cjs';
 import './types/serverQueryModelTypes.cjs';
 import './EngineBaseClient.cjs';
 import 'axios';
 import './types/clientQueryTypes.cjs';
-import '@nadohq/utils';
 import './EngineExecuteBuilder.cjs';
 
 declare const EngineClient_base: ts_mixer_dist_types_types.Class<any[], EngineQueryClient & EngineExecuteClient & EngineWebClient, typeof EngineQueryClient & typeof EngineExecuteClient & typeof EngineWebClient>;

package/dist/EngineClient.d.ts

@@ -3,14 +3,13 @@ import { EngineExecuteClient } from './EngineExecuteClient.js';
 import { EngineQueryClient } from './EngineQueryClient.js';
 import { EngineWebClient } from './EngineWebClient.js';
 import './types/clientExecuteTypes.js';
-import '@nadohq/contracts';
+import '@nadohq/shared';
 import './types/serverExecuteTypes.js';
 import './types/serverQueryTypes.js';
 import './types/serverQueryModelTypes.js';
 import './EngineBaseClient.js';
 import 'axios';
 import './types/clientQueryTypes.js';
-import '@nadohq/utils';
 import './EngineExecuteBuilder.js';
 
 declare const EngineClient_base: ts_mixer_dist_types_types.Class<any[], EngineQueryClient & EngineExecuteClient & EngineWebClient, typeof EngineQueryClient & typeof EngineExecuteClient & typeof EngineWebClient>;

package/dist/EngineExecuteBuilder.cjs

@@ -23,7 +23,7 @@ __export(EngineExecuteBuilder_exports, {
   EngineExecuteBuilder: () => EngineExecuteBuilder
 });
 module.exports = __toCommonJS(EngineExecuteBuilder_exports);
-var import_contracts = require("@nadohq/contracts");
+var import_shared = require("@nadohq/shared");
 var EngineExecuteBuilder = class {
   constructor(engineClient) {
     this.engineClient = engineClient;
@@ -36,7 +36,7 @@ var EngineExecuteBuilder = class {
   async buildLiquidateSubaccountPayload(clientParams) {
     const nonce = await this.getTxNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("liquidate_subaccount", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("liquidate_subaccount", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "liquidate_subaccount",
       paramsWithNonce
@@ -58,7 +58,7 @@ var EngineExecuteBuilder = class {
       "withdraw_collateral",
       paramsWithNonce
     );
-    const tx = (0, import_contracts.getNadoEIP712Values)("withdraw_collateral", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("withdraw_collateral", paramsWithNonce);
     return {
       signature,
       tx,
@@ -75,7 +75,7 @@ var EngineExecuteBuilder = class {
     const nonce = this.getOrderNonceIfNeeded(clientParams);
     const orderWithNonce = { ...clientParams.order, nonce };
     const signature = await this.getSignatureIfNeeded("place_order", {
-      // Gets expected type
+      // Gets expected type (signature params from `clientParams` and order params from `orderWithNonce`)
       ...clientParams,
       ...orderWithNonce
     });
@@ -92,7 +92,7 @@ var EngineExecuteBuilder = class {
    * @returns `place_order` payload
    */
   buildPlaceOrderPayloadSync(clientParams) {
-    const orderEIP712Values = (0, import_contracts.getNadoEIP712Values)(
+    const orderEIP712Values = (0, import_shared.getNadoEIP712Values)(
       "place_order",
       clientParams.order
     );
@@ -102,51 +102,26 @@ var EngineExecuteBuilder = class {
         product_id: clientParams.productId,
         order: orderEIP712Values,
         signature: clientParams.signature,
-        spot_leverage: clientParams.spotLeverage ?? null
+        spot_leverage: clientParams.spotLeverage ?? null,
+        borrow_margin: clientParams.borrowMargin ?? null
       },
       orderParams: clientParams.order
     };
   }
   /**
-   * Builds server payload for the `place_isolated_order` execute action.
-   *
-   * @param clientParams Client PlaceIsolatedOrder params.
-   * @returns `place_isolated_order` payload
-   */
-  async buildIsolatedPlaceOrderPayload(clientParams) {
-    const nonce = this.getOrderNonceIfNeeded(clientParams);
-    const orderWithNonce = { ...clientParams.order, nonce };
-    const signature = await this.getSignatureIfNeeded("place_isolated_order", {
-      // Gets expected type
-      ...clientParams,
-      ...orderWithNonce
-    });
-    return this.buildPlaceIsolatedOrderPayloadSync({
-      ...clientParams,
-      order: orderWithNonce,
-      signature
-    });
-  }
-  /**
-   * Synchronously builds server payload for the `place_isolated_order` execute action.
-   *
-   * @param clientParams Client PlaceIsolatedOrder params.
-   * @returns `place_isolated_order` payload
+   * Builds server payload for the `place_orders` execute action.
+   * @param clientParams Client PlaceOrders params.
+   * @returns `place_orders` payload
    */
-  buildPlaceIsolatedOrderPayloadSync(clientParams) {
-    const isolatedOrderEIP712Values = (0, import_contracts.getNadoEIP712Values)(
-      "place_isolated_order",
-      clientParams.order
-    );
+  async buildPlaceOrdersPayload(clientParams) {
     return {
-      payload: {
-        id: clientParams.id ?? null,
-        product_id: clientParams.productId,
-        isolated_order: isolatedOrderEIP712Values,
-        signature: clientParams.signature,
-        borrow_margin: clientParams.borrowMargin ?? null
-      },
-      orderParams: clientParams.order
+      orders: await Promise.all(
+        clientParams.orders.map(async (orderParams) => {
+          const payload = await this.buildPlaceOrderPayload(orderParams);
+          return payload.payload;
+        })
+      ),
+      cancel_on_failure: clientParams.cancelOnFailure ?? null
     };
   }
   /**
@@ -174,7 +149,7 @@ var EngineExecuteBuilder = class {
    * @returns `cancel_orders` payload
    */
   buildCancelOrdersPayloadSync(clientParams) {
-    const tx = (0, import_contracts.getNadoEIP712Values)("cancel_orders", clientParams);
+    const tx = (0, import_shared.getNadoEIP712Values)("cancel_orders", clientParams);
     return {
       tx,
       signature: clientParams.signature
@@ -188,7 +163,7 @@ var EngineExecuteBuilder = class {
   async buildCancelProductOrdersPayload(clientParams) {
     const nonce = this.getOrderNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("cancel_product_orders", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("cancel_product_orders", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "cancel_product_orders",
       paramsWithNonce
@@ -207,7 +182,7 @@ var EngineExecuteBuilder = class {
   async buildLinkSignerPayload(clientParams) {
     const nonce = await this.getTxNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("link_signer", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("link_signer", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "link_signer",
       paramsWithNonce
@@ -226,7 +201,7 @@ var EngineExecuteBuilder = class {
   async buildTransferQuotePayload(clientParams) {
     const nonce = await this.getTxNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("transfer_quote", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("transfer_quote", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "transfer_quote",
       paramsWithNonce
@@ -244,7 +219,7 @@ var EngineExecuteBuilder = class {
   async buildMintNlpPayload(clientParams) {
     const nonce = await this.getTxNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("mint_nlp", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("mint_nlp", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "mint_nlp",
       paramsWithNonce
@@ -263,7 +238,7 @@ var EngineExecuteBuilder = class {
   async buildBurnNlpPayload(clientParams) {
     const nonce = await this.getTxNonceIfNeeded(clientParams);
     const paramsWithNonce = { ...clientParams, nonce };
-    const tx = (0, import_contracts.getNadoEIP712Values)("burn_nlp", paramsWithNonce);
+    const tx = (0, import_shared.getNadoEIP712Values)("burn_nlp", paramsWithNonce);
     const signature = await this.getSignatureIfNeeded(
       "burn_nlp",
       paramsWithNonce
@@ -294,7 +269,7 @@ var EngineExecuteBuilder = class {
     if (params.nonce) {
       return params.nonce;
     }
-    return (0, import_contracts.getOrderNonce)();
+    return (0, import_shared.getOrderNonce)();
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/EngineExecuteBuilder.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/EngineExecuteBuilder.ts"],"sourcesContent":["import {\n  EIP712IsolatedOrderParams,\n  EIP712OrderParams,\n  getNadoEIP712Values,\n  getOrderNonce,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n} from '@nadohq/contracts';\nimport { EngineBaseClient } from './EngineBaseClient';\nimport {\n  EngineExecuteRequestParamsByType,\n  EngineServerExecutePlaceIsolatedOrderPayload,\n  EngineServerExecutePlaceOrderPayload,\n  EngineServerExecuteRequestByType,\n  SignatureParams,\n  WithBaseEngineExecuteParams,\n  WithSignature,\n} from './types';\n\n/**\n * Builds execute payloads as expected by the server.\n * @param nonce A nonce is computed when one is not provided.\n * @param signature A signature is computed when one is not provided.\n */\nexport class EngineExecuteBuilder {\n  readonly engineClient: EngineBaseClient;\n\n  constructor(engineClient: EngineBaseClient) {\n    this.engineClient = engineClient;\n  }\n\n  /**\n   * Builds server payload for the `liquidate_subaccount` execute action.\n   * @param clientParams Client LiquidateSubaccount params.\n   * @returns `liquidate_subaccount` payload\n   */\n  async buildLiquidateSubaccountPayload(\n    clientParams: EngineExecuteRequestParamsByType['liquidate_subaccount'],\n  ): Promise<EngineServerExecuteRequestByType['liquidate_subaccount']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('liquidate_subaccount', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'liquidate_subaccount',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n    };\n  }\n\n  /**\n   * Builds server payload for the `withdraw_collateral` execute action.\n   * @param clientParams Client WithdrawCollateral params.\n   * @returns `liquidate_subaccount` payload\n   */\n  async buildWithdrawCollateralPayload(\n    clientParams: EngineExecuteRequestParamsByType['withdraw_collateral'],\n  ): Promise<EngineServerExecuteRequestByType['withdraw_collateral']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const signature = await this.getSignatureIfNeeded(\n      'withdraw_collateral',\n      paramsWithNonce,\n    );\n\n    const tx = getNadoEIP712Values('withdraw_collateral', paramsWithNonce);\n    return {\n      signature,\n      tx,\n      spot_leverage: clientParams.spotLeverage ?? null,\n    };\n  }\n\n  /**\n   * Builds server payload for the `place_order` execute action.\n   *\n   * @param clientParams Client PlaceOrder params.\n   * @returns `place_order` payload\n   */\n  async buildPlaceOrderPayload(\n    clientParams: EngineExecuteRequestParamsByType['place_order'],\n  ): Promise<EngineServerExecutePlaceOrderPayload> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const orderWithNonce = { ...clientParams.order, nonce };\n\n    const signature = await this.getSignatureIfNeeded('place_order', {\n      // Gets expected type\n      ...clientParams,\n      ...orderWithNonce,\n    });\n\n    return this.buildPlaceOrderPayloadSync({\n      ...clientParams,\n      order: orderWithNonce,\n      signature,\n    });\n  }\n\n  /**\n   * Synchronously builds server payload for the `place_order` execute action.\n   *\n   * @param clientParams Client PlaceOrder params.\n   * @returns `place_order` payload\n   */\n  buildPlaceOrderPayloadSync(\n    clientParams: WithSignature<\n      EngineExecuteRequestParamsByType['place_order'] & {\n        order: EIP712OrderParams;\n      }\n    >,\n  ): EngineServerExecutePlaceOrderPayload {\n    const orderEIP712Values = getNadoEIP712Values(\n      'place_order',\n      clientParams.order,\n    );\n\n    return {\n      payload: {\n        id: clientParams.id ?? null,\n        product_id: clientParams.productId,\n        order: orderEIP712Values,\n        signature: clientParams.signature,\n        spot_leverage: clientParams.spotLeverage ?? null,\n      },\n      orderParams: clientParams.order,\n    };\n  }\n\n  /**\n   * Builds server payload for the `place_isolated_order` execute action.\n   *\n   * @param clientParams Client PlaceIsolatedOrder params.\n   * @returns `place_isolated_order` payload\n   */\n  async buildIsolatedPlaceOrderPayload(\n    clientParams: EngineExecuteRequestParamsByType['place_isolated_order'],\n  ): Promise<EngineServerExecutePlaceIsolatedOrderPayload> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const orderWithNonce = { ...clientParams.order, nonce };\n\n    const signature = await this.getSignatureIfNeeded('place_isolated_order', {\n      // Gets expected type\n      ...clientParams,\n      ...orderWithNonce,\n    });\n\n    return this.buildPlaceIsolatedOrderPayloadSync({\n      ...clientParams,\n      order: orderWithNonce,\n      signature,\n    });\n  }\n\n  /**\n   * Synchronously builds server payload for the `place_isolated_order` execute action.\n   *\n   * @param clientParams Client PlaceIsolatedOrder params.\n   * @returns `place_isolated_order` payload\n   */\n  buildPlaceIsolatedOrderPayloadSync(\n    clientParams: WithSignature<\n      EngineExecuteRequestParamsByType['place_isolated_order'] & {\n        order: EIP712IsolatedOrderParams;\n      }\n    >,\n  ): EngineServerExecutePlaceIsolatedOrderPayload {\n    const isolatedOrderEIP712Values = getNadoEIP712Values(\n      'place_isolated_order',\n      clientParams.order,\n    );\n\n    return {\n      payload: {\n        id: clientParams.id ?? null,\n        product_id: clientParams.productId,\n        isolated_order: isolatedOrderEIP712Values,\n        signature: clientParams.signature,\n        borrow_margin: clientParams.borrowMargin ?? null,\n      },\n      orderParams: clientParams.order,\n    };\n  }\n\n  /**\n   * Builds server payload for the `cancel_orders` execute action. As such, requires a signature to be given\n   *\n   * @param clientParams Client CancelOrders params.\n   * @returns `cancel_orders` payload\n   */\n  async buildCancelOrdersPayload(\n    clientParams: EngineExecuteRequestParamsByType['cancel_orders'],\n  ): Promise<EngineServerExecuteRequestByType['cancel_orders']> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n    const signature = await this.getSignatureIfNeeded(\n      'cancel_orders',\n      paramsWithNonce,\n    );\n\n    return this.buildCancelOrdersPayloadSync({\n      ...paramsWithNonce,\n      signature,\n    });\n  }\n\n  /**\n   * Synchronously builds server payload for the `cancel_orders` execute action.\n   *\n   * @param clientParams Client CancelOrders params.\n   * @returns `cancel_orders` payload\n   */\n  buildCancelOrdersPayloadSync(\n    clientParams: WithSignature<\n      EngineExecuteRequestParamsByType['cancel_orders'] & { nonce: string }\n    >,\n  ): EngineServerExecuteRequestByType['cancel_orders'] {\n    const tx = getNadoEIP712Values('cancel_orders', clientParams);\n\n    return {\n      tx,\n      signature: clientParams.signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `cancel_product_orders` execute action.\n   * @param clientParams Client CancelProductOrders params.\n   * @returns `cancel_product_orders` payload\n   */\n  async buildCancelProductOrdersPayload(\n    clientParams: EngineExecuteRequestParamsByType['cancel_product_orders'],\n  ): Promise<EngineServerExecuteRequestByType['cancel_product_orders']> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('cancel_product_orders', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'cancel_product_orders',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `link_signer` execute action.\n   *\n   * @param clientParams Client LinkSigner params.\n   * @returns `link_signer` payload\n   */\n  async buildLinkSignerPayload(\n    clientParams: EngineExecuteRequestParamsByType['link_signer'],\n  ): Promise<EngineServerExecuteRequestByType['link_signer']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('link_signer', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'link_signer',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `transfer_quote` execute action.\n   *\n   * @param clientParams Client TransferQuote params.\n   * @returns `transfer_quote` payload\n   */\n  async buildTransferQuotePayload(\n    clientParams: EngineExecuteRequestParamsByType['transfer_quote'],\n  ): Promise<EngineServerExecuteRequestByType['transfer_quote']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('transfer_quote', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'transfer_quote',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `mint_nlp` execute action.\n   * @param clientParams Client MintNlp params.\n   * @returns `mint_nlp` payload\n   */\n  async buildMintNlpPayload(\n    clientParams: EngineExecuteRequestParamsByType['mint_nlp'],\n  ): Promise<EngineServerExecuteRequestByType['mint_nlp']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('mint_nlp', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'mint_nlp',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n      spot_leverage: clientParams.spotLeverage ?? null,\n    };\n  }\n\n  /**\n   * Builds server payload for the `burn_nlp` execute action.\n   * @param clientParams Client BurnNlp params.\n   * @returns `burn_nlp` payload\n   */\n  async buildBurnNlpPayload(\n    clientParams: EngineExecuteRequestParamsByType['burn_nlp'],\n  ): Promise<EngineServerExecuteRequestByType['burn_nlp']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('burn_nlp', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'burn_nlp',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n    };\n  }\n\n  protected async getSignatureIfNeeded<T extends SignableRequestType>(\n    requestType: T,\n    paramsWithNonce: SignatureParams & SignableRequestTypeToParams[T],\n  ) {\n    if ('signature' in paramsWithNonce) {\n      return paramsWithNonce.signature;\n    }\n\n    return await this.engineClient.sign(\n      requestType,\n      paramsWithNonce.verifyingAddr,\n      paramsWithNonce.chainId,\n      paramsWithNonce,\n    );\n  }\n\n  protected async getTxNonceIfNeeded(\n    params: WithBaseEngineExecuteParams<{ subaccountOwner: string }>,\n  ) {\n    if (params.nonce) {\n      return params.nonce;\n    }\n    return await this.engineClient.getTxNonce(params.subaccountOwner);\n  }\n\n  protected getOrderNonceIfNeeded(\n    params: WithBaseEngineExecuteParams<unknown>,\n  ) {\n    if (params.nonce) {\n      return params.nonce;\n    }\n    return getOrderNonce();\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/EngineExecuteBuilder.ts"],"sourcesContent":["import {\n  EIP712OrderParams,\n  getNadoEIP712Values,\n  getOrderNonce,\n  SignableRequestType,\n  SignableRequestTypeToParams,\n} from '@nadohq/shared';\nimport { EngineBaseClient } from './EngineBaseClient';\nimport {\n  EngineExecuteRequestParamsByType,\n  EngineServerExecutePlaceOrderPayload,\n  EngineServerExecuteRequestByType,\n  SignatureParams,\n  WithBaseEngineExecuteParams,\n  WithSignature,\n} from './types';\n\n/**\n * Builds execute payloads as expected by the server.\n * @param nonce A nonce is computed when one is not provided.\n * @param signature A signature is computed when one is not provided.\n */\nexport class EngineExecuteBuilder {\n  readonly engineClient: EngineBaseClient;\n\n  constructor(engineClient: EngineBaseClient) {\n    this.engineClient = engineClient;\n  }\n\n  /**\n   * Builds server payload for the `liquidate_subaccount` execute action.\n   * @param clientParams Client LiquidateSubaccount params.\n   * @returns `liquidate_subaccount` payload\n   */\n  async buildLiquidateSubaccountPayload(\n    clientParams: EngineExecuteRequestParamsByType['liquidate_subaccount'],\n  ): Promise<EngineServerExecuteRequestByType['liquidate_subaccount']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('liquidate_subaccount', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'liquidate_subaccount',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n    };\n  }\n\n  /**\n   * Builds server payload for the `withdraw_collateral` execute action.\n   * @param clientParams Client WithdrawCollateral params.\n   * @returns `liquidate_subaccount` payload\n   */\n  async buildWithdrawCollateralPayload(\n    clientParams: EngineExecuteRequestParamsByType['withdraw_collateral'],\n  ): Promise<EngineServerExecuteRequestByType['withdraw_collateral']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const signature = await this.getSignatureIfNeeded(\n      'withdraw_collateral',\n      paramsWithNonce,\n    );\n\n    const tx = getNadoEIP712Values('withdraw_collateral', paramsWithNonce);\n    return {\n      signature,\n      tx,\n      spot_leverage: clientParams.spotLeverage ?? null,\n    };\n  }\n\n  /**\n   * Builds server payload for the `place_order` execute action.\n   *\n   * @param clientParams Client PlaceOrder params.\n   * @returns `place_order` payload\n   */\n  async buildPlaceOrderPayload(\n    clientParams: EngineExecuteRequestParamsByType['place_order'],\n  ): Promise<EngineServerExecutePlaceOrderPayload> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const orderWithNonce = { ...clientParams.order, nonce };\n\n    const signature = await this.getSignatureIfNeeded('place_order', {\n      // Gets expected type (signature params from `clientParams` and order params from `orderWithNonce`)\n      ...clientParams,\n      ...orderWithNonce,\n    });\n\n    return this.buildPlaceOrderPayloadSync({\n      ...clientParams,\n      order: orderWithNonce,\n      signature,\n    });\n  }\n\n  /**\n   * Synchronously builds server payload for the `place_order` execute action.\n   *\n   * @param clientParams Client PlaceOrder params.\n   * @returns `place_order` payload\n   */\n  buildPlaceOrderPayloadSync(\n    clientParams: WithSignature<\n      EngineExecuteRequestParamsByType['place_order'] & {\n        order: EIP712OrderParams;\n      }\n    >,\n  ): EngineServerExecutePlaceOrderPayload {\n    const orderEIP712Values = getNadoEIP712Values(\n      'place_order',\n      clientParams.order,\n    );\n\n    return {\n      payload: {\n        id: clientParams.id ?? null,\n        product_id: clientParams.productId,\n        order: orderEIP712Values,\n        signature: clientParams.signature,\n        spot_leverage: clientParams.spotLeverage ?? null,\n        borrow_margin: clientParams.borrowMargin ?? null,\n      },\n      orderParams: clientParams.order,\n    };\n  }\n\n  /**\n   * Builds server payload for the `place_orders` execute action.\n   * @param clientParams Client PlaceOrders params.\n   * @returns `place_orders` payload\n   */\n  async buildPlaceOrdersPayload(\n    clientParams: EngineExecuteRequestParamsByType['place_orders'],\n  ): Promise<EngineServerExecuteRequestByType['place_orders']> {\n    return {\n      orders: await Promise.all(\n        clientParams.orders.map(async (orderParams) => {\n          const payload = await this.buildPlaceOrderPayload(orderParams);\n          return payload.payload;\n        }),\n      ),\n      cancel_on_failure: clientParams.cancelOnFailure ?? null,\n    };\n  }\n\n  /**\n   * Builds server payload for the `cancel_orders` execute action. As such, requires a signature to be given\n   *\n   * @param clientParams Client CancelOrders params.\n   * @returns `cancel_orders` payload\n   */\n  async buildCancelOrdersPayload(\n    clientParams: EngineExecuteRequestParamsByType['cancel_orders'],\n  ): Promise<EngineServerExecuteRequestByType['cancel_orders']> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n    const signature = await this.getSignatureIfNeeded(\n      'cancel_orders',\n      paramsWithNonce,\n    );\n\n    return this.buildCancelOrdersPayloadSync({\n      ...paramsWithNonce,\n      signature,\n    });\n  }\n\n  /**\n   * Synchronously builds server payload for the `cancel_orders` execute action.\n   *\n   * @param clientParams Client CancelOrders params.\n   * @returns `cancel_orders` payload\n   */\n  buildCancelOrdersPayloadSync(\n    clientParams: WithSignature<\n      EngineExecuteRequestParamsByType['cancel_orders'] & { nonce: string }\n    >,\n  ): EngineServerExecuteRequestByType['cancel_orders'] {\n    const tx = getNadoEIP712Values('cancel_orders', clientParams);\n\n    return {\n      tx,\n      signature: clientParams.signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `cancel_product_orders` execute action.\n   * @param clientParams Client CancelProductOrders params.\n   * @returns `cancel_product_orders` payload\n   */\n  async buildCancelProductOrdersPayload(\n    clientParams: EngineExecuteRequestParamsByType['cancel_product_orders'],\n  ): Promise<EngineServerExecuteRequestByType['cancel_product_orders']> {\n    const nonce = this.getOrderNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('cancel_product_orders', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'cancel_product_orders',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `link_signer` execute action.\n   *\n   * @param clientParams Client LinkSigner params.\n   * @returns `link_signer` payload\n   */\n  async buildLinkSignerPayload(\n    clientParams: EngineExecuteRequestParamsByType['link_signer'],\n  ): Promise<EngineServerExecuteRequestByType['link_signer']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('link_signer', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'link_signer',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `transfer_quote` execute action.\n   *\n   * @param clientParams Client TransferQuote params.\n   * @returns `transfer_quote` payload\n   */\n  async buildTransferQuotePayload(\n    clientParams: EngineExecuteRequestParamsByType['transfer_quote'],\n  ): Promise<EngineServerExecuteRequestByType['transfer_quote']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('transfer_quote', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'transfer_quote',\n      paramsWithNonce,\n    );\n\n    return {\n      tx,\n      signature,\n    };\n  }\n\n  /**\n   * Builds server payload for the `mint_nlp` execute action.\n   * @param clientParams Client MintNlp params.\n   * @returns `mint_nlp` payload\n   */\n  async buildMintNlpPayload(\n    clientParams: EngineExecuteRequestParamsByType['mint_nlp'],\n  ): Promise<EngineServerExecuteRequestByType['mint_nlp']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('mint_nlp', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'mint_nlp',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n      spot_leverage: clientParams.spotLeverage ?? null,\n    };\n  }\n\n  /**\n   * Builds server payload for the `burn_nlp` execute action.\n   * @param clientParams Client BurnNlp params.\n   * @returns `burn_nlp` payload\n   */\n  async buildBurnNlpPayload(\n    clientParams: EngineExecuteRequestParamsByType['burn_nlp'],\n  ): Promise<EngineServerExecuteRequestByType['burn_nlp']> {\n    const nonce = await this.getTxNonceIfNeeded(clientParams);\n    const paramsWithNonce = { ...clientParams, nonce };\n\n    const tx = getNadoEIP712Values('burn_nlp', paramsWithNonce);\n    const signature = await this.getSignatureIfNeeded(\n      'burn_nlp',\n      paramsWithNonce,\n    );\n\n    return {\n      signature,\n      tx,\n    };\n  }\n\n  protected async getSignatureIfNeeded<T extends SignableRequestType>(\n    requestType: T,\n    paramsWithNonce: SignatureParams & SignableRequestTypeToParams[T],\n  ) {\n    if ('signature' in paramsWithNonce) {\n      return paramsWithNonce.signature;\n    }\n\n    return await this.engineClient.sign(\n      requestType,\n      paramsWithNonce.verifyingAddr,\n      paramsWithNonce.chainId,\n      paramsWithNonce,\n    );\n  }\n\n  protected async getTxNonceIfNeeded(\n    params: WithBaseEngineExecuteParams<{ subaccountOwner: string }>,\n  ) {\n    if (params.nonce) {\n      return params.nonce;\n    }\n    return await this.engineClient.getTxNonce(params.subaccountOwner);\n  }\n\n  protected getOrderNonceIfNeeded(\n    params: WithBaseEngineExecuteParams<unknown>,\n  ) {\n    if (params.nonce) {\n      return params.nonce;\n    }\n    return getOrderNonce();\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/EngineExecuteBuilder.d.cts

@@ -1,10 +1,9 @@
-import { EIP712OrderParams, EIP712IsolatedOrderParams, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/contracts';
+import { EIP712OrderParams, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/shared';
 import { EngineBaseClient } from './EngineBaseClient.cjs';
 import { EngineExecuteRequestParamsByType, WithSignature, SignatureParams, WithBaseEngineExecuteParams } from './types/clientExecuteTypes.cjs';
-import { EngineServerExecuteRequestByType, EngineServerExecutePlaceOrderPayload, EngineServerExecutePlaceIsolatedOrderPayload } from './types/serverExecuteTypes.cjs';
+import { EngineServerExecuteRequestByType, EngineServerExecutePlaceOrderPayload } from './types/serverExecuteTypes.cjs';
 import 'axios';
 import './types/clientQueryTypes.cjs';
-import '@nadohq/utils';
 import './types/serverQueryTypes.cjs';
 import './types/serverQueryModelTypes.cjs';
 
@@ -45,21 +44,11 @@ declare class EngineExecuteBuilder {
         order: EIP712OrderParams;
     }>): EngineServerExecutePlaceOrderPayload;
     /**
-     * Builds server payload for the `place_isolated_order` execute action.
-     *
-     * @param clientParams Client PlaceIsolatedOrder params.
-     * @returns `place_isolated_order` payload
-     */
-    buildIsolatedPlaceOrderPayload(clientParams: EngineExecuteRequestParamsByType['place_isolated_order']): Promise<EngineServerExecutePlaceIsolatedOrderPayload>;
-    /**
-     * Synchronously builds server payload for the `place_isolated_order` execute action.
-     *
-     * @param clientParams Client PlaceIsolatedOrder params.
-     * @returns `place_isolated_order` payload
+     * Builds server payload for the `place_orders` execute action.
+     * @param clientParams Client PlaceOrders params.
+     * @returns `place_orders` payload
      */
-    buildPlaceIsolatedOrderPayloadSync(clientParams: WithSignature<EngineExecuteRequestParamsByType['place_isolated_order'] & {
-        order: EIP712IsolatedOrderParams;
-    }>): EngineServerExecutePlaceIsolatedOrderPayload;
+    buildPlaceOrdersPayload(clientParams: EngineExecuteRequestParamsByType['place_orders']): Promise<EngineServerExecuteRequestByType['place_orders']>;
     /**
      * Builds server payload for the `cancel_orders` execute action. As such, requires a signature to be given
      *

package/dist/EngineExecuteBuilder.d.ts

@@ -1,10 +1,9 @@
-import { EIP712OrderParams, EIP712IsolatedOrderParams, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/contracts';
+import { EIP712OrderParams, SignableRequestType, SignableRequestTypeToParams } from '@nadohq/shared';
 import { EngineBaseClient } from './EngineBaseClient.js';
 import { EngineExecuteRequestParamsByType, WithSignature, SignatureParams, WithBaseEngineExecuteParams } from './types/clientExecuteTypes.js';
-import { EngineServerExecuteRequestByType, EngineServerExecutePlaceOrderPayload, EngineServerExecutePlaceIsolatedOrderPayload } from './types/serverExecuteTypes.js';
+import { EngineServerExecuteRequestByType, EngineServerExecutePlaceOrderPayload } from './types/serverExecuteTypes.js';
 import 'axios';
 import './types/clientQueryTypes.js';
-import '@nadohq/utils';
 import './types/serverQueryTypes.js';
 import './types/serverQueryModelTypes.js';
 
@@ -45,21 +44,11 @@ declare class EngineExecuteBuilder {
         order: EIP712OrderParams;
     }>): EngineServerExecutePlaceOrderPayload;
     /**
-     * Builds server payload for the `place_isolated_order` execute action.
-     *
-     * @param clientParams Client PlaceIsolatedOrder params.
-     * @returns `place_isolated_order` payload
-     */
-    buildIsolatedPlaceOrderPayload(clientParams: EngineExecuteRequestParamsByType['place_isolated_order']): Promise<EngineServerExecutePlaceIsolatedOrderPayload>;
-    /**
-     * Synchronously builds server payload for the `place_isolated_order` execute action.
-     *
-     * @param clientParams Client PlaceIsolatedOrder params.
-     * @returns `place_isolated_order` payload
+     * Builds server payload for the `place_orders` execute action.
+     * @param clientParams Client PlaceOrders params.
+     * @returns `place_orders` payload
      */
-    buildPlaceIsolatedOrderPayloadSync(clientParams: WithSignature<EngineExecuteRequestParamsByType['place_isolated_order'] & {
-        order: EIP712IsolatedOrderParams;
-    }>): EngineServerExecutePlaceIsolatedOrderPayload;
+    buildPlaceOrdersPayload(clientParams: EngineExecuteRequestParamsByType['place_orders']): Promise<EngineServerExecuteRequestByType['place_orders']>;
     /**
      * Builds server payload for the `cancel_orders` execute action. As such, requires a signature to be given
      *