@strobelabs/perpcity-sdk 0.2.0 → 0.3.0

package/dist/index.js

@@ -23,7 +23,6 @@ __export(index_exports, {
   BEACON_ABI: () => BEACON_ABI,
   BIGINT_1E6: () => BIGINT_1E6,
   ContractError: () => ContractError,
-  GraphQLError: () => GraphQLError,
   InsufficientFundsError: () => InsufficientFundsError,
   NUMBER_1E6: () => NUMBER_1E6,
   OpenPosition: () => OpenPosition,
@@ -38,22 +37,11 @@ __export(index_exports, {
   closePosition: () => closePosition,
   createPerp: () => createPerp,
   estimateLiquidity: () => estimateLiquidity,
-  getAllMakerPositions: () => getAllMakerPositions,
-  getAllTakerPositions: () => getAllTakerPositions,
   getPerpBeacon: () => getPerpBeacon,
   getPerpBounds: () => getPerpBounds,
   getPerpFees: () => getPerpFees,
-  getPerpFundingRate: () => getPerpFundingRate,
-  getPerpFundingRateTimeSeries: () => getPerpFundingRateTimeSeries,
-  getPerpIndex: () => getPerpIndex,
-  getPerpIndexTimeSeries: () => getPerpIndexTimeSeries,
-  getPerpLastIndexUpdate: () => getPerpLastIndexUpdate,
   getPerpMark: () => getPerpMark,
-  getPerpMarkTimeSeries: () => getPerpMarkTimeSeries,
-  getPerpOpenInterest: () => getPerpOpenInterest,
-  getPerpOpenInterestTimeSeries: () => getPerpOpenInterestTimeSeries,
   getPerpTickSpacing: () => getPerpTickSpacing,
-  getPerps: () => getPerps,
   getPositionEffectiveMargin: () => getPositionEffectiveMargin,
   getPositionFundingPayment: () => getPositionFundingPayment,
   getPositionId: () => getPositionId,
@@ -64,12 +52,8 @@ __export(index_exports, {
   getPositionLiveDetailsFromContract: () => getPositionLiveDetailsFromContract,
   getPositionPerpId: () => getPositionPerpId,
   getPositionPnl: () => getPositionPnl,
-  getTotalOpenMakerPnl: () => getTotalOpenMakerPnl,
-  getTotalOpenTakerPnl: () => getTotalOpenTakerPnl,
-  getUserClosedPositions: () => getUserClosedPositions,
+  getRpcUrl: () => getRpcUrl,
   getUserOpenPositions: () => getUserOpenPositions,
-  getUserRealizedPnl: () => getUserRealizedPnl,
-  getUserUnrealizedPnl: () => getUserUnrealizedPnl,
   getUserUsdcBalance: () => getUserUsdcBalance,
   getUserWalletAddress: () => getUserWalletAddress,
   marginRatioToLeverage: () => marginRatioToLeverage,
@@ -88,9 +72,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/context.ts
-var import_graphql_request = require("graphql-request");
 var import_viem3 = require("viem");
-var import_graphql = require("graphql");
 
 // src/utils/constants.ts
 var NUMBER_1E6 = 1e6;
@@ -155,24 +137,218 @@ async function approveUsdc(context, amount, confirmations = DEFAULT_CONFIRMATION
   });
 }
 
+// src/utils/liquidity.ts
+async function estimateLiquidity(context, tickLower, tickUpper, usdScaled) {
+  const Q962 = 1n << 96n;
+  const sqrtPriceLowerX96 = getSqrtRatioAtTick(tickLower);
+  const sqrtPriceUpperX96 = getSqrtRatioAtTick(tickUpper);
+  const sqrtPriceDiff = sqrtPriceUpperX96 - sqrtPriceLowerX96;
+  const liquidity = usdScaled * Q962 / sqrtPriceDiff;
+  return liquidity;
+}
+function getSqrtRatioAtTick(tick) {
+  const absTick = Math.abs(tick);
+  let ratio = 0xfffcb933bd6fad37aa2d162d1a594001n;
+  if (absTick & 1) ratio = ratio * 0xfff97272373d413259a46990580e213an >> 128n;
+  if (absTick & 2) ratio = ratio * 0xfff2e50f5f656932ef12357cf3c7fdccn >> 128n;
+  if (absTick & 4) ratio = ratio * 0xffe5caca7e10e4e61c3624eaa0941cd0n >> 128n;
+  if (absTick & 8) ratio = ratio * 0xffcb9843d60f6159c9db58835c926644n >> 128n;
+  if (absTick & 16) ratio = ratio * 0xff973b41fa98c081472e6896dfb254c0n >> 128n;
+  if (absTick & 32) ratio = ratio * 0xff2ea16466c96a3843ec78b326b52861n >> 128n;
+  if (absTick & 64) ratio = ratio * 0xfe5dee046a99a2a811c461f1969c3053n >> 128n;
+  if (absTick & 128) ratio = ratio * 0xfcbe86c7900a88aedcffc83b479aa3a4n >> 128n;
+  if (absTick & 256) ratio = ratio * 0xf987a7253ac413176f2b074cf7815e54n >> 128n;
+  if (absTick & 512) ratio = ratio * 0xf3392b0822b70005940c7a398e4b70f3n >> 128n;
+  if (absTick & 1024) ratio = ratio * 0xe7159475a2c29b7443b29c7fa6e889d9n >> 128n;
+  if (absTick & 2048) ratio = ratio * 0xd097f3bdfd2022b8845ad8f792aa5825n >> 128n;
+  if (absTick & 4096) ratio = ratio * 0xa9f746462d870fdf8a65dc1f90e061e5n >> 128n;
+  if (absTick & 8192) ratio = ratio * 0x70d869a156d2a1b890bb3df62baf32f7n >> 128n;
+  if (absTick & 16384) ratio = ratio * 0x31be135f97d08fd981231505542fcfa6n >> 128n;
+  if (absTick & 32768) ratio = ratio * 0x9aa508b5b7a84e1c677de54f3e99bc9n >> 128n;
+  if (absTick & 65536) ratio = ratio * 0x5d6af8dedb81196699c329225ee604n >> 128n;
+  if (absTick & 131072) ratio = ratio * 0x2216e584f5fa1ea926041bedfe98n >> 128n;
+  if (absTick & 262144) ratio = ratio * 0x48a170391f7dc42444e8fa2n >> 128n;
+  if (tick > 0) ratio = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffn / ratio;
+  return ratio % (1n << 32n) > 0n ? (ratio >> 32n) + 1n : ratio >> 32n;
+}
+
+// src/utils/errors.ts
+var import_viem2 = require("viem");
+var PerpCityError = class extends Error {
+  constructor(message, cause) {
+    super(message);
+    this.cause = cause;
+    this.name = "PerpCityError";
+  }
+};
+var ContractError = class extends PerpCityError {
+  constructor(message, errorName, args, cause) {
+    super(message, cause);
+    this.errorName = errorName;
+    this.args = args;
+    this.name = "ContractError";
+  }
+};
+var TransactionRejectedError = class extends PerpCityError {
+  constructor(message = "Transaction rejected by user", cause) {
+    super(message, cause);
+    this.name = "TransactionRejectedError";
+  }
+};
+var InsufficientFundsError = class extends PerpCityError {
+  constructor(message = "Insufficient funds for transaction", cause) {
+    super(message, cause);
+    this.name = "InsufficientFundsError";
+  }
+};
+var RPCError = class extends PerpCityError {
+  constructor(message, cause) {
+    super(message, cause);
+    this.name = "RPCError";
+  }
+};
+var ValidationError = class extends PerpCityError {
+  constructor(message, cause) {
+    super(message, cause);
+    this.name = "ValidationError";
+  }
+};
+function parseContractError(error) {
+  if (error instanceof PerpCityError) {
+    return error;
+  }
+  if (error instanceof import_viem2.BaseError) {
+    const revertError = error.walk((err) => err instanceof import_viem2.ContractFunctionRevertedError);
+    if (revertError instanceof import_viem2.ContractFunctionRevertedError) {
+      const errorName = revertError.data?.errorName ?? "Unknown";
+      const args = revertError.data?.args ?? [];
+      const message = formatContractError(errorName, args);
+      return new ContractError(message, errorName, args, error);
+    }
+    if (error.message?.includes("User rejected") || error.code === 4001) {
+      return new TransactionRejectedError(error.message, error);
+    }
+    if (error.message?.includes("insufficient funds")) {
+      return new InsufficientFundsError(error.message, error);
+    }
+    return new PerpCityError(error.shortMessage || error.message, error);
+  }
+  if (error instanceof Error) {
+    return new PerpCityError(error.message, error);
+  }
+  return new PerpCityError(String(error));
+}
+function formatContractError(errorName, args) {
+  switch (errorName) {
+    case "InvalidBeaconAddress":
+      return `Invalid beacon address: ${args[0]}`;
+    case "InvalidTradingFeeSplits":
+      return `Invalid trading fee splits. Insurance split: ${args[0]}, Creator split: ${args[1]}`;
+    case "InvalidMaxOpeningLev":
+      return `Invalid maximum opening leverage: ${args[0]}`;
+    case "InvalidLiquidationLev":
+      return `Invalid liquidation leverage: ${args[0]}. Must be less than max opening leverage: ${args[1]}`;
+    case "InvalidLiquidationFee":
+      return `Invalid liquidation fee: ${args[0]}`;
+    case "InvalidLiquidatorFeeSplit":
+      return `Invalid liquidator fee split: ${args[0]}`;
+    case "InvalidClose":
+      return `Cannot close position. Caller: ${args[0]}, Holder: ${args[1]}, Is Liquidated: ${args[2]}`;
+    case "InvalidCaller":
+      return `Invalid caller. Expected: ${args[1]}, Got: ${args[0]}`;
+    case "InvalidLiquidity":
+      return `Invalid liquidity amount: ${args[0]}`;
+    case "InvalidMargin":
+      return `Invalid margin amount: ${args[0]}`;
+    case "InvalidLevX96":
+      return `Invalid leverage: ${args[0]}. Maximum allowed: ${args[1]}`;
+    case "MakerPositionLocked":
+      return `Maker position is locked until ${new Date(Number(args[1]) * 1e3).toISOString()}. Current time: ${new Date(Number(args[0]) * 1e3).toISOString()}`;
+    case "MaximumAmountExceeded":
+      return `Maximum amount exceeded. Maximum: ${args[0]}, Requested: ${args[1]}`;
+    case "MinimumAmountInsufficient":
+      return `Minimum amount not met. Required: ${args[0]}, Received: ${args[1]}`;
+    case "PriceImpactTooHigh":
+      return `Price impact too high. Current price: ${args[0]}, Min acceptable: ${args[1]}, Max acceptable: ${args[2]}`;
+    case "SwapReverted":
+      return "Swap failed. This may be due to insufficient liquidity or slippage tolerance.";
+    case "ZeroSizePosition":
+      return `Cannot create zero-size position. Perp delta: ${args[0]}, USD delta: ${args[1]}`;
+    case "InvalidFundingInterval":
+      return `Invalid funding interval: ${args[0]}`;
+    case "InvalidPriceImpactBand":
+      return `Invalid price impact band: ${args[0]}`;
+    case "InvalidMarketDeathThreshold":
+      return `Invalid market death threshold: ${args[0]}`;
+    case "InvalidTickRange":
+      return `Invalid tick range. Lower: ${args[0]}, Upper: ${args[1]}`;
+    case "MarketNotKillable":
+      return `Market health (${args[0]}) is above death threshold (${args[1]}). Market cannot be killed yet.`;
+    case "InvalidStartingSqrtPriceX96":
+      return `Invalid starting sqrt price: ${args[0]}`;
+    default:
+      return `Contract error: ${errorName}${args.length > 0 ? ` (${args.join(", ")})` : ""}`;
+  }
+}
+async function withErrorHandling(fn, context) {
+  try {
+    return await fn();
+  } catch (error) {
+    const parsedError = parseContractError(error);
+    parsedError.message = `${context}: ${parsedError.message}`;
+    throw parsedError;
+  }
+}
+
+// src/utils/rpc.ts
+function getRpcUrl(config = {}) {
+  const rpcUrl = config.url ?? process.env.RPC_URL;
+  if (!rpcUrl) {
+    throw new Error(
+      "RPC_URL is required. Please set the RPC_URL environment variable with your full RPC endpoint URL.\nExample URLs (use your own provider and API key):\n  https://base-sepolia.g.alchemy.com/v2/YOUR_API_KEY\n  https://base-sepolia.infura.io/v3/YOUR_API_KEY\n  https://sepolia.base.org"
+    );
+  }
+  return rpcUrl;
+}
+
 // src/abis/perp-manager.ts
 var PERP_MANAGER_ABI = [
   {
     "inputs": [
-      {
-        "internalType": "contract IPoolManager",
-        "name": "poolManager",
-        "type": "address"
-      },
       {
         "internalType": "address",
-        "name": "usdc",
+        "name": "owner",
         "type": "address"
       }
     ],
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
+  {
+    "inputs": [],
+    "name": "AccountBalanceOverflow",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "AlreadyInitialized",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "BalanceQueryForZeroAddress",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "FeeTooLarge",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "FeesNotRegistered",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -185,42 +361,10 @@ var PERP_MANAGER_ABI = [
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "caller",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "expectedCaller",
-        "type": "address"
-      }
-    ],
+    "inputs": [],
     "name": "InvalidCaller",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "caller",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "holder",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "isLiquidated",
-        "type": "bool"
-      }
-    ],
-    "name": "InvalidClose",
-    "type": "error"
-  },
   {
     "inputs": [
       {
@@ -233,13 +377,7 @@ var PERP_MANAGER_ABI = [
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "margin",
-        "type": "uint256"
-      }
-    ],
+    "inputs": [],
     "name": "InvalidMargin",
     "type": "error"
   },
@@ -247,16 +385,26 @@ var PERP_MANAGER_ABI = [
     "inputs": [
       {
         "internalType": "uint256",
-        "name": "currentTimestamp",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "lockupPeriodEnd",
+        "name": "marginRatio",
         "type": "uint256"
       }
     ],
-    "name": "MakerPositionLocked",
+    "name": "InvalidMarginRatio",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "LockupPeriodNotRegistered",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MakerNotAllowed",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "MarginRatiosNotRegistered",
     "type": "error"
   },
   {
@@ -291,47 +439,161 @@ var PERP_MANAGER_ABI = [
     "name": "MinimumAmountInsufficient",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "ModuleAlreadyRegistered",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NewOwnerIsZeroAddress",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoHandoverRequest",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotOwnerNorApproved",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "NotPoolManager",
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "reason",
-        "type": "bytes"
-      }
-    ],
-    "name": "UnexpectedRevertBytes",
+    "inputs": [],
+    "name": "PositionLocked",
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "int256",
-        "name": "perpDelta",
-        "type": "int256"
-      },
-      {
-        "internalType": "int256",
-        "name": "usdDelta",
-        "type": "int256"
-      }
-    ],
-    "name": "ZeroSizePosition",
+    "inputs": [],
+    "name": "SqrtPriceImpactLimitNotRegistered",
     "type": "error"
   },
   {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
+    "inputs": [],
+    "name": "TokenAlreadyExists",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TokenDoesNotExist",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TransferFromIncorrectOwner",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TransferToNonERC721ReceiverImplementer",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TransferToZeroAddress",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "Unauthorized",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ZeroDelta",
+    "type": "error"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "isApproved",
+        "type": "bool"
+      }
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "contract IFees",
+        "name": "feesModule",
+        "type": "address"
+      }
+    ],
+    "name": "FeesModuleRegistered",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "contract ILockupPeriod",
+        "name": "lockupPeriodModule",
+        "type": "address"
+      }
+    ],
+    "name": "LockupPeriodModuleRegistered",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "PoolId",
+        "name": "perpId",
+        "type": "bytes32"
+      },
       {
         "indexed": false,
         "internalType": "uint256",
@@ -345,7 +607,108 @@ var PERP_MANAGER_ABI = [
         "type": "uint256"
       }
     ],
