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

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import { WalletClientWithAccount, NadoContracts, NadoDeploymentAddresses, ChainEnv } from '@nadohq/contracts';
+import { WalletClientWithAccount, NadoContracts, NadoDeploymentAddresses, ChainEnv } from '@nadohq/shared';
 import { EngineClient } from '@nadohq/engine-client';
 import { IndexerClient } from '@nadohq/indexer-client';
 import { TriggerClient } from '@nadohq/trigger-client';

package/dist/context.js

@@ -2,7 +2,7 @@
 import {
   NADO_ABIS,
   NADO_DEPLOYMENTS
-} from "@nadohq/contracts";
+} from "@nadohq/shared";
 import { ENGINE_CLIENT_ENDPOINTS, EngineClient } from "@nadohq/engine-client";
 import {
   INDEXER_CLIENT_ENDPOINTS,

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/context.ts"],"sourcesContent":["import {\n  ChainEnv,\n  NADO_ABIS,\n  NADO_DEPLOYMENTS,\n  NadoContractName,\n  NadoContracts,\n  NadoDeploymentAddresses,\n  WalletClientWithAccount,\n} from '@nadohq/contracts';\nimport { ENGINE_CLIENT_ENDPOINTS, EngineClient } from '@nadohq/engine-client';\nimport {\n  INDEXER_CLIENT_ENDPOINTS,\n  IndexerClient,\n} from '@nadohq/indexer-client';\nimport {\n  TRIGGER_CLIENT_ENDPOINTS,\n  TriggerClient,\n} from '@nadohq/trigger-client';\nimport { getContract, PublicClient } from 'viem';\n\n/**\n * Context required to use the Nado client.\n */\nexport interface NadoClientContext {\n  publicClient: PublicClient;\n  walletClient?: WalletClientWithAccount;\n  // If provided, this is used to sign engine transactions instead of the account associated with walletClient\n  linkedSignerWalletClient?: WalletClientWithAccount;\n  contracts: NadoContracts;\n  contractAddresses: NadoDeploymentAddresses;\n  engineClient: EngineClient;\n  indexerClient: IndexerClient;\n  triggerClient: TriggerClient;\n}\n\n/**\n * Args for creating a context\n */\ninterface NadoClientContextOpts {\n  contractAddresses: NadoDeploymentAddresses;\n  engineEndpoint: string;\n  indexerEndpoint: string;\n  triggerEndpoint: string;\n}\n\n/**\n * Args for signing configuration for creating a context\n */\nexport type CreateNadoClientContextAccountOpts = Pick<\n  NadoClientContext,\n  'walletClient' | 'linkedSignerWalletClient' | 'publicClient'\n>;\n\nexport type CreateNadoClientContextOpts = NadoClientContextOpts | ChainEnv;\n\n/**\n * Utility function to create client context from options\n *\n * @param opts\n * @param accountOpts\n */\nexport function createClientContext(\n  opts: CreateNadoClientContextOpts,\n  accountOpts: CreateNadoClientContextAccountOpts,\n): NadoClientContext {\n  const {\n    contractAddresses,\n    engineEndpoint,\n    indexerEndpoint,\n    triggerEndpoint,\n  } = ((): NadoClientContextOpts => {\n    // Custom options\n    if (typeof opts === 'object') {\n      return opts;\n    }\n\n    const chainEnv = opts;\n    return {\n      contractAddresses: NADO_DEPLOYMENTS[chainEnv],\n      engineEndpoint: ENGINE_CLIENT_ENDPOINTS[chainEnv],\n      indexerEndpoint: INDEXER_CLIENT_ENDPOINTS[chainEnv],\n      triggerEndpoint: TRIGGER_CLIENT_ENDPOINTS[chainEnv],\n    };\n  })();\n  const { publicClient, walletClient, linkedSignerWalletClient } = accountOpts;\n\n  return {\n    walletClient,\n    linkedSignerWalletClient,\n    publicClient,\n    contracts: {\n      querier: getNadoContract({\n        contractAddresses,\n        contractName: 'querier',\n        walletClient,\n        publicClient,\n      }),\n      clearinghouse: getNadoContract({\n        contractAddresses,\n        contractName: 'clearinghouse',\n        walletClient,\n        publicClient,\n      }),\n      endpoint: getNadoContract({\n        contractAddresses,\n        contractName: 'endpoint',\n        walletClient,\n        publicClient,\n      }),\n      spotEngine: getNadoContract({\n        contractAddresses,\n        contractName: 'spotEngine',\n        walletClient,\n        publicClient,\n      }),\n      perpEngine: getNadoContract({\n        contractAddresses,\n        contractName: 'perpEngine',\n        walletClient,\n        publicClient,\n      }),\n      withdrawPool: getNadoContract({\n        contractAddresses,\n        contractName: 'withdrawPool',\n        walletClient,\n        publicClient,\n      }),\n    },\n    contractAddresses,\n    engineClient: new EngineClient({\n      url: engineEndpoint,\n      walletClient,\n      linkedSignerWalletClient,\n    }),\n    indexerClient: new IndexerClient({\n      url: indexerEndpoint,\n      walletClient,\n    }),\n    triggerClient: new TriggerClient({\n      url: triggerEndpoint,\n      walletClient,\n      linkedSignerWalletClient,\n    }),\n  };\n}\n\ninterface GetNadoContractParams<T extends NadoContractName> {\n  contractAddresses: NadoDeploymentAddresses;\n  contractName: T;\n  walletClient?: WalletClientWithAccount;\n  publicClient: PublicClient;\n}\n\nfunction getNadoContract<T extends NadoContractName>({\n  contractAddresses,\n  contractName,\n  walletClient,\n  publicClient,\n}: GetNadoContractParams<T>): NadoContracts[T] {\n  return getContract({\n    address: contractAddresses[contractName],\n    abi: NADO_ABIS[contractName],\n    client: walletClient ?? publicClient,\n  }) as NadoContracts[T];\n}\n"],"mappings":";AAAA;AAAA,EAEE;AAAA,EACA;AAAA,OAKK;AACP,SAAS,yBAAyB,oBAAoB;AACtD;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,mBAAiC;AA2CnC,SAAS,oBACd,MACA,aACmB;AACnB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,KAAK,MAA6B;AAEhC,QAAI,OAAO,SAAS,UAAU;AAC5B,aAAO;AAAA,IACT;AAEA,UAAM,WAAW;AACjB,WAAO;AAAA,MACL,mBAAmB,iBAAiB,QAAQ;AAAA,MAC5C,gBAAgB,wBAAwB,QAAQ;AAAA,MAChD,iBAAiB,yBAAyB,QAAQ;AAAA,MAClD,iBAAiB,yBAAyB,QAAQ;AAAA,IACpD;AAAA,EACF,GAAG;AACH,QAAM,EAAE,cAAc,cAAc,yBAAyB,IAAI;AAEjE,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW;AAAA,MACT,SAAS,gBAAgB;AAAA,QACvB;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,eAAe,gBAAgB;AAAA,QAC7B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,UAAU,gBAAgB;AAAA,QACxB;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,YAAY,gBAAgB;AAAA,QAC1B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,YAAY,gBAAgB;AAAA,QAC1B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,cAAc,gBAAgB;AAAA,QAC5B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA;AAAA,IACA,cAAc,IAAI,aAAa;AAAA,MAC7B,KAAK;AAAA,MACL;AAAA,MACA;AAAA,IACF,CAAC;AAAA,IACD,eAAe,IAAI,cAAc;AAAA,MAC/B,KAAK;AAAA,MACL;AAAA,IACF,CAAC;AAAA,IACD,eAAe,IAAI,cAAc;AAAA,MAC/B,KAAK;AAAA,MACL;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;AASA,SAAS,gBAA4C;AAAA,EACnD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+C;AAC7C,SAAO,YAAY;AAAA,IACjB,SAAS,kBAAkB,YAAY;AAAA,IACvC,KAAK,UAAU,YAAY;AAAA,IAC3B,QAAQ,gBAAgB;AAAA,EAC1B,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../src/context.ts"],"sourcesContent":["import {\n  ChainEnv,\n  NADO_ABIS,\n  NADO_DEPLOYMENTS,\n  NadoContractName,\n  NadoContracts,\n  NadoDeploymentAddresses,\n  WalletClientWithAccount,\n} from '@nadohq/shared';\nimport { ENGINE_CLIENT_ENDPOINTS, EngineClient } from '@nadohq/engine-client';\nimport {\n  INDEXER_CLIENT_ENDPOINTS,\n  IndexerClient,\n} from '@nadohq/indexer-client';\nimport {\n  TRIGGER_CLIENT_ENDPOINTS,\n  TriggerClient,\n} from '@nadohq/trigger-client';\nimport { getContract, PublicClient } from 'viem';\n\n/**\n * Context required to use the Nado client.\n */\nexport interface NadoClientContext {\n  publicClient: PublicClient;\n  walletClient?: WalletClientWithAccount;\n  // If provided, this is used to sign engine transactions instead of the account associated with walletClient\n  linkedSignerWalletClient?: WalletClientWithAccount;\n  contracts: NadoContracts;\n  contractAddresses: NadoDeploymentAddresses;\n  engineClient: EngineClient;\n  indexerClient: IndexerClient;\n  triggerClient: TriggerClient;\n}\n\n/**\n * Args for creating a context\n */\ninterface NadoClientContextOpts {\n  contractAddresses: NadoDeploymentAddresses;\n  engineEndpoint: string;\n  indexerEndpoint: string;\n  triggerEndpoint: string;\n}\n\n/**\n * Args for signing configuration for creating a context\n */\nexport type CreateNadoClientContextAccountOpts = Pick<\n  NadoClientContext,\n  'walletClient' | 'linkedSignerWalletClient' | 'publicClient'\n>;\n\nexport type CreateNadoClientContextOpts = NadoClientContextOpts | ChainEnv;\n\n/**\n * Utility function to create client context from options\n *\n * @param opts\n * @param accountOpts\n */\nexport function createClientContext(\n  opts: CreateNadoClientContextOpts,\n  accountOpts: CreateNadoClientContextAccountOpts,\n): NadoClientContext {\n  const {\n    contractAddresses,\n    engineEndpoint,\n    indexerEndpoint,\n    triggerEndpoint,\n  } = ((): NadoClientContextOpts => {\n    // Custom options\n    if (typeof opts === 'object') {\n      return opts;\n    }\n\n    const chainEnv = opts;\n    return {\n      contractAddresses: NADO_DEPLOYMENTS[chainEnv],\n      engineEndpoint: ENGINE_CLIENT_ENDPOINTS[chainEnv],\n      indexerEndpoint: INDEXER_CLIENT_ENDPOINTS[chainEnv],\n      triggerEndpoint: TRIGGER_CLIENT_ENDPOINTS[chainEnv],\n    };\n  })();\n  const { publicClient, walletClient, linkedSignerWalletClient } = accountOpts;\n\n  return {\n    walletClient,\n    linkedSignerWalletClient,\n    publicClient,\n    contracts: {\n      querier: getNadoContract({\n        contractAddresses,\n        contractName: 'querier',\n        walletClient,\n        publicClient,\n      }),\n      clearinghouse: getNadoContract({\n        contractAddresses,\n        contractName: 'clearinghouse',\n        walletClient,\n        publicClient,\n      }),\n      endpoint: getNadoContract({\n        contractAddresses,\n        contractName: 'endpoint',\n        walletClient,\n        publicClient,\n      }),\n      spotEngine: getNadoContract({\n        contractAddresses,\n        contractName: 'spotEngine',\n        walletClient,\n        publicClient,\n      }),\n      perpEngine: getNadoContract({\n        contractAddresses,\n        contractName: 'perpEngine',\n        walletClient,\n        publicClient,\n      }),\n      withdrawPool: getNadoContract({\n        contractAddresses,\n        contractName: 'withdrawPool',\n        walletClient,\n        publicClient,\n      }),\n    },\n    contractAddresses,\n    engineClient: new EngineClient({\n      url: engineEndpoint,\n      walletClient,\n      linkedSignerWalletClient,\n    }),\n    indexerClient: new IndexerClient({\n      url: indexerEndpoint,\n      walletClient,\n    }),\n    triggerClient: new TriggerClient({\n      url: triggerEndpoint,\n      walletClient,\n      linkedSignerWalletClient,\n    }),\n  };\n}\n\ninterface GetNadoContractParams<T extends NadoContractName> {\n  contractAddresses: NadoDeploymentAddresses;\n  contractName: T;\n  walletClient?: WalletClientWithAccount;\n  publicClient: PublicClient;\n}\n\nfunction getNadoContract<T extends NadoContractName>({\n  contractAddresses,\n  contractName,\n  walletClient,\n  publicClient,\n}: GetNadoContractParams<T>): NadoContracts[T] {\n  return getContract({\n    address: contractAddresses[contractName],\n    abi: NADO_ABIS[contractName],\n    client: walletClient ?? publicClient,\n  }) as NadoContracts[T];\n}\n"],"mappings":";AAAA;AAAA,EAEE;AAAA,EACA;AAAA,OAKK;AACP,SAAS,yBAAyB,oBAAoB;AACtD;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,mBAAiC;AA2CnC,SAAS,oBACd,MACA,aACmB;AACnB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,KAAK,MAA6B;AAEhC,QAAI,OAAO,SAAS,UAAU;AAC5B,aAAO;AAAA,IACT;AAEA,UAAM,WAAW;AACjB,WAAO;AAAA,MACL,mBAAmB,iBAAiB,QAAQ;AAAA,MAC5C,gBAAgB,wBAAwB,QAAQ;AAAA,MAChD,iBAAiB,yBAAyB,QAAQ;AAAA,MAClD,iBAAiB,yBAAyB,QAAQ;AAAA,IACpD;AAAA,EACF,GAAG;AACH,QAAM,EAAE,cAAc,cAAc,yBAAyB,IAAI;AAEjE,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW;AAAA,MACT,SAAS,gBAAgB;AAAA,QACvB;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,eAAe,gBAAgB;AAAA,QAC7B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,UAAU,gBAAgB;AAAA,QACxB;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,YAAY,gBAAgB;AAAA,QAC1B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,YAAY,gBAAgB;AAAA,QAC1B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,MACD,cAAc,gBAAgB;AAAA,QAC5B;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA;AAAA,IACA,cAAc,IAAI,aAAa;AAAA,MAC7B,KAAK;AAAA,MACL;AAAA,MACA;AAAA,IACF,CAAC;AAAA,IACD,eAAe,IAAI,cAAc;AAAA,MAC/B,KAAK;AAAA,MACL;AAAA,IACF,CAAC;AAAA,IACD,eAAe,IAAI,cAAc;AAAA,MAC/B,KAAK;AAAA,MACL;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;AASA,SAAS,gBAA4C;AAAA,EACnD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+C;AAC7C,SAAO,YAAY;AAAA,IACjB,SAAS,kBAAkB,YAAY;AAAA,IACvC,KAAK,UAAU,YAAY;AAAA,IAC3B,QAAQ,gBAAgB;AAAA,EAC1B,CAAC;AACH;","names":[]}

package/dist/createNadoClient.d.cts

@@ -4,8 +4,7 @@ import './apis/market/index.cjs';
 import './apis/perp/index.cjs';
 import './apis/spot/index.cjs';
 import './apis/subaccount/index.cjs';
-import '@nadohq/utils';
-import '@nadohq/contracts';
+import '@nadohq/shared';
 import '@nadohq/engine-client';
 import '@nadohq/indexer-client';
 import '@nadohq/trigger-client';

package/dist/createNadoClient.d.ts

@@ -4,8 +4,7 @@ import './apis/market/index.js';
 import './apis/perp/index.js';
 import './apis/spot/index.js';
 import './apis/subaccount/index.js';
-import '@nadohq/utils';
-import '@nadohq/contracts';
+import '@nadohq/shared';
 import '@nadohq/engine-client';
 import '@nadohq/indexer-client';
 import '@nadohq/trigger-client';

package/dist/index.cjs

@@ -24,8 +24,7 @@ __reExport(index_exports, require("./apis/market/index.cjs"), module.exports);
 __reExport(index_exports, require("./apis/perp/index.cjs"), module.exports);
 __reExport(index_exports, require("./apis/spot/index.cjs"), module.exports);
 __reExport(index_exports, require("./apis/subaccount/index.cjs"), module.exports);
-__reExport(index_exports, require("@nadohq/utils"), module.exports);
-__reExport(index_exports, require("@nadohq/contracts"), module.exports);
+__reExport(index_exports, require("@nadohq/shared"), module.exports);
 __reExport(index_exports, require("@nadohq/engine-client"), module.exports);
 __reExport(index_exports, require("@nadohq/indexer-client"), module.exports);
 __reExport(index_exports, require("@nadohq/trigger-client"), module.exports);
@@ -38,8 +37,7 @@ __reExport(index_exports, require("@nadohq/trigger-client"), module.exports);
   ...require("./apis/perp/index.cjs"),
   ...require("./apis/spot/index.cjs"),
   ...require("./apis/subaccount/index.cjs"),
-  ...require("@nadohq/utils"),
-  ...require("@nadohq/contracts"),
+  ...require("@nadohq/shared"),
   ...require("@nadohq/engine-client"),
   ...require("@nadohq/indexer-client"),
   ...require("@nadohq/trigger-client")

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './createNadoClient';\nexport * from './client';\nexport * from './context';\n\nexport * from './apis/market';\nexport * from './apis/perp';\nexport * from './apis/spot';\nexport * from './apis/subaccount';\n\n// Subpackage exports\nexport * from '@nadohq/utils';\nexport * from '@nadohq/contracts';\nexport * from '@nadohq/engine-client';\nexport * from '@nadohq/indexer-client';\nexport * from '@nadohq/trigger-client';\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,mCAAd;AACA,0BAAc,yBADd;AAEA,0BAAc,0BAFd;AAIA,0BAAc,oCAJd;AAKA,0BAAc,kCALd;AAMA,0BAAc,kCANd;AAOA,0BAAc,wCAPd;AAUA,0BAAc,0BAVd;AAWA,0BAAc,8BAXd;AAYA,0BAAc,kCAZd;AAaA,0BAAc,mCAbd;AAcA,0BAAc,mCAdd;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './createNadoClient';\nexport * from './client';\nexport * from './context';\n\nexport * from './apis/market';\nexport * from './apis/perp';\nexport * from './apis/spot';\nexport * from './apis/subaccount';\n\n// Subpackage exports\nexport * from '@nadohq/shared';\nexport * from '@nadohq/engine-client';\nexport * from '@nadohq/indexer-client';\nexport * from '@nadohq/trigger-client';\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,mCAAd;AACA,0BAAc,yBADd;AAEA,0BAAc,0BAFd;AAIA,0BAAc,oCAJd;AAKA,0BAAc,kCALd;AAMA,0BAAc,kCANd;AAOA,0BAAc,wCAPd;AAUA,0BAAc,2BAVd;AAWA,0BAAc,kCAXd;AAYA,0BAAc,mCAZd;AAaA,0BAAc,mCAbd;","names":[]}

package/dist/index.d.cts

@@ -5,13 +5,12 @@ export { MarketAPI } from './apis/market/index.cjs';
 export { PerpAPI } from './apis/perp/index.cjs';
 export { SpotAPI } from './apis/spot/index.cjs';
 export { SubaccountAPI } from './apis/subaccount/index.cjs';
-export * from '@nadohq/utils';
-export * from '@nadohq/contracts';
+export * from '@nadohq/shared';
 export * from '@nadohq/engine-client';
 export * from '@nadohq/indexer-client';
 export * from '@nadohq/trigger-client';
-export { CancelAndPlaceOrderParams, CancelOrdersParams, CancelProductOrdersParams, CancelTriggerOrdersParams, CancelTriggerProductOrdersParams, GetTriggerOrdersParams, PlaceIsolatedOrderParams, PlaceOrderParams, PlaceTriggerOrderParams } from './apis/market/types.cjs';
-export { ApproveAllowanceParams, BurnNlpParams, GetTokenAllowanceParams, GetTokenWalletBalanceParams, MintNlpParams, ProductIdOrTokenAddress, TransferQuoteParams, WithdrawCollateralParams } from './apis/spot/types.cjs';
+export { CancelAndPlaceOrderParams, CancelOrdersParams, CancelProductOrdersParams, CancelTriggerOrdersParams, CancelTriggerProductOrdersParams, GetTriggerOrdersParams, PlaceOrderParams, PlaceTriggerOrderParams } from './apis/market/types.cjs';
+export { ApproveAllowanceParams, BurnNlpParams, GetTokenAllowanceParams, GetTokenWalletBalanceParams, MintMockERC20Params, MintNlpParams, ProductIdOrTokenAddress, TransferQuoteParams, WithdrawCollateralParams } from './apis/spot/types.cjs';
 export { CreateStandardLinkedSignerResult, LinkSignerParams, LiquidateSubaccountParams } from './apis/subaccount/types.cjs';
 import './apis/ws/index.cjs';
 import './apis/base.cjs';

package/dist/index.d.ts

@@ -5,13 +5,12 @@ export { MarketAPI } from './apis/market/index.js';
 export { PerpAPI } from './apis/perp/index.js';
 export { SpotAPI } from './apis/spot/index.js';
 export { SubaccountAPI } from './apis/subaccount/index.js';
-export * from '@nadohq/utils';
-export * from '@nadohq/contracts';
+export * from '@nadohq/shared';
 export * from '@nadohq/engine-client';
 export * from '@nadohq/indexer-client';
 export * from '@nadohq/trigger-client';
-export { CancelAndPlaceOrderParams, CancelOrdersParams, CancelProductOrdersParams, CancelTriggerOrdersParams, CancelTriggerProductOrdersParams, GetTriggerOrdersParams, PlaceIsolatedOrderParams, PlaceOrderParams, PlaceTriggerOrderParams } from './apis/market/types.js';
-export { ApproveAllowanceParams, BurnNlpParams, GetTokenAllowanceParams, GetTokenWalletBalanceParams, MintNlpParams, ProductIdOrTokenAddress, TransferQuoteParams, WithdrawCollateralParams } from './apis/spot/types.js';
+export { CancelAndPlaceOrderParams, CancelOrdersParams, CancelProductOrdersParams, CancelTriggerOrdersParams, CancelTriggerProductOrdersParams, GetTriggerOrdersParams, PlaceOrderParams, PlaceTriggerOrderParams } from './apis/market/types.js';
+export { ApproveAllowanceParams, BurnNlpParams, GetTokenAllowanceParams, GetTokenWalletBalanceParams, MintMockERC20Params, MintNlpParams, ProductIdOrTokenAddress, TransferQuoteParams, WithdrawCollateralParams } from './apis/spot/types.js';
 export { CreateStandardLinkedSignerResult, LinkSignerParams, LiquidateSubaccountParams } from './apis/subaccount/types.js';
 import './apis/ws/index.js';
 import './apis/base.js';

package/dist/index.js

@@ -6,8 +6,7 @@ export * from "./apis/market/index.js";
 export * from "./apis/perp/index.js";
 export * from "./apis/spot/index.js";
 export * from "./apis/subaccount/index.js";
-export * from "@nadohq/utils";
-export * from "@nadohq/contracts";
+export * from "@nadohq/shared";
 export * from "@nadohq/engine-client";
 export * from "@nadohq/indexer-client";
 export * from "@nadohq/trigger-client";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './createNadoClient';\nexport * from './client';\nexport * from './context';\n\nexport * from './apis/market';\nexport * from './apis/perp';\nexport * from './apis/spot';\nexport * from './apis/subaccount';\n\n// Subpackage exports\nexport * from '@nadohq/utils';\nexport * from '@nadohq/contracts';\nexport * from '@nadohq/engine-client';\nexport * from '@nadohq/indexer-client';\nexport * from '@nadohq/trigger-client';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAGd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["export * from './createNadoClient';\nexport * from './client';\nexport * from './context';\n\nexport * from './apis/market';\nexport * from './apis/perp';\nexport * from './apis/spot';\nexport * from './apis/subaccount';\n\n// Subpackage exports\nexport * from '@nadohq/shared';\nexport * from '@nadohq/engine-client';\nexport * from '@nadohq/indexer-client';\nexport * from '@nadohq/trigger-client';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AAEd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAGd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nadohq/client",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.5",
   "type": "module",
   "sideEffects": false,
   "description": "> TODO: description",
@@ -37,11 +37,10 @@
     }
   },
   "dependencies": {
-    "@nadohq/contracts": "^0.1.0-alpha.3",
-    "@nadohq/engine-client": "^0.1.0-alpha.3",
-    "@nadohq/indexer-client": "^0.1.0-alpha.3",
-    "@nadohq/trigger-client": "^0.1.0-alpha.3",
-    "@nadohq/utils": "^0.1.0-alpha.3",
+    "@nadohq/engine-client": "^0.1.0-alpha.5",
+    "@nadohq/indexer-client": "^0.1.0-alpha.5",
+    "@nadohq/shared": "^0.1.0-alpha.5",
+    "@nadohq/trigger-client": "^0.1.0-alpha.5",
     "ts-mixer": "*"
   },
   "peerDependencies": {
@@ -50,5 +49,5 @@
   "devDependencies": {
     "viem": "*"
   },
-  "gitHead": "2bfcc344b596b7a33e9b8e4e3256a117de3fda04"
+  "gitHead": "de119d61db2be44b2cab79b8d373b66eb0f8ffe6"
 }

