@reyaxyz/common 0.362.1 → 0.364.0

package/src/transactions/abis/PassivePerpProxy.json

@@ -331,6 +331,548 @@
       ],
       "outputs": [],
       "stateMutability": "nonpayable"
+    },
+    {
+      "type": "event",
+      "name": "PassivePerpExecutionV3",
+      "inputs": [
+        {
+          "name": "marketId",
+          "type": "uint128",
+          "indexed": true,
+          "internalType": "uint128"
+        },
+        {
+          "name": "exchangeId",
+          "type": "uint128",
+          "indexed": false,
+          "internalType": "uint128"
+        },
+        {
+          "name": "accountId",
+          "type": "uint128",
+          "indexed": true,
+          "internalType": "uint128"
+        },
+        {
+          "name": "counterpartyAccountId",
+          "type": "uint128",
+          "indexed": false,
+          "internalType": "uint128"
+        },
+        {
+          "name": "eventSequenceNumber",
+          "type": "uint128",
+          "indexed": true,
+          "internalType": "uint128"
+        },
+        {
+          "name": "blockTimestamp",
+          "type": "uint256",
+          "indexed": false,
+          "internalType": "uint256"
+        },
+        {
+          "name": "data",
+          "type": "tuple",
+          "indexed": false,
+          "internalType": "struct PassivePerpExecutionEventDataV3",
+          "components": [
+            {
+              "name": "executedBase",
+              "type": "int256",
+              "internalType": "SD59x18"
+            },
+            {
+              "name": "perpFillFees",
+              "type": "tuple",
+              "internalType": "struct PerpFillFees",
+              "components": [
+                {
+                  "name": "protocolFeeCredit",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                },
+                {
+                  "name": "referrerFeeCredit",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                },
+                {
+                  "name": "takerRebateCredit",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                },
+                {
+                  "name": "poolFeeCredit",
+                  "type": "uint256",
+                  "internalType": "uint256"
+                }
+              ]
+            },
+            {
+              "name": "executedPrice",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "referrerAccountId",
+              "type": "uint128",
+              "internalType": "uint128"
+            },
+            {
+              "name": "executionType",
+              "type": "uint8",
+              "internalType": "enum ExecutionType"
+            },
+            {
+              "name": "positionData",
+              "type": "tuple",
+              "internalType": "struct PerpPosition",
+              "components": [
+                {
+                  "name": "base",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "realizedPnL",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "lastPriceData",
+                  "type": "tuple",
+                  "internalType": "struct PriceData",
+                  "components": [
+                    {
+                      "name": "price",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "timestamp",
+                      "type": "uint256",
+                      "internalType": "uint256"
+                    }
+                  ]
+                },
+                {
+                  "name": "trackers",
+                  "type": "tuple",
+                  "internalType": "struct FundingAndADLTrackers",
+                  "components": [
+                    {
+                      "name": "fundingValue",
+                      "type": "int256",
+                      "internalType": "SD59x18"
+                    },
+                    {
+                      "name": "baseMultiplier",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "adlUnwindPrice",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    }
+                  ]
+                },
+                {
+                  "name": "averageEntryFundingValue",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "session",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                }
+              ]
+            },
+            {
+              "name": "counterpartyPositionData",
+              "type": "tuple",
+              "internalType": "struct PerpPosition",
+              "components": [
+                {
+                  "name": "base",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "realizedPnL",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "lastPriceData",
+                  "type": "tuple",
+                  "internalType": "struct PriceData",
+                  "components": [
+                    {
+                      "name": "price",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "timestamp",
+                      "type": "uint256",
+                      "internalType": "uint256"
+                    }
+                  ]
+                },
+                {
+                  "name": "trackers",
+                  "type": "tuple",
+                  "internalType": "struct FundingAndADLTrackers",
+                  "components": [
+                    {
+                      "name": "fundingValue",
+                      "type": "int256",
+                      "internalType": "SD59x18"
+                    },
+                    {
+                      "name": "baseMultiplier",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "adlUnwindPrice",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    }
+                  ]
+                },
+                {
+                  "name": "averageEntryFundingValue",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "session",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                }
+              ]
+            },
+            {
+              "name": "preOrderPositionData",
+              "type": "tuple",
+              "internalType": "struct PerpPosition",
+              "components": [
+                {
+                  "name": "base",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "realizedPnL",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "lastPriceData",
+                  "type": "tuple",
+                  "internalType": "struct PriceData",
+                  "components": [
+                    {
+                      "name": "price",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "timestamp",
+                      "type": "uint256",
+                      "internalType": "uint256"
+                    }
+                  ]
+                },
+                {
+                  "name": "trackers",
+                  "type": "tuple",
+                  "internalType": "struct FundingAndADLTrackers",
+                  "components": [
+                    {
+                      "name": "fundingValue",
+                      "type": "int256",
+                      "internalType": "SD59x18"
+                    },
+                    {
+                      "name": "baseMultiplier",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "adlUnwindPrice",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    }
+                  ]
+                },
+                {
+                  "name": "averageEntryFundingValue",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "session",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                }
+              ]
+            },
+            {
+              "name": "preOrderCounterpartyPositionData",
+              "type": "tuple",
+              "internalType": "struct PerpPosition",
+              "components": [
+                {
+                  "name": "base",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "realizedPnL",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "lastPriceData",
+                  "type": "tuple",
+                  "internalType": "struct PriceData",
+                  "components": [
+                    {
+                      "name": "price",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "timestamp",
+                      "type": "uint256",
+                      "internalType": "uint256"
+                    }
+                  ]
+                },
+                {
+                  "name": "trackers",
+                  "type": "tuple",
+                  "internalType": "struct FundingAndADLTrackers",
+                  "components": [
+                    {
+                      "name": "fundingValue",
+                      "type": "int256",
+                      "internalType": "SD59x18"
+                    },
+                    {
+                      "name": "baseMultiplier",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    },
+                    {
+                      "name": "adlUnwindPrice",
+                      "type": "uint256",
+                      "internalType": "UD60x18"
+                    }
+                  ]
+                },
+                {
+                  "name": "averageEntryFundingValue",
+                  "type": "int256",
+                  "internalType": "SD59x18"
+                },
+                {
+                  "name": "session",
+                  "type": "uint128",
+                  "internalType": "uint128"
+                }
+              ]
+            },
+            {
+              "name": "positionAccountOwner",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "counterpartyAccountOwner",
+              "type": "address",
+              "internalType": "address"
+            },
+            {
+              "name": "accountOrderId",
+              "type": "uint64",
+              "internalType": "uint64"
+            },
+            {
+              "name": "counterpartyOrderId",
+              "type": "uint64",
+              "internalType": "uint64"
+            },
+            {
+              "name": "counterpartyExchangeId",
+              "type": "uint128",
+              "internalType": "uint128"
+            },
+            {
+              "name": "meNonce",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
+            {
+              "name": "metadata",
+              "type": "bytes",
+              "internalType": "bytes"
+            }
+          ]
+        }
+      ],
+      "anonymous": false
+    },
+    {
+      "type": "event",
+      "name": "FeeTierParametersUpdated",
+      "inputs": [
+        {
+          "name": "tierId",
+          "type": "uint256",
+          "indexed": true,
+          "internalType": "uint256"
+        },
+        {
+          "name": "feeTierParameters",
+          "type": "tuple",
+          "indexed": false,
+          "internalType": "struct FeeTierParameters",
+          "components": [
+            {
+              "name": "takerFee",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "makerFee",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "makerRebate",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            }
+          ]
+        },
+        {
+          "name": "blockTimestamp",
+          "type": "uint256",
+          "indexed": false,
+          "internalType": "uint256"
+        }
+      ],
+      "anonymous": false
+    },
+    {
+      "type": "event",
+      "name": "GlobalFeeParametersUpdated",
+      "inputs": [
+        {
+          "name": "globalFeeParameters",
+          "type": "tuple",
+          "indexed": false,
+          "internalType": "struct GlobalFeeParameters",
+          "components": [
+            {
+              "name": "ogDiscount",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "refereeDiscount",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "referrerRebate",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "affiliateReferrerRebate",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "vltzDiscount",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            },
+            {
+              "name": "spreadDiscount",
+              "type": "uint256",
+              "internalType": "UD60x18"
+            }
+          ]
+        },
+        {
+          "name": "blockTimestamp",
+          "type": "uint256",
+          "indexed": false,
+          "internalType": "uint256"
+        }
+      ],
+      "anonymous": false
+    },
+    {
+      "type": "event",
+      "name": "AccountOwnerFeeConfigurationUpdated",
+      "inputs": [
+        {
+          "name": "accountOwner",
+          "type": "address",
+          "indexed": true,
+          "internalType": "address"
+        },
+        {
+          "name": "accountOwnerFeeConfig",
+          "type": "tuple",
+          "indexed": false,
+          "internalType": "struct AccountOwnerFeeConfig",
+          "components": [
+            {
+              "name": "tierId",
+              "type": "uint256",
+              "internalType": "uint256"
+            },
+            {
+              "name": "ogStatus",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "affiliateStatus",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "vltzStatus",
+              "type": "bool",
+              "internalType": "bool"
+            },
+            {
+              "name": "spreadDiscountStatus",
+              "type": "bool",
+              "internalType": "bool"
+            }
+          ]
+        },
+        {
+          "name": "blockTimestamp",
+          "type": "uint256",
+          "indexed": false,
+          "internalType": "uint256"
+        }
+      ],
+      "anonymous": false
     }
   ]
 }