-    "name": "MarginAdded",
+    "name": "MarginAdjusted",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "contract IMarginRatios",
+        "name": "marginRatiosModule",
+        "type": "address"
+      }
+    ],
+    "name": "MarginRatiosModuleRegistered",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "PoolId",
+        "name": "perpId",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "sqrtPriceX96",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "longOI",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "shortOI",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "int256",
+        "name": "newPerpDelta",
+        "type": "int256"
+      }
+    ],
+    "name": "NotionalAdjusted",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "pendingOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipHandoverCanceled",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "pendingOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipHandoverRequested",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "oldOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
     "type": "event"
   },
   {
@@ -366,7 +729,7 @@ var PERP_MANAGER_ABI = [
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "startingSqrtPriceX96",
+        "name": "sqrtPriceX96",
         "type": "uint256"
       },
       {
@@ -391,32 +754,26 @@ var PERP_MANAGER_ABI = [
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "posId",
+        "name": "sqrtPriceX96",
         "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "address",
-        "name": "holder",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "wasMaker",
-        "type": "bool"
+        "internalType": "uint256",
+        "name": "longOI",
+        "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "int256",
-        "name": "perpDelta",
-        "type": "int256"
+        "internalType": "uint256",
+        "name": "shortOI",
+        "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "int256",
-        "name": "pnl",
-        "type": "int256"
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
       },
       {
         "indexed": false,
@@ -426,15 +783,9 @@ var PERP_MANAGER_ABI = [
       },
       {
         "indexed": false,
-        "internalType": "uint256",
-        "name": "sqrtPriceX96",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "int256",
-        "name": "fundingPremiumPerSecX96",
-        "type": "int256"
+        "internalType": "bool",
+        "name": "wasPartialClose",
+        "type": "bool"
       }
     ],
     "name": "PositionClosed",
@@ -452,37 +803,37 @@ var PERP_MANAGER_ABI = [
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "posId",
+        "name": "sqrtPriceX96",
         "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "address",
-        "name": "holder",
-        "type": "address"
+        "internalType": "uint256",
+        "name": "longOI",
+        "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "bool",
-        "name": "isMaker",
-        "type": "bool"
+        "internalType": "uint256",
+        "name": "shortOI",
+        "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "int256",
-        "name": "perpDelta",
-        "type": "int256"
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
       },
       {
         "indexed": false,
-        "internalType": "uint256",
-        "name": "sqrtPriceX96",
-        "type": "uint256"
+        "internalType": "bool",
+        "name": "isMaker",
+        "type": "bool"
       },
       {
         "indexed": false,
         "internalType": "int256",
-        "name": "fundingPremiumPerSecX96",
+        "name": "entryPerpDelta",
         "type": "int256"
       }
     ],
@@ -490,74 +841,283 @@ var PERP_MANAGER_ABI = [
     "type": "event"
   },
   {
-    "inputs": [],
-    "name": "POOL_MANAGER",
-    "outputs": [
+    "anonymous": false,
+    "inputs": [
       {
-        "internalType": "contract IPoolManager",
-        "name": "",
+        "indexed": false,
+        "internalType": "contract ISqrtPriceImpactLimit",
+        "name": "sqrtPriceImpactLimitModule",
         "type": "address"
       }
     ],
-    "stateMutability": "view",
-    "type": "function"
+    "name": "SqrtPriceImpactLimitModuleRegistered",
+    "type": "event"
   },
   {
-    "inputs": [],
-    "name": "USDC",
-    "outputs": [
+    "anonymous": false,
+    "inputs": [
       {
+        "indexed": true,
         "internalType": "address",
-        "name": "",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
         "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
       }
     ],
-    "stateMutability": "view",
-    "type": "function"
+    "name": "Transfer",
+    "type": "event"
   },
   {
-    "inputs": [
+    "inputs": [],
+    "name": "ERC721_NAME",
+    "outputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "ERC721_SYMBOL",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "ERC721_URI",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "MAX_PROTOCOL_FEE",
+    "outputs": [
+      {
+        "internalType": "uint24",
+        "name": "",
+        "type": "uint24"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "components": [
           {
-            "internalType": "uint128",
+            "internalType": "uint256",
             "name": "posId",
-            "type": "uint128"
+            "type": "uint256"
           },
+          {
+            "internalType": "int256",
+            "name": "marginDelta",
+            "type": "int256"
+          }
+        ],
+        "internalType": "struct IPerpManager.AdjustMarginParams",
+        "name": "params",
+        "type": "tuple"
+      }
+    ],
+    "name": "adjustMargin",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
           {
             "internalType": "uint256",
-            "name": "margin",
+            "name": "posId",
             "type": "uint256"
+          },
+          {
+            "internalType": "int256",
+            "name": "perpDelta",
+            "type": "int256"
+          },
+          {
+            "internalType": "uint128",
+            "name": "usdLimit",
+            "type": "uint128"
           }
         ],
-        "internalType": "struct IPerpManager.AddMarginParams",
+        "internalType": "struct IPerpManager.AdjustNotionalParams",
         "name": "params",
         "type": "tuple"
       }
     ],
-    "name": "addMargin",
+    "name": "adjustNotional",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "result",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "cancelOwnershipHandover",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
         "internalType": "PoolId",
-        "name": "perpId",
+        "name": "",
         "type": "bytes32"
+      }
+    ],
+    "name": "cfgs",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "Currency",
+            "name": "currency0",
+            "type": "address"
+          },
+          {
+            "internalType": "Currency",
+            "name": "currency1",
+            "type": "address"
+          },
+          {
+            "internalType": "uint24",
+            "name": "fee",
+            "type": "uint24"
+          },
+          {
+            "internalType": "int24",
+            "name": "tickSpacing",
+            "type": "int24"
+          },
+          {
+            "internalType": "contract IHooks",
+            "name": "hooks",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct PoolKey",
+        "name": "key",
+        "type": "tuple"
+      },
+      {
+        "internalType": "address",
+        "name": "creator",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "vault",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "beacon",
+        "type": "address"
+      },
+      {
+        "internalType": "contract IFees",
+        "name": "fees",
+        "type": "address"
+      },
+      {
+        "internalType": "contract IMarginRatios",
+        "name": "marginRatios",
+        "type": "address"
       },
