@reyaxyz/common 0.273.0 → 0.274.0

package/src/trading-api-types.ts

@@ -1,5 +1,5 @@
 import { ParamsDictionary, Query } from 'express-serve-static-core';
-import { AssetPair } from './types';
+import { AssetPair, CollateralPrice, MarketPrice } from './types';
 
 export type PaginatedQueryParams = {
   before: string;
@@ -99,43 +99,14 @@ type ConditionalOrder = {
   transaction_hash: string | null;
 };
 
-type Swap = {
-  id: string;
-  account_id: Decimal;
-  token_in: string;
-  token_out: string;
-  amount_in: Decimal;
-  amount_out: Decimal;
-  executed_amount_out: Decimal;
-  transaction_hash: string;
-  block_timestamp: Decimal;
-  block_number: Decimal;
-  unique_id: bigint | null;
-};
-
 type Market = {
   id: Decimal;
   ticker: string;
-  markPrice: number;
   isActive: boolean;
   maxLeverage: number;
-  volume24H: number;
-  priceChange24H: number;
-  longOI: number;
-  shortOI: number;
-  availableLong: number;
-  availableShort: number;
-  marketPriceDeviation: number;
-  riskBlockId: number;
-  rootCollateralPoolId: number;
   description: string;
   name: string;
-  quoteTokenId: string;
   tickSizeDecimals: number;
-  underlyingAssetId: string;
-  priceChange24HPercentage: number;
-  openInterest: number;
-  fundingRate: number;
   priority: number;
 };
 
@@ -147,15 +118,6 @@ type Account = {
   source: string | null;
 };
 
-type Price = {
-  block_number: Decimal;
-  unique_id: bigint | null;
-  contract_id: string;
-  price: Decimal | null;
-  round_id: Decimal | null;
-  timestamp: Decimal;
-};
-
 type AccountBalance = {
   account_id: number | null;
   collateral: string | null;
@@ -191,6 +153,27 @@ type WalletStats = {
   volume_14d: Decimal;
 };
 
+type MarketData = {
+  marketId: string;
+  updatedAt: number;
+  longOI: number;
+  shortOI: number;
+  longSkewPercentage: number;
+  shortSkewPercentage: number;
+  openInterest?: number;
+  fundingRate?: number;
+  last24hVolume: number;
+  priceChange24H?: number;
+  priceChange24HPercentage?: number;
+  maxAmountBaseLong?: number;
+  maxAmountSizeLong?: number;
+  maxAmountBaseShort?: number;
+  maxAmountSizeShort?: number;
+  oraclePrice?: number;
+  poolPrice?: number;
+  pricesUpdatedAt?: number;
+};
+
 export type TradingApiEndpoint<
   Response,
   Params,
@@ -265,6 +248,8 @@ export type TradingApiSource = {
     { address: string },
     'accountLeveragePerMarket'
   >;
+  markets: TradingApiListEndpoint<Market>;
+  'markets/data': TradingApiListEndpoint<MarketData, never, 'marketData'>;
   'markets/configuration': TradingApiListEndpoint<{
     market_id: Decimal;
     risk_matrix_index: Decimal | null;
@@ -321,6 +306,26 @@ export type TradingApiSource = {
     block_number: Decimal;
     unique_id: bigint | null;
   }>;
+  'market/:marketId': TradingApiEndpoint<
+    Market,
+    {
+      marketId: string;
+    }
+  >;
+  'market/:marketId/data': TradingApiEndpoint<
+    MarketData,
+    {
+      marketId: string;
+    },
+    'marketData'
+  >;
+  'market/:marketId/orders': TradingApiInfiniteListEndpoint<
+    Order,
+    {
+      marketId: string;
+    },
+    'order_history'
+  >;
   'wallet/:address/positions': TradingApiListEndpoint<
     Position,
     AddressParam,
@@ -341,7 +346,17 @@ export type TradingApiSource = {
     asset_price_usdc_contract_id: string | null;
     decimals: number;
   }>;
-  prices: TradingApiListEndpoint<Price>;
+  prices: TradingApiEndpoint<
+    Partial<Record<AssetPair, MarketPrice | CollateralPrice>>,
+    never
+  >;
+  'prices/:assetPairId': TradingApiEndpoint<
+    MarketPrice | CollateralPrice | undefined,
+    {
+      assetPairId: string;
+    },
+    'price'
+  >;
   'wallet/:address/accounts': TradingApiListEndpoint<
     Account,
     AddressParam,
@@ -365,18 +380,6 @@ export type TradingApiSource = {
     AddressParam,
     'auto_exchange'
   >;
-  'wallet/:address/swaps': TradingApiInfiniteListEndpoint<
-    Swap,
-    AddressParam,
-    'swaps'
-  >;
-  'market/:marketId/orders': TradingApiInfiniteListEndpoint<
-    Order,
-    {
-      marketId: string;
-    },
-    'order_history'
-  >;
   'wallet/:address/balanceHistory/:timestamp': TradingApiListEndpoint<
     {
       timestamp: number;
@@ -411,7 +414,6 @@ export type TradingApiSource = {
       poolId: string;
     }
   >;
-  markets: TradingApiListEndpoint<Market>;
   tierFees: TradingApiListEndpoint<{
     market_id: Decimal;
     tier_id: Decimal;

package/src/transactions/contractAddresses.ts

@@ -8,7 +8,6 @@ export enum ContractType {
   PASSIVE_PERP_PROXY = 'passive_perp_proxy',
   ORACLE_ADAPTERS_PROXY = 'oracle_adapters_proxy',
   MULTICALL = 'multicall',
-  CAMELOT_YAK_ROUTER = 'camelot_yak_router',
   REYA_SBTS = 'reya_sbts',
 }
 
@@ -26,8 +25,6 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
     [ContractType.ORACLE_ADAPTERS_PROXY]:
       '0xc501a2356703cd351703d68963c6f4136120f7cf',
     [ContractType.MULTICALL]: '0x5abde4f0af8eaf3c9967f7fa126e59a103357b5c',
-    [ContractType.CAMELOT_YAK_ROUTER]:
-      '0x2b59eb03865d18d8b62a5956bbbfae352fc1c148',
     [ContractType.REYA_SBTS]: '0xc0092ea9179ace93b0cd8910958e335575562722',
   },
   [ReyaChainId.reyaNetwork]: {
@@ -43,8 +40,6 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
     [ContractType.ORACLE_ADAPTERS_PROXY]:
       '0x32edabc058c1207fe0ec5f8557643c28e4ff379e',
     [ContractType.MULTICALL]: '0xed28d27dfca47ad2513c9f2e2d3c098c2ea5a47f',
-    [ContractType.CAMELOT_YAK_ROUTER]:
-      '0x2b59eb03865d18d8b62a5956bbbfae352fc1c148',
     [ContractType.REYA_SBTS]: '0x14d7c1efc024e118df70b241afbd2447d37f1ed6',
   },
 };

package/src/transactions/executeTransaction.ts

@@ -14,7 +14,7 @@ import { getGasBuffer } from './txHelpers';
 import { getPublicRpcUrlsOrThrow } from '../utils';
 import { Interface } from 'ethers';
 
-export const reyaChainIdRPCMapper: { [key: number]: string } = {
+const reyaChainIdRPCMapper: { [key: number]: string } = {
   [ReyaChainId.reyaNetwork]:
     'https://rpc.reya.network/263e76b89da84d478fd2b6e8783a1cfe',
   [ReyaChainId.reyaCronos]:
@@ -53,6 +53,7 @@ export async function estimateGas(
   );
 }
 
+// TODO: deprecate this when /executeGelato is gone
 export async function estimateGasGivenAddress(
   accountAddress: string,
   data: string,

package/src/transactions/routerCommands.ts

@@ -12,7 +12,6 @@ export enum CommandType {
   DUTCH_LIQUIDATION,
   MATCH_ORDER,
   TRANSFER_MARGIN_ACCOUNT,
-  CAMELOT_SWAP,
   MANAGE_POOL_STAKE,
 }
 
@@ -22,9 +21,6 @@ const ABI_DEFINITION: { [key in CommandType]: string[] } = {
   [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],
   [CommandType.DUTCH_LIQUIDATION]: ['tuple(uint128,address,uint128[],bytes[])'],
   [CommandType.TRANSFER_MARGIN_ACCOUNT]: ['tuple(uint128,address,uint256)'],
-  [CommandType.CAMELOT_SWAP]: [
-    'tuple(uint256,uint256,address[],address[],address[])',
-  ],
   [CommandType.MANAGE_POOL_STAKE]: ['uint8', 'bytes'],
 };
 

package/src/types.ts

@@ -45,29 +45,6 @@ export type MarketEntity = {
   availableShort: number;
 };
 
-export type SpotMarketEntity = {
-  id: number;
-  ticker: string;
-  underlyingAsset: {
-    short: string;
-    address: string;
-    price: number;
-  };
-  quoteToken: {
-    short: string;
-    address: string;
-    price: number;
-  };
-  price: number;
-  isActive: boolean;
-  liquidity: number;
-  volume24H: number;
-  decimalsFrom: number;
-  decimalsTo: number;
-  tickSizeDecimals: number;
-  yield: number;
-};
-
 export enum ReyaChainId {
   reyaNetwork = 1729,
   reyaCronos = 89346162,
@@ -295,9 +272,7 @@ export type MarginAccountTransactionHistoryType =
   | 'withdrawal'
   | 'transfer'
   | 'auto_exchange_deposit'
-  | 'auto_exchange_withdrawal'
-  | 'swap_in'
-  | 'swap_out';
+  | 'auto_exchange_withdrawal';
 
 export type MarginAccountTransactionStatus = 'confirmed' | 'pending';
 
@@ -963,13 +938,6 @@ export interface CandleMessage {
   version: string;
 }
 
-export interface SpotCandleMessage {
-  contents: string;
-  clobPairId: string;
-  resolution: string;
-  version: string;
-}
-
 export interface PriceMessage {
   contents: string;
   assetPairId: string;
@@ -1004,7 +972,7 @@ export type TransactionExecutionMetadata = {
   accountId?: number;
   marketId?: number;
   destinationType?: 'pool' | 'account';
-  action?: 'matchOrder' | 'closeOrder' | 'createAccount' | 'swap';
+  action?: 'matchOrder' | 'closeOrder' | 'createAccount';
   tradeSource?: 'reya' | 'rage' | 'other';
   sender?: string;
   matchOrder?: {
@@ -1368,3 +1336,22 @@ export type AssetPair =
 export type DerivedAssetPair = 'SDEUSDUSD';
 
 export type ContractId = string;
+
+export type MarketPrice = {
+  marketId: number;
+  price: string;
+  oraclePrice: string;
+  poolPrice: string;
+  updatedAt: number;
+};
+
+export type CollateralPrice = {
+  address: string;
+  oraclePrice: string;
+  updatedAt: number;
+};
+
+export const isMarketPrice = (
+  price: MarketPrice | CollateralPrice,
+): price is MarketPrice =>
+  Object.prototype.hasOwnProperty.call(price, 'marketId');

package/src/utils/network.ts

@@ -55,8 +55,7 @@ export const chainIdToExplorerURL: {
   [ReyaChainId.reyaCronos]: 'https://reya-cronos.blockscout.com',
 };
 
-// TODO: make this non-export
-export const ChainRpcUrls: Record<MoneyInOutChainId | ReyaChainId, string[]> = {
+const ChainRpcUrls: Record<MoneyInOutChainId | ReyaChainId, string[]> = {
   [ReyaChainId.reyaNetwork]: [
     'https://rpc.reya.network/263e76b89da84d478fd2b6e8783a1cfe',
   ],