package/src/transactions/buildMulticallTx.ts

@@ -5,6 +5,10 @@ import { abi as MulticallAbi } from './abis/CustomMulticall3.json';
 export type Call = {
   target: string;
   callData: string;
+  // Optional gas-limit override used by the off-chain transaction relay.
+  // Ignored by on-chain Multicall3 struct encoding (ethers skips unknown
+  // fields when matching the Solidity tuple).
+  gasLimit?: number;
 };
 
 export const encodeCoreMulticall = (calldatas: string[]): string => {

package/src/transactions/consts.ts

@@ -3,4 +3,3 @@ 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

@@ -4,7 +4,6 @@ export enum ContractType {
   CORE_PROXY = 'core_proxy',
   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',
@@ -13,15 +12,15 @@ export enum ContractType {
   REYA_TGE_DISTRIBUTION = 'reya_tge_distribution',
 }
 
-const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
+type RemoteReyaChainId = Exclude<ReyaChainId, ReyaChainId.reyaLocal>;
+
+const remoteAddresses = {
   [ReyaChainId.reyaCronos]: {
     [ContractType.CORE_PROXY]: '0xc6fb022962e1426f4e0ec9d2f8861c57926e9f72',
     [ContractType.PASSIVE_POOL_PROXY]:
       '0x9a3a664987b88790a6fdc1632e3b607813fd94ff',
     [ContractType.PERIPHERY_PROXY]:
       '0x94ccae812f1647696754412082dd6684c2366a7f',
-    [ContractType.CONDITIONAL_ORDERS_PROXY]:
-      '0x5a0ac2f89e0bdeafc5c549e354842210a3e87ca5',
     [ContractType.ORDERS_GATEWAY_PROXY]:
       '0x5a0ac2f89e0bdeafc5c549e354842210a3e87ca5',
     [ContractType.PASSIVE_PERP_PROXY]:
@@ -39,8 +38,6 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
       '0xb4b77d6180cc14472a9a7bdff01cc2459368d413',
     [ContractType.PERIPHERY_PROXY]:
       '0xcd2869d1eb1bc8991bc55de9e9b779e912faf736',
-    [ContractType.CONDITIONAL_ORDERS_PROXY]:
-      '0xfc8c96be87da63cecddbf54abfa7b13ee8044739',
     [ContractType.ORDERS_GATEWAY_PROXY]:
       '0xfc8c96be87da63cecddbf54abfa7b13ee8044739',
     [ContractType.PASSIVE_PERP_PROXY]:
@@ -52,11 +49,49 @@ const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
     [ContractType.REYA_TGE_DISTRIBUTION]:
       '0x0000000000000000000000000000000000000000',
   },
+} satisfies Record<RemoteReyaChainId, Record<ContractType, Address>>;
+
+const addresses: Record<ReyaChainId, Partial<Record<ContractType, Address>>> = {
+  ...remoteAddresses,
+  [ReyaChainId.reyaLocal]: {},
 };
+// Map stores the resolved env-var VALUES (not the var names) so that
+// webpack / Next.js `DefinePlugin` can statically inline them into
+// browser bundles.
+//
+// DefinePlugin only inlines literal `process.env.NAME` access — a
+// dynamic `process.env[varName]` lookup is opaque to its source-text
+// pass and stays `undefined` in the browser. Keeping the four
+// `process.env.*` accesses as static literals in this object literal
+// is what makes the override work in both Node (real `process.env` at
+// runtime) and browser (DefinePlugin-substituted constants at build
+// time). See PR #2660 / Daniel's comment for the discovery context.
+//
+// New entries must use the same static-literal pattern; do NOT
+// introduce a dynamic `process.env[someVar]` lookup downstream.
+const CONTRACT_ADDRESS_ENV_OVERRIDES: Partial<Record<ContractType, string>> = {
+  [ContractType.CORE_PROXY]: process.env.CORE_PROXY_ADDRESS,
+  [ContractType.PASSIVE_PERP_PROXY]: process.env.PASSIVE_PERP_PROXY_ADDRESS,
+  [ContractType.ORDERS_GATEWAY_PROXY]: process.env.ORDERS_GATEWAY_PROXY_ADDRESS,
+  [ContractType.PERIPHERY_PROXY]: process.env.PERIPHERY_PROXY_ADDRESS,
+  [ContractType.ORACLE_ADAPTERS_PROXY]:
+    process.env.ORACLE_ADAPTERS_PROXY_ADDRESS,
+  [ContractType.PASSIVE_POOL_PROXY]: process.env.PASSIVE_POOL_PROXY_ADDRESS,
+};
+
 export const getAddress = (
   chainId: number,
   contractName: ContractType,
 ): Address => {
+  // Normalize env-overridden addresses to lowercase. The hardcoded fallback
+  // map below stores lowercased values, and downstream comparisons (e.g.
+  // transaction-whitelist.ts uses `convertToAddress(target) === OG_ADDRESS`,
+  // which lowercases the runtime target) assume that invariant. Without
+  // this, a checksummed env value silently fails every comparison and the
+  // OG-aware settlement path gets bypassed.
+  const override = CONTRACT_ADDRESS_ENV_OVERRIDES[contractName];
+  if (override) return override.toLowerCase() as Address;
+
   const keyChainId = chainId.toString();
 
   if (!Object.keys(addresses).includes(keyChainId)) {
@@ -68,5 +103,5 @@ export const getAddress = (
     throw new Error(`Unspecified address for ${contractName} contract`);
   }
 
-  return networkAddresses[contractName];
+  return networkAddresses[contractName]!;
 };