+      {
+        "internalType": "contract ILockupPeriod",
+        "name": "lockupPeriod",
+        "type": "address"
+      },
+      {
+        "internalType": "contract ISqrtPriceImpactLimit",
+        "name": "sqrtPriceImpactLimit",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "components": [
           {
-            "internalType": "uint128",
+            "internalType": "uint256",
             "name": "posId",
-            "type": "uint128"
+            "type": "uint256"
           },
           {
             "internalType": "uint128",
@@ -581,29 +1141,69 @@ var PERP_MANAGER_ABI = [
       }
     ],
     "name": "closePosition",
-    "outputs": [
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint128",
-        "name": "posId",
-        "type": "uint128"
+        "internalType": "address",
+        "name": "recipient",
+        "type": "address"
       }
     ],
+    "name": "collectProtocolFees",
+    "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "pendingOwner",
+        "type": "address"
+      }
+    ],
+    "name": "completeOwnershipHandover",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
         "components": [
-          {
-            "internalType": "uint160",
-            "name": "startingSqrtPriceX96",
-            "type": "uint160"
-          },
           {
             "internalType": "address",
             "name": "beacon",
             "type": "address"
+          },
+          {
+            "internalType": "contract IFees",
+            "name": "fees",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IMarginRatios",
+            "name": "marginRatios",
+            "type": "address"
+          },
+          {
+            "internalType": "contract ILockupPeriod",
+            "name": "lockupPeriod",
+            "type": "address"
+          },
+          {
+            "internalType": "contract ISqrtPriceImpactLimit",
+            "name": "sqrtPriceImpactLimit",
+            "type": "address"
+          },
+          {
+            "internalType": "uint160",
+            "name": "startingSqrtPriceX96",
+            "type": "uint160"
           }
         ],
         "internalType": "struct IPerpManager.CreatePerpParams",
@@ -624,31 +1224,21 @@ var PERP_MANAGER_ABI = [
   },
   {
     "inputs": [
-      {
-        "internalType": "int24",
-        "name": "tickA",
-        "type": "int24"
-      },
-      {
-        "internalType": "int24",
-        "name": "tickB",
-        "type": "int24"
-      },
       {
         "internalType": "uint256",
-        "name": "amount1",
+        "name": "id",
         "type": "uint256"
       }
     ],
-    "name": "estimateLiquidityForAmount1",
+    "name": "getApproved",
     "outputs": [
       {
-        "internalType": "uint128",
-        "name": "liquidity",
-        "type": "uint128"
+        "internalType": "address",
+        "name": "result",
+        "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -657,29 +1247,37 @@ var PERP_MANAGER_ABI = [
         "internalType": "PoolId",
         "name": "perpId",
         "type": "bytes32"
+      },
+      {
+        "internalType": "uint16",
+        "name": "cardinalityCap",
+        "type": "uint16"
       }
     ],
-    "name": "fees",
-    "outputs": [
+    "name": "increaseCardinalityCap",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint24",
-        "name": "creatorFee",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "insurnaceFee",
-        "type": "uint24"
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
       },
       {
-        "internalType": "uint24",
-        "name": "lpFee",
-        "type": "uint24"
-      },
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "name": "isApprovedForAll",
+    "outputs": [
       {
-        "internalType": "uint24",
-        "name": "liquidationFee",
-        "type": "uint24"
+        "internalType": "bool",
+        "name": "result",
+        "type": "bool"
       }
     ],
     "stateMutability": "view",
@@ -688,91 +1286,17 @@ var PERP_MANAGER_ABI = [
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint128",
-        "name": "posId",
-        "type": "uint128"
+        "internalType": "contract IFees",
+        "name": "",
+        "type": "address"
       }
     ],
-    "name": "getPosition",
+    "name": "isFeesRegistered",
     "outputs": [
       {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "holder",
-            "type": "address"
-          },
-          {
-            "internalType": "uint256",
-            "name": "margin",
-            "type": "uint256"
-          },
-          {
-            "internalType": "int256",
-            "name": "perpDelta",
-            "type": "int256"
-          },
-          {
-            "internalType": "int256",
-            "name": "usdDelta",
-            "type": "int256"
-          },
-          {
-            "internalType": "int256",
-            "name": "entryTwPremiumX96",
-            "type": "int256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "entryTimestamp",
-                "type": "uint32"
-              },
-              {
-                "internalType": "int24",
-                "name": "tickLower",
-                "type": "int24"
-              },
-              {
-                "internalType": "int24",
-                "name": "tickUpper",
-                "type": "int24"
-              },
-              {
-                "internalType": "uint128",
-                "name": "liquidity",
-                "type": "uint128"
-              },
-              {
-                "internalType": "int256",
-                "name": "entryTwPremiumGrowthInsideX96",
-                "type": "int256"
-              },
-              {
-                "internalType": "int256",
-                "name": "entryTwPremiumDivBySqrtPriceGrowthInsideX96",
-                "type": "int256"
-              },
-              {
-                "internalType": "int256",
-                "name": "entryTwPremiumGrowthBelowX96",
-                "type": "int256"
-              }
-            ],
-            "internalType": "struct IPerpManager.MakerDetails",
-            "name": "makerDetails",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IPerpManager.Position",
+        "internalType": "bool",
         "name": "",
-        "type": "tuple"
+        "type": "bool"
       }
     ],
     "stateMutability": "view",
@@ -781,22 +1305,17 @@ var PERP_MANAGER_ABI = [
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "secondsAgo",
-        "type": "uint32"
+        "internalType": "contract ILockupPeriod",
+        "name": "",
+        "type": "address"
       }
     ],
-    "name": "getTimeWeightedAvg",
+    "name": "isLockupPeriodRegistered",
     "outputs": [
       {
-        "internalType": "uint256",
+        "internalType": "bool",
         "name": "",
-        "type": "uint256"
+        "type": "bool"
       }
     ],
     "stateMutability": "view",
@@ -805,63 +1324,65 @@ var PERP_MANAGER_ABI = [
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
+        "internalType": "contract IMarginRatios",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "isMarginRatiosRegistered",
+    "outputs": [
       {
-        "internalType": "uint32",
-        "name": "cardinalityNext",
-        "type": "uint32"
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
       }
     ],
-    "name": "increaseCardinalityNext",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint128",
-        "name": "posId",
-        "type": "uint128"
+        "internalType": "contract ISqrtPriceImpactLimit",
+        "name": "",
+        "type": "address"
       }
     ],
