@nadohq/shared 0.1.0-alpha.4 → 0.1.0-alpha.41

package/dist/utils/orders/index.d.cts

@@ -1,10 +1,10 @@
-export { getOrderNonce, getRecvTimeFromOrderNonce } from './orderNonce.cjs';
-export { getDefaultRecvTime } from './recvTime.cjs';
-export { packTWAPOrderAppendixValue, unpackTWAPOrderAppendixValue } from './appendix/appendixTWAPValue.cjs';
-export { unpackOrderAppendix } from './appendix/unpackOrderAppendix.cjs';
+export { packTwapOrderAppendixValue, unpackTwapOrderAppendixValue } from './appendix/appendixTwapValue.cjs';
+export { bitMaskValue } from './appendix/bitMaskValue.cjs';
 export { packOrderAppendix } from './appendix/packOrderAppendix.cjs';
 export { PackedOrderAppendixBits } from './appendix/types.cjs';
-export { bitMaskValue } from './appendix/bitMaskValue.cjs';
+export { unpackOrderAppendix } from './appendix/unpackOrderAppendix.cjs';
+export { getOrderNonce, getRecvTimeFromOrderNonce } from './orderNonce.cjs';
+export { getDefaultRecvTime } from './recvTime.cjs';
 import '../../types/orderAppendixTypes.cjs';
 import '../math/bigDecimal.cjs';
 import 'bignumber.js';

package/dist/utils/orders/index.d.ts

@@ -1,10 +1,10 @@
-export { getOrderNonce, getRecvTimeFromOrderNonce } from './orderNonce.js';
-export { getDefaultRecvTime } from './recvTime.js';
-export { packTWAPOrderAppendixValue, unpackTWAPOrderAppendixValue } from './appendix/appendixTWAPValue.js';
-export { unpackOrderAppendix } from './appendix/unpackOrderAppendix.js';
+export { packTwapOrderAppendixValue, unpackTwapOrderAppendixValue } from './appendix/appendixTwapValue.js';
+export { bitMaskValue } from './appendix/bitMaskValue.js';
 export { packOrderAppendix } from './appendix/packOrderAppendix.js';
 export { PackedOrderAppendixBits } from './appendix/types.js';
-export { bitMaskValue } from './appendix/bitMaskValue.js';
+export { unpackOrderAppendix } from './appendix/unpackOrderAppendix.js';
+export { getOrderNonce, getRecvTimeFromOrderNonce } from './orderNonce.js';
+export { getDefaultRecvTime } from './recvTime.js';
 import '../../types/orderAppendixTypes.js';
 import '../math/bigDecimal.js';
 import 'bignumber.js';

package/dist/utils/orders/index.js

@@ -1,5 +1,5 @@
 // src/utils/orders/index.ts
+export * from "./appendix/index.js";
 export * from "./orderNonce.js";
 export * from "./recvTime.js";
-export * from "./appendix/index.js";
 //# sourceMappingURL=index.js.map

package/dist/utils/orders/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/orders/index.ts"],"sourcesContent":["export * from './orderNonce';\nexport * from './recvTime';\nexport * from './appendix';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../../../src/utils/orders/index.ts"],"sourcesContent":["export * from './appendix';\nexport * from './orderNonce';\nexport * from './recvTime';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}