package/src/apis/base.ts

@@ -1,5 +1,5 @@
-import { WithContracts } from '@nadohq/contracts';
-import { WalletNotProvidedError } from '@nadohq/utils';
+import { WithContracts } from '@nadohq/shared';
+import { WalletNotProvidedError } from '@nadohq/shared';
 
 import { NadoClientContext } from '../context';
 
@@ -33,10 +33,6 @@ export class BaseNadoAPI {
     return this.context.contractAddresses.endpoint;
   }
 
-  protected async getOrderbookAddress(productId: number) {
-    return this.context.engineClient.getOrderbookAddress(productId);
-  }
-
   protected getSubaccountOwnerIfNeeded(params: {
     subaccountOwner?: string;
   }): string {

package/src/apis/market/MarketExecuteAPI.ts

@@ -1,12 +1,11 @@
+import { getOrderVerifyingAddress } from '@nadohq/shared';
 import { BaseNadoAPI } from '../base';
-import { OptionalSignatureParams } from '../types';
 import {
   CancelAndPlaceOrderParams,
   CancelOrdersParams,
   CancelProductOrdersParams,
   CancelTriggerOrdersParams,
   CancelTriggerProductOrdersParams,
-  PlaceIsolatedOrderParams,
   PlaceOrderParams,
   PlaceTriggerOrderParams,
 } from './types';
@@ -26,34 +25,13 @@ export class MarketExecuteAPI extends BaseNadoAPI {
         subaccountOwner: this.getSubaccountOwnerIfNeeded(params.order),
       },
       chainId: this.getWalletClientChainIdIfNeeded(params),
-      verifyingAddr: await this.getOrderbookVerifyingAddressIfNeeded(params),
+      verifyingAddr: getOrderVerifyingAddress(params.productId),
       productId,
       spotLeverage: params.spotLeverage,
       nonce,
     });
   }
 
