@reyaxyz/common 0.274.4 → 0.276.0

package/src/transactions/consts.ts

@@ -1,5 +1,6 @@
 export const BRIDGE_DEADLINE_IN_SECONDS = 15 * 60; // 15 minutes
 export const CORE_DEADLINE_IN_SECONDS = 60; // 1 minute
+export const ORDERS_GATEWAY_DEADLINE_IN_SECONDS = 60; // 1 minute
 export const RELAYER_ACCOUNT = '0xb43c317c9c9215d268881d7d6b59c2d3d0247da1'; // @todo update value
 export const PUBLISHER_ACCOUNT = '0xE32519ca0e751C754c8E1378846B5cd95A1CB66a'; // @todo update value
 export const CONDITIONAL_ORDER_SIG_DEADLINE = 10 ** 18; // very big number for timestamp

package/src/transactions/contractAddresses.ts

@@ -5,6 +5,7 @@ export enum ContractType {
   PASSIVE_POOL_PROXY = 'passive_pool_proxy',
   PERIPHERY_PROXY = 'periphery_proxy',
   CONDITIONAL_ORDERS_PROXY = 'conditional_orders_proxy',
+  ORDERS_GATEWAY_PROXY = 'orders_gateway_proxy',
   PASSIVE_PERP_PROXY = 'passive_perp_proxy',
   ORACLE_ADAPTERS_PROXY = 'oracle_adapters_proxy',
   MULTICALL = 'multicall',
@@ -20,6 +21,8 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
       '0x94ccae812f1647696754412082dd6684c2366a7f',
     [ContractType.CONDITIONAL_ORDERS_PROXY]:
       '0x5a0ac2f89e0bdeafc5c549e354842210a3e87ca5',
+    [ContractType.ORDERS_GATEWAY_PROXY]:
+      '0x5a0ac2f89e0bdeafc5c549e354842210a3e87ca5',
     [ContractType.PASSIVE_PERP_PROXY]:
       '0x9ec177fed042ef2307928be2f5cdbf663b20244b',
     [ContractType.ORACLE_ADAPTERS_PROXY]:
@@ -35,6 +38,8 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
       '0xcd2869d1eb1bc8991bc55de9e9b779e912faf736',
     [ContractType.CONDITIONAL_ORDERS_PROXY]:
       '0xfc8c96be87da63cecddbf54abfa7b13ee8044739',
+    [ContractType.ORDERS_GATEWAY_PROXY]:
+      '0xfc8c96be87da63cecddbf54abfa7b13ee8044739',
     [ContractType.PASSIVE_PERP_PROXY]:
       '0x27e5cb712334e101b3c232eb0be198baaa595f5f',
     [ContractType.ORACLE_ADAPTERS_PROXY]:

package/src/transactions/sign.ts

@@ -7,7 +7,13 @@ import {
 } from 'ethers';
 import { ContractType, getAddress } from './contractAddresses';
 import { Command } from './action';
-import { Address, ConditionalOrderStatus, ReyaChainId } from '../types';
+import {
+  Address,
+  ConditionalOrderStatus,
+  ConditionalOrderType,
+  OrdersGatewayOrderType,
+  ReyaChainId,
+} from '../types';
 
 export type EIP712Signature = {
   v: number;
@@ -204,21 +210,54 @@ const sessionUpdateTypes = {
   ],
 };
 
-export async function signConditionalOrder(
+export function createOrdersGatewayOrderNonce(
+  accountId: number,
+  marketId: number,
+  timestampMs: number,
+): bigint {
+  // Validate the input ranges
+  if (marketId < 0 || marketId >= 2 ** 32)
+    throw new Error('marketId is out of range');
+  if (accountId < 0 || accountId >= 2 ** 128)
+    throw new Error('accountId is out of range');
+  if (timestampMs < 0 || timestampMs >= 2 ** 64)
+    throw new Error('timestamp is out of range');
+
+  const hashUint256 =
+    (BigInt(accountId) << BigInt(98)) |
+    (BigInt(timestampMs) << BigInt(32)) |
+    BigInt(marketId);
+
+  return hashUint256;
+}
+
+type SignOrdersGatewayOrderOutput = {
+  serializedSignature: string;
+  nonce: bigint;
+  signature: EIP712Signature;
+};
+
+export async function signOrdersGatewayOrder(
   signer: Signer | JsonRpcSigner,
   reyaChainId: ReyaChainId,
   accountId: number,
   marketId: number,
   exchangeId: number,
   counterpartyAccountIds: number[],
-  orderType: number,
+  orderType: ConditionalOrderType | OrdersGatewayOrderType,
   inputs: string,
-  nonce: bigint,
   deadline: number,
-): Promise<string> {
+  creationTimestampMs: number,
+): Promise<SignOrdersGatewayOrderOutput> {
+  const nonce = createOrdersGatewayOrderNonce(
+    accountId,
+    marketId,
+    creationTimestampMs,
+  );
+
   const signature = await signReyaTypedData(
     signer,
-    getAddress(reyaChainId, ContractType.CONDITIONAL_ORDERS_PROXY),
+    getAddress(reyaChainId, ContractType.ORDERS_GATEWAY_PROXY),
     conditionalOrderTypes,
     {
       verifyingChainId: reyaChainId,
@@ -236,7 +275,11 @@ export async function signConditionalOrder(
     },
   );
 
-  return signature.serialized;
+  return {
+    serializedSignature: signature.serialized,
+    nonce,
+    signature: convertEthersSignatureToEIP712Signature(signature, deadline),
+  };
 }
 
 export async function signInitiateOrUpdateSession(

package/src/types.ts

@@ -1043,6 +1043,14 @@ export type PendingWithdrawal = {
   tokenAmount: number;
 } & (PendingWithdrawalStatus | ReadyWithdrawalStatus);
 
+export enum OrdersGatewayOrderType {
+  STOP_LOSS = 0,
+  TAKE_PROFIT = 1,
+  LIMIT_ORDER = 2,
+  MARKET_ORDER = 3,
+  REDUCE_ONLY_MARKET_ORDER = 4,
+}
+
 export enum ConditionalOrderType {
   STOP_LOSS = 0,
   TAKE_PROFIT = 1,

package/src/utils/calculate.ts

@@ -3,7 +3,6 @@ import { mergeMap } from './struct';
 export const POOL_IMR = 9.1;
 
 type MarketId = string;
-type AccountId = string;
 type Address = string;
 
 export const calculateMaxExposure = ({
@@ -143,7 +142,6 @@ export const calculateIMR = ({
   marketPrices,
   positions,
 }: {
-  accountLeverages: Map<AccountId, number>;
   marketLeverages: Map<MarketId, number>;
   marketPrices: Map<MarketId, number>;
   positions: Map<MarketId, number>;

package/src/utils/struct.ts

@@ -10,11 +10,11 @@ export const pluck = <T, K extends keyof T, OK>(m: Map<OK, T>, k: K) =>
     ([, v]) => v[k],
   );
 
-export const mergeMap = <T, K>(m: Map<K, T>, o: [K, T][]) =>
-  createMap(
-    Array.from(m.entries()).concat(o),
-    ([k]) => k,
-    ([, v]) => v,
+export const mergeMap = <T, K>(m: Map<K, T>, o: [K, T][] | Map<K, T>) =>
+  new Map(
+    Array.from(m.entries()).concat(
+      o instanceof Map ? Array.from(o.entries()) : o,
+    ),
   );
 
 export const filterBy = <T, K extends keyof T, V>(a: T[], k: K, v: V) =>