package/dist/utils/productTypeFilter.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/productTypeFilter.ts"],"sourcesContent":["import { Balance, PerpBalance, SpotBalance } from '../types/balanceTypes';\nimport {\n  ProductEngineType,\n  PerpProduct,\n  SpotProduct,\n  Product,\n} from '../types/productTypes';\n\nexport function isSpotProduct(product: Product): product is SpotProduct {\n  return product.type === ProductEngineType.SPOT;\n}\n\nexport function isSpotBalance(balance: Balance): balance is SpotBalance {\n  return balance.type === ProductEngineType.SPOT;\n}\n\nexport function isPerpProduct(product: Product): product is PerpProduct {\n  return product.type === ProductEngineType.PERP;\n}\n\nexport function isPerpBalance(balance: Balance): balance is PerpBalance {\n  return balance.type === ProductEngineType.PERP;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAKO;AAEA,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;","names":[]}
+{"version":3,"sources":["../../src/utils/productTypeFilter.ts"],"sourcesContent":["import { Balance, PerpBalance, SpotBalance } from '../types/balanceTypes';\nimport {\n  PerpProduct,\n  Product,\n  ProductEngineType,\n  SpotProduct,\n} from '../types/productTypes';\n\nexport function isSpotProduct(product: Product): product is SpotProduct {\n  return product.type === ProductEngineType.SPOT;\n}\n\nexport function isSpotBalance(balance: Balance): balance is SpotBalance {\n  return balance.type === ProductEngineType.SPOT;\n}\n\nexport function isPerpProduct(product: Product): product is PerpProduct {\n  return product.type === ProductEngineType.PERP;\n}\n\nexport function isPerpBalance(balance: Balance): balance is PerpBalance {\n  return balance.type === ProductEngineType.PERP;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAKO;AAEA,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,sCAAkB;AAC5C;","names":[]}

package/dist/utils/productTypeFilter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/productTypeFilter.ts"],"sourcesContent":["import { Balance, PerpBalance, SpotBalance } from '../types/balanceTypes';\nimport {\n  ProductEngineType,\n  PerpProduct,\n  SpotProduct,\n  Product,\n} from '../types/productTypes';\n\nexport function isSpotProduct(product: Product): product is SpotProduct {\n  return product.type === ProductEngineType.SPOT;\n}\n\nexport function isSpotBalance(balance: Balance): balance is SpotBalance {\n  return balance.type === ProductEngineType.SPOT;\n}\n\nexport function isPerpProduct(product: Product): product is PerpProduct {\n  return product.type === ProductEngineType.PERP;\n}\n\nexport function isPerpBalance(balance: Balance): balance is PerpBalance {\n  return balance.type === ProductEngineType.PERP;\n}\n"],"mappings":";;;AACA;AAAA,EACE;AAAA,OAIK;AAEA,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;","names":[]}
+{"version":3,"sources":["../../src/utils/productTypeFilter.ts"],"sourcesContent":["import { Balance, PerpBalance, SpotBalance } from '../types/balanceTypes';\nimport {\n  PerpProduct,\n  Product,\n  ProductEngineType,\n  SpotProduct,\n} from '../types/productTypes';\n\nexport function isSpotProduct(product: Product): product is SpotProduct {\n  return product.type === ProductEngineType.SPOT;\n}\n\nexport function isSpotBalance(balance: Balance): balance is SpotBalance {\n  return balance.type === ProductEngineType.SPOT;\n}\n\nexport function isPerpProduct(product: Product): product is PerpProduct {\n  return product.type === ProductEngineType.PERP;\n}\n\nexport function isPerpBalance(balance: Balance): balance is PerpBalance {\n  return balance.type === ProductEngineType.PERP;\n}\n"],"mappings":";;;AACA;AAAA,EAGE;AAAA,OAEK;AAEA,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;AAEO,SAAS,cAAc,SAA0C;AACtE,SAAO,QAAQ,SAAS,kBAAkB;AAC5C;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nadohq/shared",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.41",
   "type": "module",
   "sideEffects": false,
   "description": "Shared utilities, types, and contract helpers for Nado SDK",
@@ -36,6 +36,10 @@
       }
     }
   },
+  "react-native": "./dist/index.js",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "peerDependencies": {
     "bignumber.js": "^9.3.0",
     "viem": "*"
@@ -45,5 +49,5 @@
     "bignumber.js": "^9.3.0",
     "viem": "*"
   },
-  "gitHead": "b852ce36b851303225d3f4b81739ac667c64cf8c"
+  "gitHead": "dbfcd352246b8914985af6b333cc49e2b8624473"
 }

package/src/abis/index.ts

@@ -1,9 +1,9 @@
+export * from './Clearinghouse';
+export * from './Endpoint';
 export * from './ERC20';
 export * from './MockERC20';
-export * from './WithdrawPool';
-export * from './SpotEngine';
-export * from './Querier';
-export * from './PerpEngine';
-export * from './Endpoint';
-export * from './Clearinghouse';
 export * from './nadoAbis';