-    "name": "livePositionDetails",
+    "name": "isSqrtPriceImpactLimitRegistered",
     "outputs": [
-      {
-        "internalType": "int256",
-        "name": "pnl",
-        "type": "int256"
-      },
-      {
-        "internalType": "int256",
-        "name": "fundingPayment",
-        "type": "int256"
-      },
-      {
-        "internalType": "int256",
-        "name": "effectiveMargin",
-        "type": "int256"
-      },
       {
         "internalType": "bool",
-        "name": "isLiquidatable",
+        "name": "",
         "type": "bool"
-      },
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "nextPosId",
+    "outputs": [
       {
         "internalType": "uint256",
-        "name": "newPriceX96",
+        "name": "",
         "type": "uint256"
       }
     ],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -873,6 +1394,11 @@ var PERP_MANAGER_ABI = [
       },
       {
         "components": [
+          {
+            "internalType": "address",
+            "name": "holder",
+            "type": "address"
+          },
           {
             "internalType": "uint256",
             "name": "margin",
@@ -909,12 +1435,12 @@ var PERP_MANAGER_ABI = [
         "type": "tuple"
       }
     ],
-    "name": "openMakerPosition",
+    "name": "openMakerPos",
     "outputs": [
       {
-        "internalType": "uint128",
-        "name": "makerPosId",
-        "type": "uint128"
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
       }
     ],
     "stateMutability": "nonpayable",
@@ -929,6 +1455,11 @@ var PERP_MANAGER_ABI = [
       },
       {
         "components": [
+          {
+            "internalType": "address",
+            "name": "holder",
+            "type": "address"
+          },
           {
             "internalType": "bool",
             "name": "isLong",
@@ -955,264 +1486,233 @@ var PERP_MANAGER_ABI = [
         "type": "tuple"
       }
     ],
-    "name": "openTakerPosition",
+    "name": "openTakerPos",
     "outputs": [
       {
-        "internalType": "uint128",
-        "name": "takerPosId",
-        "type": "uint128"
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
       }
     ],
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "result",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "",
-        "type": "bytes32"
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
       }
     ],
-    "name": "perps",
+    "name": "ownerOf",
     "outputs": [
       {
         "internalType": "address",
-        "name": "vault",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "beacon",
+        "name": "result",
         "type": "address"
-      },
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "internalType": "address",
-        "name": "creator",
+        "name": "pendingOwner",
         "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "creationTimestamp",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "makerLockupPeriod",
-        "type": "uint32"
-      },
+      }
+    ],
+    "name": "ownershipHandoverExpiresAt",
+    "outputs": [
       {
-        "internalType": "uint32",
-        "name": "twapWindow",
-        "type": "uint32"
-      },
+        "internalType": "uint256",
+        "name": "result",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint32",
-        "name": "lastTwPremiumsUpdate",
-        "type": "uint32"
-      },
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "positions",
+    "outputs": [
       {
-        "internalType": "uint24",
-        "name": "creatorFee",
-        "type": "uint24"
+        "internalType": "PoolId",
+        "name": "perpId",
+        "type": "bytes32"
       },
       {
-        "internalType": "uint24",
-        "name": "insuranceFee",
-        "type": "uint24"
+        "internalType": "uint256",
+        "name": "margin",
+        "type": "uint256"
       },
       {
-        "internalType": "uint24",
-        "name": "liquidationFee",
-        "type": "uint24"
+        "internalType": "int256",
+        "name": "entryPerpDelta",
+        "type": "int256"
       },
       {
-        "internalType": "uint24",
-        "name": "liquidatorFeeSplit",
-        "type": "uint24"
+        "internalType": "int256",
+        "name": "entryUsdDelta",
+        "type": "int256"
       },
       {
-        "internalType": "uint128",
-        "name": "nextPosId",
-        "type": "uint128"
+        "internalType": "int256",
+        "name": "entryCumlFundingX96",
+        "type": "int256"
       },
       {
         "internalType": "uint256",
-        "name": "sqrtPriceLowerMultiX96",
+        "name": "entryCumlBadDebtX96",
         "type": "uint256"
       },
       {
         "internalType": "uint256",
-        "name": "sqrtPriceUpperMultiX96",
+        "name": "entryCumlUtilizationX96",
         "type": "uint256"
       },
-      {
-        "internalType": "uint24",
-        "name": "minOpeningMargin",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "minMakerOpeningMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "maxMakerOpeningMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "makerLiquidationMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "minTakerOpeningMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "maxTakerOpeningMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "uint24",
-        "name": "takerLiquidationMarginRatio",
-        "type": "uint24"
-      },
-      {
-        "internalType": "int256",
-        "name": "twPremiumX96",
-        "type": "int256"
-      },
-      {
-        "internalType": "int256",
-        "name": "twPremiumDivBySqrtPriceX96",
-        "type": "int256"
-      },
-      {
-        "internalType": "int256",
-        "name": "premiumPerSecondX96",
-        "type": "int256"
-      },
       {
         "components": [
-          {
-            "internalType": "Currency",
-            "name": "currency0",
-            "type": "address"
-          },
-          {
-            "internalType": "Currency",
-            "name": "currency1",
-            "type": "address"
-          },
           {
             "internalType": "uint24",
-            "name": "fee",
+            "name": "min",
             "type": "uint24"
           },
           {
-            "internalType": "int24",
-            "name": "tickSpacing",
-            "type": "int24"
+            "internalType": "uint24",
+            "name": "max",
+            "type": "uint24"
           },
           {
-            "internalType": "contract IHooks",
-            "name": "hooks",
-            "type": "address"
+            "internalType": "uint24",
+            "name": "liq",
+            "type": "uint24"
           }
         ],
-        "internalType": "struct PoolKey",
-        "name": "key",
+        "internalType": "struct IMarginRatios.MarginRatios",
+        "name": "marginRatios",
         "type": "tuple"
       },
       {
         "components": [
           {
-            "internalType": "uint128",
-            "name": "baseFeeX96",
-            "type": "uint128"
-          },
-          {
-            "internalType": "uint128",
-            "name": "startFeeX96",
-            "type": "uint128"
-          },
-          {
-            "internalType": "uint128",
-            "name": "targetFeeX96",
-            "type": "uint128"
+            "internalType": "uint32",
+            "name": "unlockTimestamp",
+            "type": "uint32"
           },
           {
-            "internalType": "uint128",
-            "name": "decay",
-            "type": "uint128"
+            "internalType": "int24",
+            "name": "tickLower",
+            "type": "int24"
           },
           {
-            "internalType": "uint128",
-            "name": "volatilityScalerX96",
-            "type": "uint128"
+            "internalType": "int24",
+            "name": "tickUpper",
+            "type": "int24"
           },
           {
             "internalType": "uint128",
-            "name": "maxFeeMultiplierX96",
+            "name": "liquidity",
             "type": "uint128"
-          }
-        ],
-        "internalType": "struct TradingFee.Config",
-        "name": "tradingFeeConfig",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "index",
-            "type": "uint32"
           },
           {
-            "internalType": "uint32",
-            "name": "cardinality",
-            "type": "uint32"
+            "internalType": "int256",
+            "name": "entryCumlFundingBelowX96",
+            "type": "int256"
           },
           {
-            "internalType": "uint32",
-            "name": "cardinalityNext",
-            "type": "uint32"
+            "internalType": "int256",
+            "name": "entryCumlFundingWithinX96",
+            "type": "int256"
           },
           {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "blockTimestamp",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint216",
-                "name": "cumulativeValue",
-                "type": "uint216"
-              },
-              {
-                "internalType": "bool",
-                "name": "initialized",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct TimeWeightedAvg.Observation[65535]",
-            "name": "observations",
-            "type": "tuple[65535]"
+            "internalType": "int256",
+            "name": "entryCumlFundingDivSqrtPWithinX96",
+            "type": "int256"
           }
         ],
-        "internalType": "struct TimeWeightedAvg.State",
-        "name": "twapState",
+        "internalType": "struct IPerpManager.MakerDetails",
+        "name": "makerDetails",
         "type": "tuple"
       }
     ],
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "protocolFee",
+    "outputs": [
+      {
+        "internalType": "uint24",
+        "name": "",
+        "type": "uint24"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
+      }
+    ],
+    "name": "quoteClosePosition",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "success",
+        "type": "bool"
+      },
+      {
+        "internalType": "int256",
+        "name": "pnl",
+        "type": "int256"
+      },
+      {
+        "internalType": "int256",
+        "name": "funding",
+        "type": "int256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "netMargin",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bool",
+        "name": "wasLiquidated",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1222,6 +1722,11 @@ var PERP_MANAGER_ABI = [
       },
       {
         "components": [
+          {
+            "internalType": "address",
+            "name": "holder",
+            "type": "address"
+          },
           {
             "internalType": "uint256",
             "name": "margin",
@@ -1258,7 +1763,7 @@ var PERP_MANAGER_ABI = [
         "type": "tuple"
       }
     ],
-    "name": "quoteMakerPosition",
+    "name": "quoteOpenMakerPosition",
     "outputs": [
       {
         "internalType": "bool",
@@ -1274,21 +1779,6 @@ var PERP_MANAGER_ABI = [
         "internalType": "int256",
         "name": "usdDelta",
         "type": "int256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "creatorFeeAmt",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "insuranceFeeAmt",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "lpFeeAmt",
-        "type": "uint256"
       }
     ],
     "stateMutability": "nonpayable",
@@ -1303,6 +1793,11 @@ var PERP_MANAGER_ABI = [
       },
       {
         "components": [
+          {
+            "internalType": "address",
+            "name": "holder",
+            "type": "address"
+          },
           {
             "internalType": "bool",
             "name": "isLong",
@@ -1329,7 +1824,7 @@ var PERP_MANAGER_ABI = [
         "type": "tuple"
       }
     ],
-    "name": "quoteTakerPosition",
+    "name": "quoteOpenTakerPosition",
     "outputs": [
       {
         "internalType": "bool",
@@ -1345,21 +1840,6 @@ var PERP_MANAGER_ABI = [
         "internalType": "int256",
         "name": "usdDelta",
         "type": "int256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "creatorFeeAmt",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "insuranceFeeAmt",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "lpFeeAmt",
-        "type": "uint256"
       }
     ],
     "stateMutability": "nonpayable",
@@ -1368,268 +1848,314 @@ var PERP_MANAGER_ABI = [
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
+        "internalType": "contract IFees",
+        "name": "feesModule",
+        "type": "address"
       }
     ],
-    "name": "sqrtPriceX96",
-    "outputs": [
+    "name": "registerFeesModule",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint160",
-        "name": "sqrtPrice",
-        "type": "uint160"
+        "internalType": "contract ILockupPeriod",
+        "name": "lockupPeriodModule",
+        "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "name": "registerLockupPeriodModule",
+    "outputs": [],
+    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
+        "internalType": "contract IMarginRatios",
+        "name": "marginRatiosModule",
+        "type": "address"
       }
     ],
-    "name": "tickSpacing",
-    "outputs": [
+    "name": "registerMarginRatiosModule",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "int24",
-        "name": "",
-        "type": "int24"
+        "internalType": "contract ISqrtPriceImpactLimit",
+        "name": "sqrtPriceImpactLimitModule",
+        "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "name": "registerSqrtPriceImpactLimitModule",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "requestOwnershipHandover",
+    "outputs": [],
+    "stateMutability": "payable",
     "type": "function"
   },
   {
     "inputs": [
       {
-        "internalType": "PoolId",
-        "name": "perpId",
-        "type": "bytes32"
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
       }
     ],
-    "name": "tradingBounds",
-    "outputs": [
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint24",
-        "name": "minOpeningMargin",
-        "type": "uint24"
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
       },
       {
-        "internalType": "uint24",
-        "name": "minMakerMarginRatio",
-        "type": "uint24"
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
       },
       {
-        "internalType": "uint24",
-        "name": "maxMakerMarginRatio",
-        "type": "uint24"
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
       },
       {
-        "internalType": "uint24",
-        "name": "makerLiquidationMarginRatio",
-        "type": "uint24"
-      },
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
-        "internalType": "uint24",
-        "name": "minTakerMarginRatio",
-        "type": "uint24"
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
       },
       {
-        "internalType": "uint24",
-        "name": "maxTakerMarginRatio",
-        "type": "uint24"
-      },
+        "internalType": "bool",
+        "name": "isApproved",
+        "type": "bool"
+      }
+    ],
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       {
         "internalType": "uint24",
-        "name": "takerLiquidationMarginRatio",
+        "name": "newProtocolFee",
         "type": "uint24"
       }
     ],
-    "stateMutability": "view",
+    "name": "setProtocolFee",
+    "outputs": [],
+    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "inputs": [
       {
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
       }
     ],
-    "name": "unlockCallback",
+    "name": "supportsInterface",
     "outputs": [
       {
-        "internalType": "bytes",
-        "name": "encodedDelta",
-        "type": "bytes"
+        "internalType": "bool",
+        "name": "result",
+        "type": "bool"
       }
     ],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "PoolId",
+        "name": "perpId",
+        "type": "bytes32"
+      }
+    ],
+    "name": "takerOpenInterest",
+    "outputs": [
+      {
+        "internalType": "uint128",
+        "name": "longOI",
+        "type": "uint128"
+      },
+      {
+        "internalType": "uint128",
+        "name": "shortOI",
+        "type": "uint128"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "PoolId",
+        "name": "perpId",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint32",
+        "name": "lookbackWindow",
+        "type": "uint32"
+      }
+    ],
+    "name": "timeWeightedAvgSqrtPriceX96",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "twAvg",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "posId",
+        "type": "uint256"
+      }
+    ],
+    "name": "tokenURI",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "unlockCallback",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "encodedDelta",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "nonpayable",
     "type": "function"
   }