-  /**
-   * Places an isolated order through the engine
-   * @param params
-   */
-  async placeIsolatedOrder(params: PlaceIsolatedOrderParams) {
-    const { id: orderId, productId, order, nonce, borrowMargin } = params;
-
-    return this.context.engineClient.placeIsolatedOrder({
-      id: orderId,
-      order: {
-        ...order,
-        subaccountOwner: this.getSubaccountOwnerIfNeeded(params.order),
-      },
-      chainId: this.getWalletClientChainIdIfNeeded(params),
-      verifyingAddr: await this.getOrderbookVerifyingAddressIfNeeded(params),
-      productId,
-      borrowMargin,
-      nonce,
-    });
-  }
-
   /**
    * Cancels orders through the engine
    * @param params
@@ -91,9 +69,7 @@ export class MarketExecuteAPI extends BaseNadoAPI {
           ...order,
           subaccountOwner,
         },
-        verifyingAddr: await this.getOrderbookVerifyingAddressIfNeeded(
-          params.placeOrder,
-        ),
+        verifyingAddr: getOrderVerifyingAddress(productId),
         chainId,
         productId,
         spotLeverage,
@@ -123,7 +99,7 @@ export class MarketExecuteAPI extends BaseNadoAPI {
     return this.context.triggerClient.placeTriggerOrder({
       ...params,
       chainId: this.getWalletClientChainIdIfNeeded(params),
-      verifyingAddr: await this.getOrderbookVerifyingAddressIfNeeded(params),
+      verifyingAddr: getOrderVerifyingAddress(params.productId),
       order: {
         subaccountOwner: this.getSubaccountOwnerIfNeeded(params.order),
         ...params.order,
@@ -156,14 +132,4 @@ export class MarketExecuteAPI extends BaseNadoAPI {
       verifyingAddr: params.verifyingAddr ?? this.getEndpointAddress(),
     });
   }
-
-  protected async getOrderbookVerifyingAddressIfNeeded(
-    params: OptionalSignatureParams<{
-      productId: number;
-    }>,
-  ): Promise<string> {
-    return (
-      params.verifyingAddr ?? (await this.getOrderbookAddress(params.productId))
-    );
-  }
 }

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,22 +12,18 @@ 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 CancelOrdersParams = OptionalSignatureParams<
   OptionalSubaccountOwner<EngineCancelOrdersParams>
 >;

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,6 @@
-import { ContractInstance, ERC20_ABI } from '@nadohq/contracts';
-import { getValidatedAddress } from '@nadohq/utils';
+import { ERC20_ABI } from '@nadohq/shared';
+import { ContractInstance } from '@nadohq/shared';
+import { 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,14 @@ import {
   depositCollateral,
   DepositCollateralParams,
   isWriteableContract,
-  MintMockERC20Params,
   MOCK_ERC20_ABI,
-} from '@nadohq/contracts';
-import { toBigInt, WalletNotProvidedError } from '@nadohq/utils';
+} from '@nadohq/shared';
+import { 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,5 @@
-import { createDeterministicLinkedSignerPrivateKey } from '@nadohq/contracts';
-import { WalletNotProvidedError } from '@nadohq/utils';
+import { createDeterministicLinkedSignerPrivateKey } from '@nadohq/shared';
+import { 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,4 +1,4 @@
-import { AccountWithPrivateKey } from '@nadohq/contracts';
+import { AccountWithPrivateKey } from '@nadohq/shared';
 import {
   EngineLinkSignerParams,
   EngineLiquidateSubaccountParams,

package/src/apis/ws/WebSocketExecuteAPI.ts

@@ -1,4 +1,4 @@
-import { EIP712OrderParams } from '@nadohq/contracts';
+import { EIP712OrderParams } from '@nadohq/shared';
 import {
   EngineExecuteRequestParamsByType,
   WithSignature,

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

@@ -6,7 +6,7 @@ import {
   NadoContracts,
   NadoDeploymentAddresses,
   WalletClientWithAccount,
-} from '@nadohq/contracts';
+} from '@nadohq/shared';
 import { ENGINE_CLIENT_ENDPOINTS, EngineClient } from '@nadohq/engine-client';
 import {
   INDEXER_CLIENT_ENDPOINTS,

package/src/index.ts

@@ -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/shared';
 export * from '@nadohq/engine-client';
 export * from '@nadohq/indexer-client';
 export * from '@nadohq/trigger-client';