@nadohq/client 0.1.0-alpha.3 → 0.1.0-alpha.30

package/src/apis/market/MarketQueryAPI.ts

@@ -1,5 +1,5 @@
-import { getAllMarkets, GetAllMarketsResponse } from '@nadohq/contracts';
 import {
+  GetEngineAllMarketsResponse,
   GetEngineMarketLiquidityParams,
   GetEngineMarketPriceParams,
   GetEngineMarketPricesParams,
@@ -24,25 +24,18 @@ import { BaseNadoAPI } from '../base';
 import { GetTriggerOrdersParams } from './types';
 
 export class MarketQueryAPI extends BaseNadoAPI {
-  /**
-   * Retrieves all market states from the on-chain contracts
-   */
-  async getAllMarkets(): Promise<GetAllMarketsResponse> {
-    return getAllMarkets(this.context.contracts);
-  }
-
   /**
    * Retrieves all market states from the offchain engine
    */
-  async getAllEngineMarkets(): Promise<GetAllMarketsResponse> {
+  async getAllMarkets(): Promise<GetEngineAllMarketsResponse> {
     return this.context.engineClient.getAllMarkets();
   }
 
   /**
    * Get all edge engine markets
    */
-  async getEdgeAllEngineMarkets(): Promise<
-    Record<number, GetAllMarketsResponse>
+  async getEdgeAllMarkets(): Promise<
+    Record<number, GetEngineAllMarketsResponse>
   > {
     return this.context.engineClient.getEdgeAllMarkets();
   }

package/src/apis/market/types.ts

@@ -1,9 +1,7 @@
 import {
   EngineCancelOrdersParams,
   EngineCancelProductOrdersParams,
-  EngineIsolatedOrderParams,
   EngineOrderParams,
-  EnginePlaceIsolatedOrderParams,
   EnginePlaceOrderParams,
 } from '@nadohq/engine-client';
 import {
@@ -14,20 +12,21 @@ import {
 } from '@nadohq/trigger-client';
 import { OptionalSignatureParams, OptionalSubaccountOwner } from '../types';
 
-type ClientOrderParams<T> = Omit<OptionalSignatureParams<T>, 'order'> & {
+type ClientOrderParams<T extends { order: EngineOrderParams }> = Omit<
+  OptionalSignatureParams<T>,
+  // Order is overridden to make subaccount owner optional
+  | 'order'
+  // Verifying address can be derived from product ID
+  | 'verifyingAddr'
+> & {
   order: OptionalSubaccountOwner<EngineOrderParams>;
 };
 
 export type PlaceOrderParams = ClientOrderParams<EnginePlaceOrderParams>;
 
-/**
- * Same as PlaceOrderParams but with isolated fields for isolated margin trading
- */
-export type PlaceIsolatedOrderParams = Omit<
-  OptionalSignatureParams<EnginePlaceIsolatedOrderParams>,
-  'order'
-> & {
-  order: OptionalSubaccountOwner<EngineIsolatedOrderParams>;
+export type PlaceOrdersParams = {
+  orders: PlaceOrderParams[];
+  cancelOnFailure?: boolean;
 };
 
 export type CancelOrdersParams = OptionalSignatureParams<
@@ -46,6 +45,11 @@ export interface CancelAndPlaceOrderParams {
 export type PlaceTriggerOrderParams =
   ClientOrderParams<TriggerPlaceOrderParams>;
 
+export interface PlaceTriggerOrdersParams {
+  orders: PlaceTriggerOrderParams[];
+  cancelOnFailure?: boolean;
+}
+
 export type CancelTriggerOrdersParams = OptionalSignatureParams<
   OptionalSubaccountOwner<TriggerCancelOrdersParams>
 >;

package/src/apis/perp/PerpExecuteAPI.ts

@@ -1,8 +1,3 @@
-import { SettlePnlParams } from '@nadohq/contracts';
 import { BaseNadoAPI } from '../base';
 
-export class PerpExecuteAPI extends BaseNadoAPI {
-  settlePnl(_params: SettlePnlParams) {
-    throw Error('Not implemented');
-  }
-}
+export class PerpExecuteAPI extends BaseNadoAPI {}

package/src/apis/spot/BaseSpotAPI.ts

@@ -1,5 +1,8 @@
-import { ContractInstance, ERC20_ABI } from '@nadohq/contracts';
-import { getValidatedAddress } from '@nadohq/utils';
+import {
+  ContractInstance,
+  ERC20_ABI,
+  getValidatedAddress,
+} from '@nadohq/shared';
 import { getContract } from 'viem';
 import { BaseNadoAPI } from '../base';
 import { ProductIdOrTokenAddress } from './types';

package/src/apis/spot/SpotExecuteAPI.ts

@@ -3,14 +3,15 @@ import {
   depositCollateral,
   DepositCollateralParams,
   isWriteableContract,
-  MintMockERC20Params,
   MOCK_ERC20_ABI,
-} from '@nadohq/contracts';
-import { toBigInt, WalletNotProvidedError } from '@nadohq/utils';
+  toBigInt,
+  WalletNotProvidedError,
+} from '@nadohq/shared';
 import { BaseSpotAPI } from './BaseSpotAPI';
 import {
   ApproveAllowanceParams,
   BurnNlpParams,
+  MintMockERC20Params,
   MintNlpParams,
   TransferQuoteParams,
   WithdrawCollateralParams,

package/src/apis/spot/SpotQueryAPI.ts

@@ -2,7 +2,7 @@ import {
   GetEngineMaxMintNlpAmountParams,
   GetEngineMaxWithdrawableParams,
 } from '@nadohq/engine-client';
-import { BigDecimal, getValidatedAddress, toBigDecimal } from '@nadohq/utils';
+import { BigDecimal, getValidatedAddress, toBigDecimal } from '@nadohq/shared';
 import { BaseSpotAPI } from './BaseSpotAPI';
 import { GetTokenAllowanceParams, GetTokenWalletBalanceParams } from './types';
 

package/src/apis/spot/types.ts

@@ -4,7 +4,7 @@ import {
   EngineTransferQuoteParams,
   EngineWithdrawCollateralParams,
 } from '@nadohq/engine-client';
-import { BigDecimalish } from '@nadohq/utils';
+import { BigDecimalish } from '@nadohq/shared';
 import { OptionalSignatureParams, OptionalSubaccountOwner } from '../types';
 
 export type ProductIdOrTokenAddress =
@@ -42,3 +42,8 @@ export type MintNlpParams = OptionalSignatureParams<
 export type BurnNlpParams = OptionalSignatureParams<
   OptionalSubaccountOwner<EngineBurnNlpParams>
 >;
+
+export interface MintMockERC20Params {
+  productId: number;
+  amount: BigDecimalish;
+}

package/src/apis/subaccount/SubaccountQueryAPI.ts

@@ -1,7 +1,3 @@
-import {
-  getSubaccountSummary,
-  GetSubaccountSummaryParams,
-} from '@nadohq/contracts';
 import {
   GetEngineEstimatedSubaccountSummaryParams,
   GetEngineIsolatedPositionsParams,
@@ -15,20 +11,11 @@ import {
 import { BaseNadoAPI } from '../base';
 
 export class SubaccountQueryAPI extends BaseNadoAPI {
-  /**
-   * Returns a comprehensive summary for a subaaccount, including its balances and health
-   *
-   * @see {@link getSubaccountSummary:CONTRACTS | getSubaccountSummary}
-   */
-  async getSubaccountSummary(params: GetSubaccountSummaryParams) {
-    return getSubaccountSummary(this.paramsWithContracts(params));
-  }
-
   /**
    * Gets the subaccount state according to the offchain engine
    * @param params
    */
-  async getEngineSubaccountSummary(params: GetEngineSubaccountSummaryParams) {
+  async getSubaccountSummary(params: GetEngineSubaccountSummaryParams) {
     return this.context.engineClient.getSubaccountSummary(params);
   }
 

package/src/apis/subaccount/index.ts

@@ -1,5 +1,7 @@
-import { createDeterministicLinkedSignerPrivateKey } from '@nadohq/contracts';
-import { WalletNotProvidedError } from '@nadohq/utils';
+import {
+  createDeterministicLinkedSignerPrivateKey,
+  WalletNotProvidedError,
+} from '@nadohq/shared';
 import { Mixin } from 'ts-mixer';
 import { privateKeyToAccount } from 'viem/accounts';
 import { SubaccountExecuteAPI } from './SubaccountExecuteAPI';

package/src/apis/subaccount/types.ts

@@ -1,8 +1,8 @@
-import { AccountWithPrivateKey } from '@nadohq/contracts';
 import {
   EngineLinkSignerParams,
   EngineLiquidateSubaccountParams,
 } from '@nadohq/engine-client';
+import { AccountWithPrivateKey } from '@nadohq/shared';
 import { OptionalSignatureParams, OptionalSubaccountOwner } from '../types';
 
 export type LinkSignerParams = OptionalSignatureParams<

package/src/apis/ws/WebSocketExecuteAPI.ts

@@ -1,8 +1,8 @@
-import { EIP712OrderParams } from '@nadohq/contracts';
 import {
   EngineExecuteRequestParamsByType,
   WithSignature,
 } from '@nadohq/engine-client';
+import { EIP712OrderParams } from '@nadohq/shared';
 import { BaseNadoAPI } from '../base';
 
 /**

package/src/client.ts

@@ -1,4 +1,4 @@
-import { WalletClientWithAccount } from '@nadohq/contracts';
+import { WalletClientWithAccount } from '@nadohq/shared';
 import { MarketAPI } from './apis/market';
 import { PerpAPI } from './apis/perp';
 import { SpotAPI } from './apis/spot';

package/src/context.ts

@@ -1,3 +1,8 @@
+import { ENGINE_CLIENT_ENDPOINTS, EngineClient } from '@nadohq/engine-client';
+import {
+  INDEXER_CLIENT_ENDPOINTS,
+  IndexerClient,
+} from '@nadohq/indexer-client';
 import {
   ChainEnv,
   NADO_ABIS,
@@ -6,12 +11,7 @@ import {
   NadoContracts,
   NadoDeploymentAddresses,
   WalletClientWithAccount,
-} from '@nadohq/contracts';
-import { ENGINE_CLIENT_ENDPOINTS, EngineClient } from '@nadohq/engine-client';
-import {
-  INDEXER_CLIENT_ENDPOINTS,
-  IndexerClient,
-} from '@nadohq/indexer-client';
+} from '@nadohq/shared';
 import {
   TRIGGER_CLIENT_ENDPOINTS,
   TriggerClient,

package/src/index.ts

@@ -1,6 +1,6 @@
-export * from './createNadoClient';
 export * from './client';
 export * from './context';
+export * from './createNadoClient';
 
 export * from './apis/market';
 export * from './apis/perp';
@@ -8,8 +8,7 @@ export * from './apis/spot';
 export * from './apis/subaccount';
 
 // Subpackage exports
-export * from '@nadohq/utils';
-export * from '@nadohq/contracts';
 export * from '@nadohq/engine-client';
 export * from '@nadohq/indexer-client';
+export * from '@nadohq/shared';
 export * from '@nadohq/trigger-client';