-];
-
-// src/utils/liquidity.ts
-async function estimateLiquidity(context, tickLower, tickUpper, usdScaled) {
-  return await context.walletClient.readContract({
-    address: context.deployments().perpManager,
-    abi: PERP_MANAGER_ABI,
-    functionName: "estimateLiquidityForAmount1",
-    args: [tickLower, tickUpper, usdScaled]
-  });
-}
-
-// src/utils/errors.ts
-var import_viem2 = require("viem");
-var PerpCityError = class extends Error {
-  constructor(message, cause) {
-    super(message);
-    this.cause = cause;
-    this.name = "PerpCityError";
-  }
-};
-var ContractError = class extends PerpCityError {
-  constructor(message, errorName, args, cause) {
-    super(message, cause);
-    this.errorName = errorName;
-    this.args = args;
-    this.name = "ContractError";
-  }
-};
-var TransactionRejectedError = class extends PerpCityError {
-  constructor(message = "Transaction rejected by user", cause) {
-    super(message, cause);
-    this.name = "TransactionRejectedError";
-  }
-};
-var InsufficientFundsError = class extends PerpCityError {
-  constructor(message = "Insufficient funds for transaction", cause) {
-    super(message, cause);
-    this.name = "InsufficientFundsError";
-  }
-};
-var GraphQLError = class extends PerpCityError {
-  constructor(message, cause) {
-    super(message, cause);
-    this.name = "GraphQLError";
-  }
-};
-var RPCError = class extends PerpCityError {
-  constructor(message, cause) {
-    super(message, cause);
-    this.name = "RPCError";
-  }
-};
-var ValidationError = class extends PerpCityError {
-  constructor(message, cause) {
-    super(message, cause);
-    this.name = "ValidationError";
-  }
-};
-function parseContractError(error) {
-  if (error instanceof PerpCityError) {
-    return error;
-  }
-  if (error instanceof import_viem2.BaseError) {
-    const revertError = error.walk((err) => err instanceof import_viem2.ContractFunctionRevertedError);
-    if (revertError instanceof import_viem2.ContractFunctionRevertedError) {
-      const errorName = revertError.data?.errorName ?? "Unknown";
-      const args = revertError.data?.args ?? [];
-      const message = formatContractError(errorName, args);
-      return new ContractError(message, errorName, args, error);
-    }
-    if (error.message?.includes("User rejected") || error.code === 4001) {
-      return new TransactionRejectedError(error.message, error);
-    }
-    if (error.message?.includes("insufficient funds")) {
-      return new InsufficientFundsError(error.message, error);
-    }
-    return new PerpCityError(error.shortMessage || error.message, error);
-  }
-  if (error instanceof Error) {
-    return new PerpCityError(error.message, error);
-  }
-  return new PerpCityError(String(error));
-}
-function formatContractError(errorName, args) {
-  switch (errorName) {
-    case "InvalidBeaconAddress":
-      return `Invalid beacon address: ${args[0]}`;
-    case "InvalidTradingFeeSplits":
-      return `Invalid trading fee splits. Insurance split: ${args[0]}, Creator split: ${args[1]}`;
-    case "InvalidMaxOpeningLev":
-      return `Invalid maximum opening leverage: ${args[0]}`;
-    case "InvalidLiquidationLev":
-      return `Invalid liquidation leverage: ${args[0]}. Must be less than max opening leverage: ${args[1]}`;
-    case "InvalidLiquidationFee":
-      return `Invalid liquidation fee: ${args[0]}`;
-    case "InvalidLiquidatorFeeSplit":
-      return `Invalid liquidator fee split: ${args[0]}`;
-    case "InvalidClose":
-      return `Cannot close position. Caller: ${args[0]}, Holder: ${args[1]}, Is Liquidated: ${args[2]}`;
-    case "InvalidCaller":
-      return `Invalid caller. Expected: ${args[1]}, Got: ${args[0]}`;
-    case "InvalidLiquidity":
-      return `Invalid liquidity amount: ${args[0]}`;
-    case "InvalidMargin":
-      return `Invalid margin amount: ${args[0]}`;
-    case "InvalidLevX96":
-      return `Invalid leverage: ${args[0]}. Maximum allowed: ${args[1]}`;
-    case "MakerPositionLocked":
-      return `Maker position is locked until ${new Date(Number(args[1]) * 1e3).toISOString()}. Current time: ${new Date(Number(args[0]) * 1e3).toISOString()}`;
-    case "MaximumAmountExceeded":
-      return `Maximum amount exceeded. Maximum: ${args[0]}, Requested: ${args[1]}`;
-    case "MinimumAmountInsufficient":
-      return `Minimum amount not met. Required: ${args[0]}, Received: ${args[1]}`;
-    case "PriceImpactTooHigh":
-      return `Price impact too high. Current price: ${args[0]}, Min acceptable: ${args[1]}, Max acceptable: ${args[2]}`;
-    case "SwapReverted":
-      return "Swap failed. This may be due to insufficient liquidity or slippage tolerance.";
-    case "ZeroSizePosition":
-      return `Cannot create zero-size position. Perp delta: ${args[0]}, USD delta: ${args[1]}`;
-    case "InvalidFundingInterval":
-      return `Invalid funding interval: ${args[0]}`;
-    case "InvalidPriceImpactBand":
-      return `Invalid price impact band: ${args[0]}`;
-    case "InvalidMarketDeathThreshold":
-      return `Invalid market death threshold: ${args[0]}`;
-    case "InvalidTickRange":
-      return `Invalid tick range. Lower: ${args[0]}, Upper: ${args[1]}`;
-    case "MarketNotKillable":
-      return `Market health (${args[0]}) is above death threshold (${args[1]}). Market cannot be killed yet.`;
-    case "InvalidStartingSqrtPriceX96":
-      return `Invalid starting sqrt price: ${args[0]}`;
-    default:
-      return `Contract error: ${errorName}${args.length > 0 ? ` (${args.join(", ")})` : ""}`;
-  }
-}
-async function withErrorHandling(fn, context) {
-  try {
-    return await fn();
-  } catch (error) {
-    const parsedError = parseContractError(error);
-    parsedError.message = `${context}: ${parsedError.message}`;
-    throw parsedError;
-  }
-}
+];
 
 // src/context.ts
 var import_viem4 = require("viem");
 var PerpCityContext = class {
   constructor(config) {
+    this.configCache = /* @__PURE__ */ new Map();
     this.walletClient = config.walletClient.extend(import_viem3.publicActions);
     this._deployments = config.deployments;
-    const headers = {};
-    if (config.goldskyBearerToken) {
-      headers.authorization = `Bearer ${config.goldskyBearerToken}`;
-    }
-    this.goldskyClient = new import_graphql_request.GraphQLClient(config.goldskyEndpoint, {
-      headers
-    });
   }
   deployments() {
     return this._deployments;
@@ -1637,154 +2163,68 @@ var PerpCityContext = class {
   // Optimized batch data fetching methods
   async fetchPerpData(perpId) {
     return withErrorHandling(async () => {
-      const perpQuery = (0, import_graphql.parse)(`
-        query ($perpId: Bytes!) {
-          perp(id: $perpId) {
-            beacon { id }
-          }
-          perpSnapshots(
-            orderBy: timestamp
-            orderDirection: asc
-            where: { perp: $perpId }
-          ) {
-            timestamp
-            markPrice
-            takerLongNotional
-            takerShortNotional
-            fundingRate
-          }
-        }
-      `);
-      const beaconQuery = (0, import_graphql.parse)(`
-        query ($beaconAddr: Bytes!) {
-          beaconSnapshots(
-            orderBy: timestamp
-            orderDirection: asc
-            where: { beacon: $beaconAddr }
-          ) {
-            timestamp
-            indexPrice
-          }
-        }
-      `);
-      let perpResponse;
-      try {
-        perpResponse = await this.goldskyClient.request(perpQuery, { perpId });
-      } catch (error) {
-        throw new GraphQLError(`Failed to fetch perp data for ${perpId}: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : void 0);
-      }
-      if (!perpResponse.perp || !perpResponse.perp.beacon) {
-        throw new GraphQLError(`Perp ${perpId} not found or has no beacon`);
-      }
-      let beaconResponse;
-      let contractData;
-      try {
-        [beaconResponse, contractData] = await Promise.all([
-          this.goldskyClient.request(beaconQuery, { beaconAddr: perpResponse.perp.beacon.id }),
-          this.fetchPerpContractData(perpId)
-        ]);
-      } catch (error) {
-        if (error instanceof GraphQLError || error instanceof RPCError) {
-          throw error;
-        }
-        throw new GraphQLError(`Failed to fetch beacon or contract data: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : void 0);
-      }
-      if (perpResponse.perpSnapshots.length === 0) {
-        throw new GraphQLError(`No perpSnapshots found for perp ${perpId}. This perp may be newly created with no trading activity yet.`);
-      }
-      if (beaconResponse.beaconSnapshots.length === 0) {
-        throw new GraphQLError(`No beaconSnapshots found for perp ${perpId} beacon ${perpResponse.perp.beacon.id}. The beacon may not have any price updates yet.`);
-      }
-      const markTimeSeries = perpResponse.perpSnapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.markPrice), 6))
-      }));
-      const indexTimeSeries = beaconResponse.beaconSnapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.indexPrice), 6))
-      }));
-      const openInterestTimeSeries = perpResponse.perpSnapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: {
-          takerLongNotional: Number((0, import_viem3.formatUnits)(BigInt(snapshot.takerLongNotional), 6)),
-          takerShortNotional: Number((0, import_viem3.formatUnits)(BigInt(snapshot.takerShortNotional), 6))
-        }
-      }));
-      const fundingRateTimeSeries = perpResponse.perpSnapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.fundingRate), 6))
-      }));
-      const latestSnapshot = perpResponse.perpSnapshots[perpResponse.perpSnapshots.length - 1];
-      const latestBeaconSnapshot = beaconResponse.beaconSnapshots[beaconResponse.beaconSnapshots.length - 1];
+      const contractData = await this.fetchPerpContractData(perpId);
+      const config = await this.getPerpConfig(perpId);
       const perpData = {
         id: perpId,
         tickSpacing: contractData.tickSpacing,
         mark: sqrtPriceX96ToPrice(contractData.sqrtPriceX96),
-        index: Number((0, import_viem3.formatUnits)(BigInt(latestBeaconSnapshot.indexPrice), 6)),
-        beacon: perpResponse.perp.beacon.id,
-        lastIndexUpdate: Number(latestBeaconSnapshot.timestamp),
-        openInterest: {
-          takerLongNotional: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.takerLongNotional), 6)),
-          takerShortNotional: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.takerShortNotional), 6))
-        },
-        markTimeSeries,
-        indexTimeSeries,
-        fundingRate: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.fundingRate), 6)),
+        beacon: config.beacon,
         bounds: contractData.bounds,