+export * from './PerpEngine';
+export * from './Querier';
+export * from './SpotEngine';
+export * from './WithdrawPool';

package/src/consts/chainEnvToChain.ts

@@ -1,11 +1,11 @@
 import { Chain } from 'viem';
-import { arbitrum, inkSepolia, localhost } from 'viem/chains';
+import { inkSepolia, ink, localhost } from 'viem/chains';
 import { ChainEnv } from '../types';
 
 export const CHAIN_ENV_TO_CHAIN = {
   local: localhost,
-  arbitrum: arbitrum,
   inkTestnet: inkSepolia,
+  inkMainnet: ink,
 } as const satisfies Record<ChainEnv, Chain>;
 
 export const CHAIN_ID_TO_CHAIN_ENV = Object.fromEntries(

package/src/consts/productIds.ts

@@ -1,3 +1,3 @@
 export const QUOTE_PRODUCT_ID = 0;
 
-export const NLP_PRODUCT_ID = 153;
+export const NLP_PRODUCT_ID = 11;

package/src/deployments/core/deployment.inkMainnet.json

@@ -0,0 +1,13 @@
+{
+  "nodeUrl": "https://ink.drpc.org",
+  "explorerUrl": "https://explorer.inkonchain.com",
+  "startBlock": 29851015,
+  "deployer": "0xC1cC56caB60e832665E6c3780BfEBe3C1C971603",
+  "quote": "0x0200C29006150606B650577BBE7B6248F58470c1",
+  "querier": "0x68798229F88251b31D534733D6C4098318c9dff8",
+  "clearinghouse": "0xD218103918C19D0A10cf35300E4CfAfbD444c5fE",
+  "endpoint": "0x05ec92D78ED421f3D3Ada77FFdE167106565974E",
+  "spotEngine": "0xFcD94770B95fd9Cc67143132BB172EB17A0907fE",
+  "perpEngine": "0xF8599D58d1137fC56EcDd9C16ee139C8BDf96da1",
+  "withdrawPool": "0x09fb495AA7859635f755E827d64c4C9A2e5b9651"
+}

package/src/deployments/core/deployment.inkSepolia.json

@@ -0,0 +1,13 @@
+{
+  "nodeUrl": "https://rpc-gel-sepolia.inkonchain.com",
+  "explorerUrl": "https://explorer-sepolia.inkonchain.com",
+  "startBlock": 33809962,
+  "deployer": "0x59841b3761Ed1D089a783E4d7CB49E4534CD4F85",
+  "quote": "0x60F50F902b2E91aef7D6c700Eb22599e297fa86F",
+  "querier": "0x8E693BEa316bcC0F4f8be403081b954a0E3743C8",
+  "clearinghouse": "0x23a283B359D55A941bBeEC58801B6b17D955CC73",
+  "endpoint": "0x698D87105274292B5673367DEC81874Ce3633Ac2",
+  "spotEngine": "0x3352b2fF0fAc4ce38A6eA1C188cF4F924df54E5D",
+  "perpEngine": "0x4E859C47fea3666B5053B16C81AF64e77567702e",
+  "withdrawPool": "0xBD672Fe513acbA5c1ceE7b02F998A1B542852b3b"
+}

package/src/deployments/index.ts

@@ -3,8 +3,8 @@ import { NadoContractName } from '../abis/nadoAbis';
 
 import { ChainEnv } from '../types';
 import { getValidatedAddress } from '../utils/getValidatedAddress';
-import ArbitrumOneCoreDeployment from './core/deployment.arbitrumOne.json' with { type: 'json' };
-import InkSepoliaCoreDeployment from './core/deployment.InkSepolia.json' with { type: 'json' };
+import InkSepoliaCoreDeployment from './core/deployment.inkSepolia.json' with { type: 'json' };
+import InkMainnetCoreDeployment from './core/deployment.inkMainnet.json' with { type: 'json' };
 import LocalCoreDeployment from './core/deployment.localhost.json' with { type: 'json' };
 
 export type NadoDeploymentAddresses = {
@@ -15,12 +15,12 @@ export type NadoDeploymentAddresses = {
  * Known deployment addresses for the Nado contracts
  */
 export const NADO_DEPLOYMENTS: Record<ChainEnv, NadoDeploymentAddresses> = {
-  arbitrum: validateDeployment({
-    ...ArbitrumOneCoreDeployment,
-  }),
   inkTestnet: validateDeployment({
     ...InkSepoliaCoreDeployment,
   }),
+  inkMainnet: validateDeployment({
+    ...InkMainnetCoreDeployment,
+  }),
   local: validateDeployment({
     ...LocalCoreDeployment,
   }),

package/src/eip712/getNadoEIP712Domain.ts

@@ -1,5 +1,5 @@
-import { getValidatedAddress } from '../utils/getValidatedAddress';
 import { TypedDataDomain } from 'abitype';
+import { getValidatedAddress } from '../utils/getValidatedAddress';
 
 /**
  * Gives the EIP712 data domain for order signing

package/src/eip712/index.ts

@@ -1,10 +1,10 @@
-export * from './getSignedTransactionRequest';
-export * from './getNadoEIP712Values';
-export * from './getNadoEIP712Types';
-export * from './getNadoEIP712PrimaryType';
+export * from './eip712ValueTypes';
 export * from './getNadoEIP712Domain';
+export * from './getNadoEIP712PrimaryType';
+export * from './getNadoEIP712Types';
+export * from './getNadoEIP712Values';
+export * from './getOrderVerifyingAddress';
+export * from './getSignedTransactionRequest';
 export * from './orderDigest';
 export * from './signableRequestType';
 export * from './signatureParamTypes';
-export * from './eip712ValueTypes';
-export * from './getOrderVerifyingAddress';

package/src/types/ChainEnv.ts

@@ -2,7 +2,7 @@ export const LOCAL_CHAIN_ENVS = ['local'] as const satisfies string[];
 
 export const TESTNET_CHAIN_ENVS = ['inkTestnet'] as const satisfies string[];
 
-export const MAINNET_CHAIN_ENVS = ['arbitrum'] as const satisfies string[];
+export const MAINNET_CHAIN_ENVS = ['inkMainnet'] as const satisfies string[];
 
 export const ALL_CHAIN_ENVS = [
   ...LOCAL_CHAIN_ENVS,

package/src/types/index.ts

@@ -3,9 +3,9 @@ export * from './bytes';
 export * from './ChainEnv';
 export * from './healthTypes';
 export * from './marketTypes';
+export * from './nadoContractTypes';
+export * from './orderAppendixTypes';
+export * from './OrderExecutionType';
 export * from './productTypes';
 export * from './subaccountTypes';
-export * from './nadoContractTypes';
 export * from './viemTypes';
-export * from './OrderExecutionType';
-export * from './orderAppendixTypes';

package/src/types/orderAppendixTypes.ts

@@ -13,7 +13,7 @@ export type OrderAppendixTriggerType =
 /**
  * Fields associated with a TWAP trigger order.
  */
-export interface OrderAppendixTWAPFields {
+export interface OrderAppendixTwapFields {
   /**
    * Number of TWAP orders to be placed.
    */
@@ -31,6 +31,10 @@ export interface OrderAppendixTWAPFields {
 export interface OrderAppendixIsolatedFields {
   /**
    * Amount of margin to transfer into the isolated position.
+   *
+   * Implementation Note:
+   * Packed appendix uses precision of 6 decimals on backend.
+   * SDK automatically converts to/from x18 during packing/unpacking.
    */
   margin: BigDecimalish;
 }
@@ -54,5 +58,5 @@ export interface OrderAppendix {
    * Specify if the order is a TWAP order
    * An order CANNOT be both a TWAP order and an isolated order.
    */
-  twap?: OrderAppendixTWAPFields;
+  twap?: OrderAppendixTwapFields;
 }

package/src/utils/createDeterministicLinkedSignerPrivateKey.ts

@@ -1,7 +1,7 @@
 import { keccak256 } from 'viem';
+import { getNadoEIP712Domain } from '../eip712/getNadoEIP712Domain';
 import { Subaccount } from '../types/subaccountTypes';
 import { WalletClientWithAccount } from '../types/viemTypes';
-import { getNadoEIP712Domain } from '../eip712/getNadoEIP712Domain';
 import { subaccountToHex } from './bytes32';
 
 interface Params extends Subaccount {

package/src/utils/index.ts

@@ -1,15 +1,15 @@
-export * from './orders';
-export * from './interest';
-export * from './productTypeFilter';
+export * from './asyncResult';
 export * from './balanceValue';
 export * from './bytes32';
 export * from './createDeterministicLinkedSignerPrivateKey';
-export * from './isWriteableContract';
 export * from './errors';
-export * from './math';
-export * from './asyncResult';
 export * from './getValidatedAddress';
 export * from './getValidatedHex';
+export * from './interest';
+export * from './isWriteableContract';
 export * from './mapValues';
+export * from './math';
+export * from './orders';
+export * from './productTypeFilter';
 export * from './time';
 export * from './toPrintableObject';

package/src/utils/math/index.ts

@@ -1,7 +1,7 @@
 export * from './bigDecimal';
-export * from './toIntegerString';
-export * from './toBigInt';
+export * from './BigDecimals';
 export * from './clamp';
-export * from './sumBigDecimalBy';
 export * from './decimalAdjustment';
-export * from './BigDecimals';
+export * from './sumBigDecimalBy';
+export * from './toBigInt';
+export * from './toIntegerString';

package/src/utils/orders/appendix/appendixIsolatedValue.ts

@@ -0,0 +1,49 @@
+import { OrderAppendixIsolatedFields } from '../../../types';
+import {
+  addDecimals,
+  NADO_PRODUCT_DECIMALS,
+  removeDecimals,
+  toBigInt,
+} from '../../math';
+import { bitMaskValue } from './bitMaskValue';
+
+const APPENDIX_V1_ISO_MARGIN_DECIMALS = 6;
+
+/* Appendix v1 uses x6 precision, so we need to adjust precision to/from SDK's usual precision */
+const MARGIN_DECIMAL_ADJUSTMENT =
+  NADO_PRODUCT_DECIMALS - APPENDIX_V1_ISO_MARGIN_DECIMALS;
+
+/**
+ * Packs the provided margin into a single 64-bit bigint.
+ *
+ * Bit layout (MSB → LSB):
+ * | margin_x6 |
+ * |-----------|
+ * | 63..0     |
+ * | 64 bits   |
+ *
+ */
+export function packIsolatedOrderAppendixValue({
+  margin,
+}: OrderAppendixIsolatedFields): bigint {
+  return bitMaskValue(
+    toBigInt(removeDecimals(margin, MARGIN_DECIMAL_ADJUSTMENT)),
+    64,
+  );
+}
+
+/**
+ * Unpacks a 64-bit bigint into its component fields for Isolated orders.
+ *
+ * @param value 64-bit bigint to unpack
+ * @returns Object with:
+ *   - margin_x6: bigint, from bits 63..0
+ */
+export function unpackIsolatedOrderAppendixValue(
+  value: bigint,
+): OrderAppendixIsolatedFields {
+  const margin = bitMaskValue(value, 64);
+  return {
+    margin: toBigInt(addDecimals(margin, MARGIN_DECIMAL_ADJUSTMENT)),
+  };
+}

package/src/utils/orders/appendix/appendixTwapValue.ts

@@ -0,0 +1,46 @@
+import { OrderAppendixTwapFields } from '../../../types/orderAppendixTypes';
+import { addDecimals, removeDecimals, toBigInt } from '../../math';
+
+/**
+ * Packs the provided fields into a single 64-bit bigint.
+ *
+ * Bit layout (MSB → LSB):
+ * |   times   | slippage_x6 |
+ * |-----------|-------------|
+ * | 63..32    | 31..0       |
+ * | 32 bits   | 32 bits     |
+ *
+ * - `times` occupies bits 63..32 (most significant 32 bits)
+ * - `slippage_x6` occupies bits 31..0 (least significant 32 bits)
+ */
+export function packTwapOrderAppendixValue({
+  numOrders,
+  slippageFrac,
+}: OrderAppendixTwapFields): bigint {
+  const numOrdersBigInt = toBigInt(numOrders);
+  const slippageX6BigInt = toBigInt(addDecimals(slippageFrac, 6));
+
+  return (
+    ((numOrdersBigInt & 0xffffffffn) << 32n) | (slippageX6BigInt & 0xffffffffn)
+  );
+}
+
+/**
+ * Unpacks a 64-bit bigint into its component fields for TWAP orders.
+ *
+ * @param value 64-bit bigint to unpack
+ * @returns Object with:
+ *   - times: number, from bits 63..32
+ *   - slippage_x6: number, from bits 31..0
+ */
+export function unpackTwapOrderAppendixValue(
+  value: bigint,
+): OrderAppendixTwapFields {
+  const numOrders = (value >> 32n) & 0xffffffffn;
+  const slippageX6 = value & 0xffffffffn;
+
+  return {
+    numOrders: Number(numOrders),
+    slippageFrac: removeDecimals(slippageX6, 6).toNumber(),
+  };
+}

package/src/utils/orders/appendix/index.ts

@@ -1,5 +1,5 @@
-export * from './appendixTWAPValue';
-export * from './unpackOrderAppendix';
+export * from './appendixTwapValue';
+export * from './bitMaskValue';
 export * from './packOrderAppendix';
 export * from './types';
-export * from './bitMaskValue';
+export * from './unpackOrderAppendix';

package/src/utils/orders/appendix/orderAppendix.test.ts

@@ -11,7 +11,7 @@ describe('OrderAppendix packing/unpacking', () => {
     };
     const packed = packOrderAppendix(appendix);
     const unpacked = unpackOrderAppendix(packed);
-    expect(packed).toBe(4096n);
+    expect(packed).toBe(4097n);
     expect(unpacked.orderExecutionType).toBe(appendix.orderExecutionType);
     expect(unpacked.triggerType).toBe(appendix.triggerType);
     expect(unpacked.reduceOnly).toBeFalsy();
@@ -25,7 +25,7 @@ describe('OrderAppendix packing/unpacking', () => {
     };
     const packed = packOrderAppendix(appendix);
     const unpacked = unpackOrderAppendix(packed);
-    expect(packed).toBe(6144n);
+    expect(packed).toBe(6145n);
     expect(unpacked.reduceOnly).toBe(true);
   });
 
@@ -60,12 +60,12 @@ describe('OrderAppendix packing/unpacking', () => {
       orderExecutionType: 'default',
       triggerType: 'price',
 
-      isolated: { margin: 123456789012345678901234n },
+      isolated: { margin: 12345678901000000000000n },
     };
     const packed = packOrderAppendix(appendix);
     const unpacked = unpackOrderAppendix(packed);
-    expect(packed).toBe(530242871277196831127717244047616n);
-    expect(unpacked.isolated?.margin).toBe(123456789012345678901234n);
+    expect(packed).toBe(227737579102942800187821658369n);
+    expect(unpacked.isolated?.margin).toBe(appendix.isolated?.margin);
   });
 
   it('should handle TWAP fields', () => {
@@ -77,7 +77,7 @@ describe('OrderAppendix packing/unpacking', () => {
     };
     const packed = packOrderAppendix(appendix);
     const unpacked = unpackOrderAppendix(packed);
-    expect(packed).toBe(792281717376363744483197591552n);
+    expect(packed).toBe(792281717376363744483197591553n);
     expect(unpacked.twap).toMatchObject({ numOrders: 10, slippageFrac: 0.005 });
   });
 
@@ -86,16 +86,16 @@ describe('OrderAppendix packing/unpacking', () => {
       orderExecutionType: 'post_only',
       triggerType: undefined,
       reduceOnly: true,
-      isolated: { margin: 79228162514264337593543950335n }, // 2^96-1
+      isolated: { margin: 18446744073709551615n }, // 2^64-1
     };
     const packed = packOrderAppendix(appendix);
     const unpacked = unpackOrderAppendix(packed);
     expect(unpacked.orderExecutionType).toBe(appendix.orderExecutionType);
     expect(unpacked.triggerType).toBe(appendix.triggerType);
     expect(unpacked.reduceOnly).toBe(appendix.reduceOnly);
-    expect(unpacked.isolated?.margin).toBe(79228162514264337593543950335n);
+    expect(unpacked.isolated?.margin).toBe(18446744000000000000n);
     expect(unpacked.twap).toBe(undefined);
-    expect(packed).toBe(340282366920938463463374607427473248000n);
+    expect(packed).toBe(340282365561237229015142145n);
   });
 
   it('should handle max values for all fields for TWAP orders', () => {
@@ -104,7 +104,6 @@ describe('OrderAppendix packing/unpacking', () => {
       triggerType: 'twap_custom_amounts',
       reduceOnly: true,
       twap: {
-        // max 32-bit unsigned int
         numOrders: 4294967295,
         slippageFrac: 0.000001,
       },
@@ -116,6 +115,6 @@ describe('OrderAppendix packing/unpacking', () => {
     expect(unpacked.reduceOnly).toBe(appendix.reduceOnly);
     expect(unpacked.twap?.slippageFrac).toBe(0.000001);
     expect(unpacked.twap?.numOrders).toBe(4294967295);
-    expect(packed).toBe(340282366841710300967557013911933828608n);
+    expect(packed).toBe(340282366841710300967557013911933828609n);
   });
 });

package/src/utils/orders/appendix/packOrderAppendix.ts

@@ -1,6 +1,6 @@
 import { OrderAppendix } from '../../../types/orderAppendixTypes';
-import { toBigInt } from '../../math/toBigInt';
-import { packTWAPOrderAppendixValue } from './appendixTWAPValue';
+import { packIsolatedOrderAppendixValue } from './appendixIsolatedValue';
+import { packTwapOrderAppendixValue } from './appendixTwapValue';
 import { bitMaskValue } from './bitMaskValue';
 import { PackedOrderAppendixBits } from './types';
 
@@ -9,10 +9,10 @@ function mapOrderAppendixToBitValues(
 ): PackedOrderAppendixBits {
   const value = (() => {
     if (appendix.twap) {
-      return packTWAPOrderAppendixValue(appendix.twap);
+      return packTwapOrderAppendixValue(appendix.twap);
     }
     if (appendix.isolated) {
-      return toBigInt(appendix.isolated.margin);
+      return packIsolatedOrderAppendixValue(appendix.isolated);
     }
     return 0n;
   })();
@@ -48,7 +48,7 @@ function mapOrderAppendixToBitValues(
     reduceOnly: appendix.reduceOnly ? 1 : 0,
     orderType,
     isolated: appendix.isolated ? 1 : 0,
-    version: 0,
+    version: 1,
   };
 }
 
@@ -59,9 +59,9 @@ function mapOrderAppendixToBitValues(
 export function packOrderAppendix(appendix: OrderAppendix): bigint {
   const bits = mapOrderAppendixToBitValues(appendix);
 
-  // Ensure value is within 96 bits
-  let packed = bitMaskValue(bits.value, 96);
-  packed = (packed << 18n) | bitMaskValue(bits.reserved, 18);
+  // Ensure value is within 64 bits
+  let packed = bitMaskValue(bits.value, 64);
+  packed = (packed << 50n) | bitMaskValue(bits.reserved, 50);
   packed = (packed << 2n) | bitMaskValue(bits.trigger, 2);
   packed = (packed << 1n) | bitMaskValue(bits.reduceOnly, 1);
   packed = (packed << 2n) | bitMaskValue(bits.orderType, 2);

package/src/utils/orders/appendix/types.ts

@@ -3,15 +3,15 @@
  *
  * |   value   | reserved | trigger | reduceOnly | orderType | isolated | version |
  * |-----------|----------|---------|------------|-----------|----------|---------|
- * | 127..32   | 31..14   | 13..12  | 11         | 10..9     | 8        | 7..0    |
- * |  96 bits  | 18 bits  | 2 bits  | 1 bit      | 2 bits    | 1 bit    | 8 bits  |
+ * | 127..64   | 63..14   | 13..12  | 11         | 10..9     | 8        | 7..0    |
+ * |  64 bits  | 50 bits  | 2 bits  | 1 bit      | 2 bits    | 1 bit    | 8 bits  |
  */
 export interface PackedOrderAppendixBits {
-  value: bigint; // 96 bits
-  reserved: number; // 18 bits, set to 0
+  value: bigint; // 64 bits
+  reserved: number; // 50 bits, set to 0
   trigger: number; // 2 bits
   reduceOnly: number; // 1 bit
   orderType: number; // 2 bits
   isolated: number; // 1 bit
-  version: number; // 8 bits, set to 0
+  version: number; // 8 bits, set to 1
 }

package/src/utils/orders/appendix/unpackOrderAppendix.ts

@@ -1,6 +1,7 @@
 import { OrderAppendix } from '../../../types/orderAppendixTypes';
 import { BigDecimalish, toBigInt } from '../../math';
-import { unpackTWAPOrderAppendixValue } from './appendixTWAPValue';
+import { unpackIsolatedOrderAppendixValue } from './appendixIsolatedValue';
+import { unpackTwapOrderAppendixValue } from './appendixTwapValue';
 import { bitMaskValue } from './bitMaskValue';
 import { PackedOrderAppendixBits } from './types';
 
@@ -35,13 +36,13 @@ function mapBitValuesToAppendix(bits: PackedOrderAppendixBits): OrderAppendix {
   })();
   const isolatedFields = (() => {
     if (bits.isolated) {
-      return { margin: bits.value };
+      return unpackIsolatedOrderAppendixValue(bits.value);
     }
     return undefined;
   })();
   const twapFields = (() => {
     if (triggerType === 'twap' || triggerType === 'twap_custom_amounts') {
-      return unpackTWAPOrderAppendixValue(bits.value);
+      return unpackTwapOrderAppendixValue(bits.value);
     }
   })();
 
@@ -73,10 +74,10 @@ export function unpackOrderAppendix(packed: BigDecimalish): OrderAppendix {
   temp >>= 1n;
   const trigger = Number(bitMaskValue(temp, 2));
   temp >>= 2n;
-  const reserved = Number(bitMaskValue(temp, 18));
-  temp >>= 18n;
-  // The remaining bits are the value, which should be 96 bits
-  const value = bitMaskValue(temp, 96);
+  const reserved = Number(bitMaskValue(temp, 50));
+  temp >>= 50n;
+  // The remaining bits are the value, which should be 64 bits
+  const value = bitMaskValue(temp, 64);
 
   return mapBitValuesToAppendix({
     value,

package/src/utils/orders/index.ts

@@ -1,3 +1,3 @@
+export * from './appendix';
 export * from './orderNonce';
 export * from './recvTime';
-export * from './appendix';

package/src/utils/productTypeFilter.ts

@@ -1,9 +1,9 @@
 import { Balance, PerpBalance, SpotBalance } from '../types/balanceTypes';
 import {
-  ProductEngineType,
   PerpProduct,
-  SpotProduct,
   Product,
+  ProductEngineType,
+  SpotProduct,
 } from '../types/productTypes';
 
 export function isSpotProduct(product: Product): product is SpotProduct {

package/dist/deployments/core/deployment.InkSepolia.json

@@ -1,13 +0,0 @@
-{
-  "nodeUrl": "https://rpc-gel-sepolia.inkonchain.com",
-  "explorerUrl": "https://explorer-sepolia.inkonchain.com",
-  "startBlock": 27233833,
-  "deployer": "0x8177A1b5bFaAa10A4b1178c6D42aDaa4b75c8146",
-  "quote": "0x5F65358d61A9a281ea3BB930d05889ACa21E3f4f",
-  "querier": "0x5A62e748b2630560Ffe9E928780cF9Fe0e086A21",
-  "clearinghouse": "0x5E9b4336104069467E57E843033e62c79C667F8F",
-  "endpoint": "0xf8963f7860aF7DE9b94893EDb9A3b5c155e1Fc0c",
-  "spotEngine": "0x61AA7A636df5e72eBe34c70a340eB76ABB3A15bE",
-  "perpEngine": "0x3D6Ac7105cA399884739a8CC19cAdB4178844466",
-  "withdrawPool": "0xa59613a3e4ce46E20d83b0632E3D857e3f116F66"
-}