-        fees: contractData.fees,
-        openInterestTimeSeries,
-        fundingRateTimeSeries,
-        totalOpenMakerPnl: 0,
-        // These will be calculated by functions
-        totalOpenTakerPnl: 0
-        // These will be calculated by functions
+        fees: contractData.fees
       };
       return perpData;
     }, `fetchPerpData for perp ${perpId}`);
   }
-  async fetchPerpContractData(perpId) {
+  /**
+   * Fetches and caches the config for a perpId
+   * The config includes module addresses (fees, marginRatios, etc.) and pool settings
+   */
+  async getPerpConfig(perpId) {
+    const cached = this.configCache.get(perpId);
+    if (cached) {
+      return cached;
+    }
+    const cfg = await this.walletClient.readContract({
+      address: this.deployments().perpManager,
+      abi: PERP_MANAGER_ABI,
+      functionName: "cfgs",
+      args: [perpId]
+    });
+    this.configCache.set(perpId, cfg);
+    return cfg;
+  }
+  async fetchPerpContractData(perpId, markPrice) {
     return withErrorHandling(async () => {
-      const [tickSpacing, sqrtPriceX96, boundsRaw, feesRaw] = await Promise.all([
-        this.walletClient.readContract({
-          address: this.deployments().perpManager,
-          abi: PERP_MANAGER_ABI,
-          functionName: "tickSpacing",
-          args: [perpId]
-        }),
-        this.walletClient.readContract({
-          address: this.deployments().perpManager,
-          abi: PERP_MANAGER_ABI,
-          functionName: "sqrtPriceX96",
-          args: [perpId]
-        }),
-        this.walletClient.readContract({
-          address: this.deployments().perpManager,
-          abi: PERP_MANAGER_ABI,
-          functionName: "tradingBounds",
-          args: [perpId]
-        }),
-        this.walletClient.readContract({
+      const cfg = await this.getPerpConfig(perpId);
+      const tickSpacing = Number(cfg.key.tickSpacing);
+      let sqrtPriceX96;
+      if (markPrice) {
+        const sqrtPrice = Math.sqrt(markPrice);
+        sqrtPriceX96 = BigInt(Math.floor(sqrtPrice * 2 ** 96));
+      } else {
+        sqrtPriceX96 = await this.walletClient.readContract({
           address: this.deployments().perpManager,
           abi: PERP_MANAGER_ABI,
-          functionName: "fees",
-          args: [perpId]
-        })
-      ]);
-      const bounds = boundsRaw;
-      const fees = feesRaw;
+          functionName: "timeWeightedAvgSqrtPriceX96",
+          args: [perpId, 1]
+        });
+      }
       return {
-        tickSpacing: Number(tickSpacing),
+        tickSpacing,
         sqrtPriceX96,
         bounds: {
-          minMargin: Number((0, import_viem3.formatUnits)(bounds[0], 6)),
-          minTakerLeverage: marginRatioToLeverage(Number((0, import_viem3.formatUnits)(bounds[4], 6))),
-          maxTakerLeverage: marginRatioToLeverage(Number((0, import_viem3.formatUnits)(bounds[5], 6)))
+          minMargin: 10,
+          // Placeholder - would need to call cfg.marginRatios contract
+          minTakerLeverage: 1.1,
+          maxTakerLeverage: 20
         },
         fees: {
-          creatorFee: Number((0, import_viem3.formatUnits)(fees[0], 6)),
-          insuranceFee: Number((0, import_viem3.formatUnits)(fees[1], 6)),
-          lpFee: Number((0, import_viem3.formatUnits)(fees[2], 6)),
-          liquidationFee: Number((0, import_viem3.formatUnits)(fees[3], 6))
+          creatorFee: 1e-4,
+          // Placeholder - would need to call cfg.fees contract
+          insuranceFee: 1e-4,
+          lpFee: 3e-4,
+          liquidationFee: 0.01
         }
       };
     }, `fetchPerpContractData for perp ${perpId}`);
@@ -1795,283 +2235,73 @@ var PerpCityContext = class {
   async getPerpData(perpId) {
     return this.fetchPerpData(perpId);
   }
-  /**
-   * Fetch data for multiple perps efficiently with true batching
-   * This fetches all perps in just 2 Goldsky requests total (not 2N!)
-   */
-  async getMultiplePerpData(perpIds) {
-    if (perpIds.length === 0) {
-      return /* @__PURE__ */ new Map();
-    }
-    if (perpIds.length === 1) {
-      const data = await this.fetchPerpData(perpIds[0]);
-      return /* @__PURE__ */ new Map([[perpIds[0], data]]);
-    }
-    const batchPerpQuery = (0, import_graphql.parse)(`
-      query ($perpIds: [Bytes!]!) {
-        perps(where: { id_in: $perpIds }) {
-          id
-          beacon { id }
-        }
-        perpSnapshots(
-          orderBy: timestamp
-          orderDirection: asc
-          where: { perp_in: $perpIds }
-        ) {
-          perp { id }
-          timestamp
-          markPrice
-          takerLongNotional
-          takerShortNotional
-          fundingRate
-        }
-      }
-    `);
-    const perpResponse = await this.goldskyClient.request(batchPerpQuery, { perpIds });
-    const beaconIds = [...new Set(perpResponse.perps.map((p) => p.beacon.id))];
-    const batchBeaconQuery = (0, import_graphql.parse)(`
-      query ($beaconIds: [Bytes!]!) {
-        beaconSnapshots(
-          orderBy: timestamp
-          orderDirection: asc
-          where: { beacon_in: $beaconIds }
-        ) {
-          beacon { id }
-          timestamp
-          indexPrice
-        }
-      }
-    `);
-    const [beaconResponse, contractDataMap] = await Promise.all([
-      this.goldskyClient.request(batchBeaconQuery, { beaconIds }),
-      this.fetchMultiplePerpContractData(perpIds)
-    ]);
-    const snapshotsByPerp = /* @__PURE__ */ new Map();
-    perpResponse.perpSnapshots.forEach((snapshot) => {
-      const perpId = snapshot.perp.id;
-      if (!snapshotsByPerp.has(perpId)) {
-        snapshotsByPerp.set(perpId, []);
-      }
-      snapshotsByPerp.get(perpId).push(snapshot);
-    });
-    const snapshotsByBeacon = /* @__PURE__ */ new Map();
-    beaconResponse.beaconSnapshots.forEach((snapshot) => {
-      const beaconId = snapshot.beacon.id;
-      if (!snapshotsByBeacon.has(beaconId)) {
-        snapshotsByBeacon.set(beaconId, []);
-      }
-      snapshotsByBeacon.get(beaconId).push(snapshot);
+  async fetchUserData(userAddress, positions) {
+    const usdcBalance = await this.walletClient.readContract({
+      address: this.deployments().usdc,
+      abi: import_viem4.erc20Abi,
+      functionName: "balanceOf",
+      args: [userAddress]
     });
-    const perpLookup = new Map(
-      perpResponse.perps.map((p) => [
-        p.id,
-        p
-      ])
-    );
-    const resultMap = /* @__PURE__ */ new Map();
-    for (const perpId of perpIds) {
-      const perp = perpLookup.get(perpId);
-      if (!perp) {
-        throw new Error(`Perp ${perpId} not found`);
-      }
-      const beaconId = perp.beacon.id;
-      const snapshots = snapshotsByPerp.get(perpId) || [];
-      const beaconSnapshots = snapshotsByBeacon.get(beaconId) || [];
-      const contractData = contractDataMap.get(perpId);
-      if (!contractData) {
-        throw new Error(`Contract data for perp ${perpId} not found`);
-      }
-      if (snapshots.length === 0) {
-        throw new Error(`No snapshots found for perp ${perpId}`);
-      }
-      if (beaconSnapshots.length === 0) {
-        throw new Error(`No beacon snapshots found for perp ${perpId}`);
-      }
-      const markTimeSeries = snapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.markPrice), 6))
-      }));
-      const indexTimeSeries = beaconSnapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.indexPrice), 6))
-      }));
-      const openInterestTimeSeries = snapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: {
-          takerLongNotional: Number((0, import_viem3.formatUnits)(BigInt(snapshot.takerLongNotional), 6)),
-          takerShortNotional: Number((0, import_viem3.formatUnits)(BigInt(snapshot.takerShortNotional), 6))
-        }
-      }));
-      const fundingRateTimeSeries = snapshots.map((snapshot) => ({
-        timestamp: Number(snapshot.timestamp),
-        value: Number((0, import_viem3.formatUnits)(BigInt(snapshot.fundingRate), 6))
-      }));
-      const latestSnapshot = snapshots[snapshots.length - 1];
-      const latestBeaconSnapshot = beaconSnapshots[beaconSnapshots.length - 1];
-      const perpData = {
-        id: perpId,
-        tickSpacing: contractData.tickSpacing,
-        mark: sqrtPriceX96ToPrice(contractData.sqrtPriceX96),
-        index: Number((0, import_viem3.formatUnits)(BigInt(latestBeaconSnapshot.indexPrice), 6)),
-        beacon: beaconId,
-        lastIndexUpdate: Number(latestBeaconSnapshot.timestamp),
-        openInterest: {
-          takerLongNotional: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.takerLongNotional), 6)),
-          takerShortNotional: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.takerShortNotional), 6))
-        },
-        markTimeSeries,
-        indexTimeSeries,
-        fundingRate: Number((0, import_viem3.formatUnits)(BigInt(latestSnapshot.fundingRate), 6)),
-        bounds: contractData.bounds,
-        fees: contractData.fees,
-        openInterestTimeSeries,
-        fundingRateTimeSeries,
-        totalOpenMakerPnl: 0,
-        totalOpenTakerPnl: 0
-      };
-      resultMap.set(perpId, perpData);
-    }
-    return resultMap;
-  }
-  async fetchMultiplePerpContractData(perpIds) {
-    const results = await Promise.all(
-      perpIds.map(async (perpId) => ({
-        perpId,
-        data: await this.fetchPerpContractData(perpId)
-      }))
-    );
-    return new Map(results.map(({ perpId, data }) => [perpId, data]));
-  }
-  async fetchUserData(userAddress) {
-    const [usdcBalance, openPositionsData, closedPositionsData] = await Promise.all([
-      this.walletClient.readContract({
-        address: this.deployments().usdc,
-        abi: import_viem4.erc20Abi,
-        functionName: "balanceOf",
-        args: [userAddress]
-      }),
-      this.fetchUserOpenPositions(userAddress),
-      this.fetchUserClosedPositions(userAddress)
-    ]);
-    const realizedPnl = closedPositionsData.reduce((acc, position) => acc + position.pnlAtClose, 0);
-    const unrealizedPnl = openPositionsData.reduce(
-      (acc, position) => acc + position.liveDetails.pnl - position.liveDetails.fundingPayment,
-      0
-    );
-    return {
-      walletAddress: userAddress,
-      usdcBalance: Number((0, import_viem3.formatUnits)(usdcBalance, 6)),
-      openPositions: openPositionsData,
-      closedPositions: closedPositionsData,
-      realizedPnl,
-      unrealizedPnl
-    };
-  }
-  async fetchUserOpenPositions(userAddress) {
-    const query = (0, import_graphql.parse)(`
-      query ($holder: Bytes!) {
-        openPositions(
-          where: { holder: $holder }
-        ) {
-          perp { id }
-          inContractPosId
-          isLong
-          isMaker
-        }
-      }
-    `);
-    const response = await this.goldskyClient.request(query, { holder: userAddress });
-    const positionsWithDetails = await Promise.all(
-      response.openPositions.map(async (position) => {
-        const positionId = typeof position.inContractPosId === "bigint" ? position.inContractPosId : BigInt(position.inContractPosId);
-        const liveDetails = await this.fetchPositionLiveDetailsFromContract(
-          position.perp.id,
-          positionId
-        );
+    const openPositionsData = await Promise.all(
+      positions.map(async ({ perpId, positionId, isLong, isMaker }) => {
+        const liveDetails = await this.fetchPositionLiveDetailsFromContract(perpId, positionId);
         return {
-          perpId: position.perp.id,
+          perpId,
           positionId,
-          isLong: position.isLong,
-          isMaker: position.isMaker,
+          isLong,
+          isMaker,
           liveDetails
         };
       })
     );
-    return positionsWithDetails;
-  }
-  async fetchUserClosedPositions(userAddress) {
-    const query = (0, import_graphql.parse)(`
-      query ($holder: Bytes!) {
-        closedPositions(
-          where: { holder: $holder }
-        ) {
-          perp { id }
-          wasMaker
-          wasLong
-          pnlAtClose
-        }
-      }
-    `);
-    const response = await this.goldskyClient.request(query, { holder: userAddress });
-    return response.closedPositions.map((position) => ({
-      perpId: position.perp.id,
-      wasMaker: position.wasMaker,
-      wasLong: position.wasLong,
-      pnlAtClose: Number((0, import_viem3.formatUnits)(BigInt(position.pnlAtClose), 6))
-    }));
+    return {
+      walletAddress: userAddress,
+      usdcBalance: Number((0, import_viem3.formatUnits)(usdcBalance, 6)),
+      openPositions: openPositionsData
+    };
   }
   async fetchPositionLiveDetailsFromContract(perpId, positionId) {
     return withErrorHandling(async () => {
       const result = await this.walletClient.readContract({
         address: this.deployments().perpManager,
         abi: PERP_MANAGER_ABI,
-        functionName: "livePositionDetails",
-        args: [perpId, positionId]
+        functionName: "quoteClosePosition",
+        args: [positionId]
       });
+      const [success, pnl, funding, netMargin, wasLiquidated] = result;
+      if (!success) {
+        throw new Error(`Failed to quote position ${positionId} - position may be invalid or already closed`);
+      }
       return {
-        pnl: Number((0, import_viem3.formatUnits)(result[0], 6)),
-        fundingPayment: Number((0, import_viem3.formatUnits)(result[1], 6)),
-        effectiveMargin: Number((0, import_viem3.formatUnits)(result[2], 6)),
-        isLiquidatable: result[3]
+        pnl: Number((0, import_viem3.formatUnits)(pnl, 6)),
+        fundingPayment: Number((0, import_viem3.formatUnits)(funding, 6)),
+        effectiveMargin: Number((0, import_viem3.formatUnits)(netMargin, 6)),
+        isLiquidatable: wasLiquidated
       };
     }, `fetchPositionLiveDetailsFromContract for position ${positionId}`);
   }
   /**
-   * Fetch comprehensive user data with all positions in a single batched request
+   * Fetch comprehensive user data with live details for all positions
+   * @param userAddress - The user's wallet address
+   * @param positions - Array of position metadata (perpId, positionId, isLong, isMaker) tracked from transaction receipts
    */
-  async getUserData(userAddress) {
-    return this.fetchUserData(userAddress);
+  async getUserData(userAddress, positions) {
+    return this.fetchUserData(userAddress, positions);
   }
   /**
    * Fetch open position data with live details
+   * @param perpId - The perpetual market ID
+   * @param positionId - The position ID
+   * @param isLong - Whether the position is long (true) or short (false)
+   * @param isMaker - Whether the position is a maker (LP) position
    */
-  async getOpenPositionData(perpId, positionId) {
-    const query = (0, import_graphql.parse)(`
-      query ($perpId: Bytes!, $posId: BigInt!) {
-        openPositions(
-          where: { perp: $perpId, inContractPosId: $posId }
-          first: 1
-        ) {
-          isLong
-          isMaker
-        }
-      }
-    `);
-    const [positionResponse, liveDetails] = await Promise.all([
-      this.goldskyClient.request(query, { perpId, posId: positionId.toString() }),
-      this.fetchPositionLiveDetailsFromContract(perpId, positionId)
-    ]);
-    const position = positionResponse.openPositions[0];
-    if (!position) {
-      throw new Error(
-        `Position not found in GraphQL: perpId=${perpId}, positionId=${positionId}. The position may not exist or may have been closed.`
-      );
-    }
+  async getOpenPositionData(perpId, positionId, isLong, isMaker) {
+    const liveDetails = await this.fetchPositionLiveDetailsFromContract(perpId, positionId);
     return {
       perpId,
       positionId,
-      isLong: position.isLong,
-      isMaker: position.isMaker,
+      isLong,
+      isMaker,
       liveDetails
     };
   }
@@ -2333,6 +2563,26 @@ var BEACON_ABI = [
   }
 ];
 
+// src/functions/perp.ts
+function getPerpMark(perpData) {
+  return perpData.mark;
+}
+function getPerpBeacon(perpData) {
+  return perpData.beacon;
+}
+function getPerpBounds(perpData) {
+  return perpData.bounds;
+}
+function getPerpFees(perpData) {
+  return perpData.fees;
+}
+function getPerpTickSpacing(perpData) {
+  return perpData.tickSpacing;
+}
+
+// src/functions/perp-manager.ts
+var import_viem6 = require("viem");
+
 // src/functions/open-position.ts
 var import_viem5 = require("viem");
 var OpenPosition = class _OpenPosition {
@@ -2351,11 +2601,11 @@ var OpenPosition = class _OpenPosition {
         minAmt1Out: scale6Decimals(params.minAmt1Out),
         maxAmt1In: scale6Decimals(params.maxAmt1In)
       };
-      const { result, request } = await this.context.walletClient.extend(import_viem5.publicActions).simulateContract({
+      const { request } = await this.context.walletClient.extend(import_viem5.publicActions).simulateContract({
         address: this.context.deployments().perpManager,
         abi: PERP_MANAGER_ABI,
         functionName: "closePosition",
-        args: [this.perpId, contractParams],
+        args: [contractParams],
         account: this.context.walletClient.account
       });
       const txHash = await this.context.walletClient.writeContract(request);
@@ -2364,21 +2614,35 @@ var OpenPosition = class _OpenPosition {
       if (receipt.status === "reverted") {
         throw new Error(`Transaction reverted. Hash: ${txHash}`);
       }
-      let newPositionId = result && result !== 0n ? result : null;
+      let newPositionId = null;
+      let wasFullyClosed = false;
       for (const log of receipt.logs) {
         try {
-          const closedDecoded = (0, import_viem5.decodeEventLog)({
+          const openedDecoded = (0, import_viem5.decodeEventLog)({
             abi: PERP_MANAGER_ABI,
             data: log.data,
             topics: log.topics,
-            eventName: "PositionClosed"
+            eventName: "PositionOpened"
           });
-          if (closedDecoded.args.perpId === this.perpId && closedDecoded.args.posId === this.positionId) {
-            newPositionId = null;
+          if (openedDecoded.args.perpId === this.perpId) {
+            newPositionId = openedDecoded.args.posId;
             break;
           }
         } catch (e) {
-          continue;
+          try {
+            const closedDecoded = (0, import_viem5.decodeEventLog)({
+              abi: PERP_MANAGER_ABI,
+              data: log.data,
+              topics: log.topics,
+              eventName: "PositionClosed"
+            });
+            if (closedDecoded.args.perpId === this.perpId && closedDecoded.args.posId === this.positionId) {
+              wasFullyClosed = true;
+              break;
+            }
+          } catch (e2) {
+            continue;
+          }
         }
       }
       if (!newPositionId) {
@@ -2392,141 +2656,42 @@ var OpenPosition = class _OpenPosition {
       const result = await this.context.walletClient.readContract({
         address: this.context.deployments().perpManager,
         abi: PERP_MANAGER_ABI,
-        functionName: "livePositionDetails",
-        args: [this.perpId, this.positionId]
+        functionName: "quoteClosePosition",
+        args: [this.positionId]
       });
+      const [success, pnl, funding, netMargin, wasLiquidated] = result;
+      if (!success) {
+        throw new Error(`Failed to quote position ${this.positionId} - position may be invalid or already closed`);
+      }
       return {
-        pnl: Number((0, import_viem5.formatUnits)(result[0], 6)),
-        fundingPayment: Number((0, import_viem5.formatUnits)(result[1], 6)),
-        effectiveMargin: Number((0, import_viem5.formatUnits)(result[2], 6)),
-        isLiquidatable: result[3]
+        pnl: Number((0, import_viem5.formatUnits)(pnl, 6)),
+        fundingPayment: Number((0, import_viem5.formatUnits)(funding, 6)),
+        effectiveMargin: Number((0, import_viem5.formatUnits)(netMargin, 6)),
+        isLiquidatable: wasLiquidated
       };
     }, `liveDetails for position ${this.positionId}`);
   }
 };
 
-// src/functions/perp.ts
-function getPerpMark(perpData) {
-  return perpData.mark;
-}
-function getPerpIndex(perpData) {
-  return perpData.index;
-}
-function getPerpBeacon(perpData) {
-  return perpData.beacon;
-}
-function getPerpLastIndexUpdate(perpData) {
-  return perpData.lastIndexUpdate;
-}
-function getPerpOpenInterest(perpData) {
-  return perpData.openInterest;
-}
-function getPerpMarkTimeSeries(perpData) {
-  return perpData.markTimeSeries;
-}
-function getPerpIndexTimeSeries(perpData) {
-  return perpData.indexTimeSeries;
-}
-function getPerpFundingRate(perpData) {
-  return perpData.fundingRate;
-}
-function getPerpBounds(perpData) {
-  return perpData.bounds;
-}
-function getPerpFees(perpData) {
-  return perpData.fees;
-}
-function getPerpOpenInterestTimeSeries(perpData) {
-  return perpData.openInterestTimeSeries;
-}
-function getPerpFundingRateTimeSeries(perpData) {
-  return perpData.fundingRateTimeSeries;
-}
-function getPerpTickSpacing(perpData) {
-  return perpData.tickSpacing;
-}
-async function getAllMakerPositions(context, perpId) {
-  const query = `
-    query ($perpId: Bytes!) {
-      openPositions(
-        where: { perp: $perpId, isMaker: true }
-      ) {
-        perp { id }
-        inContractPosId
-        isLong
-        isMaker
-      }
-    }
-  `;
-  const response = await context.goldskyClient.request(query, { perpId });
-  return response.openPositions.map(
-    (position) => new OpenPosition(
-      context,
-      position.perp.id,
-      BigInt(position.inContractPosId),
-      position.isLong,
-      position.isMaker
-    )
-  );
-}
-async function getAllTakerPositions(context, perpId) {
-  const query = `
-    query ($perpId: Bytes!) {
-      openPositions(
-        where: { perp: $perpId, isMaker: false }
-      ) {
-        perp { id }
-        inContractPosId
-        isLong
-        isMaker
-      }
-    }
-  `;
-  const response = await context.goldskyClient.request(query, { perpId });
-  return response.openPositions.map(
-    (position) => new OpenPosition(
-      context,
-      position.perp.id,
-      BigInt(position.inContractPosId),
-      position.isLong,
-      position.isMaker
-    )
-  );
-}
-async function getTotalOpenMakerPnl(context, perpId) {
-  const positions = await getAllMakerPositions(context, perpId);
-  const liveDetails = await Promise.all(positions.map((position) => position.liveDetails()));
-  return liveDetails.reduce((acc, detail) => acc + detail.pnl - detail.fundingPayment, 0);
-}
-async function getTotalOpenTakerPnl(context, perpId) {
-  const positions = await getAllTakerPositions(context, perpId);
-  const liveDetails = await Promise.all(positions.map((position) => position.liveDetails()));
-  return liveDetails.reduce((acc, detail) => acc + detail.pnl - detail.fundingPayment, 0);
-}
-
 // src/functions/perp-manager.ts
-var import_viem6 = require("viem");
-var import_graphql_request2 = require("graphql-request");
-var import_graphql2 = require("graphql");
-async function getPerps(context) {
-  return withErrorHandling(async () => {
-    const query = (0, import_graphql2.parse)(import_graphql_request2.gql`
-      {
-        perps {
-          id
-        }
-      }
-    `);
-    const response = await context.goldskyClient.request(query);
-    return response.perps.map((perpData) => perpData.id);
-  }, "getPerps");
-}
 async function createPerp(context, params) {
   return withErrorHandling(async () => {
     const sqrtPriceX96 = priceToSqrtPriceX96(params.startingPrice);
+    const deployments = context.deployments();
+    const fees = params.fees ?? deployments.feesModule;
+    const marginRatios = params.marginRatios ?? deployments.marginRatiosModule;
+    const lockupPeriod = params.lockupPeriod ?? deployments.lockupPeriodModule;
+    const sqrtPriceImpactLimit = params.sqrtPriceImpactLimit ?? deployments.sqrtPriceImpactLimitModule;
+    if (!fees || !marginRatios || !lockupPeriod || !sqrtPriceImpactLimit) {
+      throw new Error("Module addresses must be provided either in params or deployment config");
+    }
     const contractParams = {
-      startingSqrtPriceX96: sqrtPriceX96,
-      beacon: params.beacon
+      beacon: params.beacon,
+      fees,
+      marginRatios,
+      lockupPeriod,
+      sqrtPriceImpactLimit,
+      startingSqrtPriceX96: sqrtPriceX96
     };
     const { request } = await context.walletClient.simulateContract({
       address: context.deployments().perpManager,
@@ -2563,6 +2728,7 @@ async function openTakerPosition(context, perpId, params) {
     await approveUsdc(context, marginScaled);
     const levX96 = scaleToX96(params.leverage);
     const contractParams = {
+      holder: context.walletClient.account.address,
       isLong: params.isLong,
       margin: marginScaled,
       levX96,
@@ -2571,7 +2737,7 @@ async function openTakerPosition(context, perpId, params) {
     const { request } = await context.walletClient.simulateContract({
       address: context.deployments().perpManager,
       abi: PERP_MANAGER_ABI,
-      functionName: "openTakerPosition",
+      functionName: "openTakerPos",
       args: [perpId, contractParams],
       account: context.walletClient.account
     });
@@ -2615,6 +2781,7 @@ async function openMakerPosition(context, perpId, params) {
     const alignedTickLower = Math.floor(tickLower / tickSpacing) * tickSpacing;
     const alignedTickUpper = Math.ceil(tickUpper / tickSpacing) * tickSpacing;
     const contractParams = {
+      holder: context.walletClient.account.address,
       margin: marginScaled,
       liquidity: params.liquidity,
       tickLower: alignedTickLower,
@@ -2625,7 +2792,7 @@ async function openMakerPosition(context, perpId, params) {
     const { request } = await context.walletClient.simulateContract({
       address: context.deployments().perpManager,
       abi: PERP_MANAGER_ABI,
-      functionName: "openMakerPosition",
+      functionName: "openMakerPos",
       args: [perpId, contractParams],
       account: context.walletClient.account
     });
@@ -2666,15 +2833,6 @@ function getUserUsdcBalance(userData) {
 function getUserOpenPositions(userData) {
   return userData.openPositions;
 }
-function getUserClosedPositions(userData) {
-  return userData.closedPositions;
-}
-function getUserRealizedPnl(userData) {
-  return userData.realizedPnl;
-}
-function getUserUnrealizedPnl(userData) {
-  return userData.unrealizedPnl;
-}
 function getUserWalletAddress(userData) {
   return userData.walletAddress;
 }
@@ -2721,7 +2879,7 @@ async function closePosition(context, perpId, positionId, params) {
       address: context.deployments().perpManager,
       abi: PERP_MANAGER_ABI,
       functionName: "closePosition",
-      args: [perpId, contractParams],
+      args: [contractParams],
       account: context.walletClient.account
     });
     const txHash = await context.walletClient.writeContract(request);
@@ -2762,14 +2920,18 @@ async function getPositionLiveDetailsFromContract(context, perpId, positionId) {
     const result = await context.walletClient.readContract({
       address: context.deployments().perpManager,
       abi: PERP_MANAGER_ABI,
-      functionName: "livePositionDetails",
-      args: [perpId, positionId]
+      functionName: "quoteClosePosition",
+      args: [positionId]
     });
+    const [success, pnl, funding, netMargin, wasLiquidated] = result;
+    if (!success) {
+      throw new Error(`Failed to quote position ${positionId} - position may be invalid or already closed`);
+    }
     return {
-      pnl: Number((0, import_viem7.formatUnits)(result[0], 6)),
-      fundingPayment: Number((0, import_viem7.formatUnits)(result[1], 6)),
-      effectiveMargin: Number((0, import_viem7.formatUnits)(result[2], 6)),
-      isLiquidatable: result[3]
+      pnl: Number((0, import_viem7.formatUnits)(pnl, 6)),
+      fundingPayment: Number((0, import_viem7.formatUnits)(funding, 6)),
+      effectiveMargin: Number((0, import_viem7.formatUnits)(netMargin, 6)),
+      isLiquidatable: wasLiquidated
     };
   }, `getPositionLiveDetailsFromContract for position ${positionId}`);
 }
@@ -2778,7 +2940,6 @@ async function getPositionLiveDetailsFromContract(context, perpId, positionId) {
   BEACON_ABI,
   BIGINT_1E6,
   ContractError,
-  GraphQLError,
   InsufficientFundsError,
   NUMBER_1E6,
   OpenPosition,
@@ -2793,22 +2954,11 @@ async function getPositionLiveDetailsFromContract(context, perpId, positionId) {
   closePosition,
   createPerp,
   estimateLiquidity,
-  getAllMakerPositions,
-  getAllTakerPositions,
   getPerpBeacon,
   getPerpBounds,
   getPerpFees,
-  getPerpFundingRate,
-  getPerpFundingRateTimeSeries,
-  getPerpIndex,
-  getPerpIndexTimeSeries,
-  getPerpLastIndexUpdate,
   getPerpMark,
-  getPerpMarkTimeSeries,
-  getPerpOpenInterest,
-  getPerpOpenInterestTimeSeries,
   getPerpTickSpacing,
-  getPerps,
   getPositionEffectiveMargin,
   getPositionFundingPayment,
   getPositionId,
@@ -2819,12 +2969,8 @@ async function getPositionLiveDetailsFromContract(context, perpId, positionId) {
   getPositionLiveDetailsFromContract,
   getPositionPerpId,
   getPositionPnl,
-  getTotalOpenMakerPnl,
-  getTotalOpenTakerPnl,
-  getUserClosedPositions,
+  getRpcUrl,
   getUserOpenPositions,
-  getUserRealizedPnl,
-  getUserUnrealizedPnl,
   getUserUsdcBalance,
   getUserWalletAddress,
   marginRatioToLeverage,