address comments

* bump abacus for new env config path usage

* bump abacus + localization for good til date

package.json

@@ -40,9 +40,9 @@
     "@cosmjs/proto-signing": "^0.32.1",
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.6",
+    "@dydxprotocol/v4-abacus": "^1.4.9",
     "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.31",
+    "@dydxprotocol/v4-localization": "^1.1.35",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",

pnpm-lock.yaml

@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 overrides:
   follow-redirects: 1.15.3
 
@@ -26,14 +30,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.6
-    version: 1.4.6
+    specifier: ^1.4.9
+    version: 1.4.9
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.20
     version: 1.0.20
   '@dydxprotocol/v4-localization':
-    specifier: ^1.1.31
-    version: 1.1.31
+    specifier: ^1.1.35
+    version: 1.1.35
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -1286,8 +1290,8 @@ packages:
     resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
     dev: false
 
-  /@dydxprotocol/v4-abacus@1.4.6:
-    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
+  /@dydxprotocol/v4-abacus@1.4.9:
+    resolution: {integrity: sha512-OnrD5Db7AGSxyQE+gWRmkBuXbkZMfSEDB+v2s+ft0zgd4D5j/WTZkk1RG0fn8ISV4AffoN5T24jBWxLfqVlmZw==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:
@@ -1319,8 +1323,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@1.1.31:
-    resolution: {integrity: sha512-plJVIgFAKq9/hA/gk5GgKgCQFsH3pNtDWfG/yHLDXyiGX0M0mMEi1bTNVs4podFVoHJu1nSL9YPFlpJ00FteGw==}
+  /@dydxprotocol/v4-localization@1.1.35:
+    resolution: {integrity: sha512-q5JFYoL/QanHXOtFqRa2owBZJibi1sMpSm3dAcxs9x0/xe8mo6fWcnbQfhl8k7g0/tv7PsBc+e3rbWD0EfvGiA==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:
@@ -16049,7 +16053,3 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

public/configs/cctp.json

@@ -1,12 +1,22 @@
 [
-    {
-        "chainId": "1",
-        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        "name": "Ethereum"
-    },
-    {
-        "chainId": "5",
-        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
-        "name": "Ethereum Goerli"
-    }
-]
+  {
+    "chainId": "1",
+    "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    "name": "Ethereum"
+  },
+  {
+    "chainId": "5",
+    "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
+    "name": "Ethereum Goerli"
+  },
+  {
+    "chainId": "43114",
+    "tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+    "name": "Avalanche"
+  },
+  {
+    "chainId": "10",
+    "tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+    "name": "optimism"
+  }
+]

public/configs/markets.json

@@ -428,6 +428,13 @@
     "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
     "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
   },
+  "STRK-USD": {
+    "name": "Starknet",
+    "tags": ["Layer 2"],
+    "websiteLink": "https://www.starknet.io/en",
+    "whitepaperLink": "https://docs.starknet.io/documentation/",
+    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/starknet-token/"
+  },
   "STX-USD": {
     "name": "Stacks",
     "tags": ["Layer 2"],

public/configs/otherMarketExchangeConfig.json

@@ -513,6 +513,14 @@
     { "exchangeName": "Okx", "ticker": "SOL-USDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Mexc", "ticker": "SOL_USDT", "adjustByMarket": "USDT-USD" }
   ],
+  "STRK": [
+    { "exchangeName": "Binance", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
+    { "exchangeName": "Bybit", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
+    { "exchangeName": "Kraken", "ticker": "STRKUSD" },
+    { "exchangeName": "Kucoin", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
+    { "exchangeName": "Okx", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
+    { "exchangeName": "Gate", "ticker": "STRK_USDT", "adjustByMarket": "USDT-USD" }
+  ],
   "STX": [
     { "exchangeName": "Binance", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Bybit", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },

public/configs/otherMarketParameters.json

@@ -968,6 +968,23 @@
     "minOrderSize": 1000000,
     "quantumConversionExponent": -9
   },
+  {
+    "baseAsset": "STRK",
+    "referencePrice": 2.05,
+    "numOracles": 6,
+    "liquidityTier": 2,
+    "assetName": "Starknet",
+    "p": 0.0,
+    "atomicResolution": -6.0,
+    "minExchanges": 3,
+    "minPriceChangePpm": 4000,
+    "priceExponent": -9.0,
+    "stepBaseQuantum": 1000000,
+    "ticksizeExponent": -3,
+    "subticksPerTick": 1000000,
+    "minOrderSize": 1000000,
+    "quantumConversionExponent": -9
+  },
   {
     "baseAsset": "STX",
     "referencePrice": 1.5144048703611412,

src/constants/analytics.ts

@@ -81,6 +81,9 @@ export enum AnalyticsEvent {
   TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed',
   TradeCancelOrder = 'TradeCancelOrder',
   TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed',
+
+  // Notification
+  NotificationAction = 'NotificationAction',
 }
 
 export type AnalyticsEventData<T extends AnalyticsEvent> =
@@ -180,6 +183,12 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
         /** URL/IP of node the order was sent to */
         validatorUrl: string;
       }
+    : // Notifcation
+    T extends AnalyticsEvent.NotificationAction
+    ? {
+        type: string;
+        id: string;
+      }
     : never;
 
 export const DEFAULT_TRANSACTION_MEMO = 'dYdX Frontend (web)';

src/constants/notifications.ts

@@ -143,6 +143,11 @@ export type TransferNotifcation = {
   isExchange?: boolean;
 };
 
+export enum ReleaseUpdateNotificationIds {
+  RewardsAndFullTradingLive = 'rewards-and-full-trading-live',
+  IncentivesS3 = 'incentives-s3',
+}
+
 /**
  * @description Struct to store whether a NotificationType should be triggered
  */

src/hooks/useNotificationTypes.tsx

@@ -5,7 +5,7 @@ import { isEqual, groupBy } from 'lodash';
 import { useNavigate } from 'react-router-dom';
 
 import { DialogTypes } from '@/constants/dialogs';
-import { AppRoute } from '@/constants/routes';
+import { AppRoute, TokenRoute } from '@/constants/routes';
 import { DydxChainAsset } from '@/constants/wallets';
 
 import {
@@ -20,9 +20,10 @@ import {
   NotificationType,
   DEFAULT_TOAST_AUTO_CLOSE_MS,
   TransferNotificationTypes,
+  ReleaseUpdateNotificationIds,
 } from '@/constants/notifications';
 
-import { useStringGetter } from '@/hooks';
+import { useStringGetter, useTokenConfigs } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
 import { AssetIcon } from '@/components/AssetIcon';
@@ -238,13 +239,16 @@ export const notificationTypes: NotificationTypeConfig[] = [
   {
     type: NotificationType.ReleaseUpdates,
     useTrigger: ({ trigger }) => {
+      const { chainTokenLabel } = useTokenConfigs();
       const stringGetter = useStringGetter();
+      const expirationDate = new Date('2024-03-08T23:59:59');
+      const currentDate = new Date();
 
       useEffect(() => {
         trigger(
-          'rewards-and-full-trading-live',
+          ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
           {
-            icon: <AssetIcon symbol="DYDX" />,
+            icon: <AssetIcon symbol={chainTokenLabel} />,
             title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }),
             body: stringGetter({
               key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
@@ -270,14 +274,41 @@ export const notificationTypes: NotificationTypeConfig[] = [
               },
             }),
             toastSensitivity: 'foreground',
-            groupKey: NotificationType.ReleaseUpdates,
+            groupKey: ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
           },
           []
         );
+        if (currentDate <= expirationDate) {
+          trigger(
+            ReleaseUpdateNotificationIds.IncentivesS3,
+            {
+              icon: <AssetIcon symbol={chainTokenLabel} />,
+              title: stringGetter({ key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.TITLE' }),
+              body: stringGetter({
+                key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.BODY',
+                params: {
+                  SEASON_NUMBER: '3',
+                  PREV_SEASON_NUMBER: '1',
+                  DYDX_AMOUNT: '34',
+                  USDC_AMOUNT: '100',
+                },
+              }),
+              toastSensitivity: 'foreground',
+              groupKey: ReleaseUpdateNotificationIds.IncentivesS3,
+            },
+            []
+          );
+        }
       }, [stringGetter]);
     },
     useNotificationAction: () => {
-      return () => {};
+      const { chainTokenLabel } = useTokenConfigs();
+      const navigate = useNavigate();
+      return (notificationId: string) => {
+        if (notificationId === ReleaseUpdateNotificationIds.IncentivesS3) {
+          navigate(`${chainTokenLabel}/${TokenRoute.TradingRewards}`);
+        }
+      };
     },
   },
 ];

src/hooks/useNotifications.tsx

@@ -1,5 +1,6 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
+import { AnalyticsEvent } from '@/constants/analytics';
 import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
 import {
   type Notification,
@@ -13,7 +14,8 @@ import {
 import { useLocalStorage } from './useLocalStorage';
 import { notificationTypes } from './useNotificationTypes';
 
-import { renderSvgToDataUrl } from '../lib/renderSvgToDataUrl';
+import { track } from '@/lib/analytics';
+import { renderSvgToDataUrl } from '@/lib/renderSvgToDataUrl';
 
 type NotificationsContextType = ReturnType<typeof useNotificationsContext>;
 
@@ -48,6 +50,7 @@ const useNotificationsContext = () => {
       defaultValue: {
         [NotificationType.AbacusGenerated]: true,
         [NotificationType.SquidTransfer]: true,
+        [NotificationType.ReleaseUpdates]: true,
         version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences],
       },
     });
@@ -176,8 +179,10 @@ const useNotificationsContext = () => {
     )
   );
 
-  const onNotificationAction = async (notification: Notification) =>
-    await actions[notification.type]?.(notification.id);
+  const onNotificationAction = async (notification: Notification) => {
+    track(AnalyticsEvent.NotificationAction, { type: notification.type, id: notification.id });
+    return await actions[notification.type]?.(notification.id);
+  };
 
   // Push notifications
   const [hasEnabledPush, setHasEnabledPush] = useLocalStorage({

src/lib/abacus/dydxChainTransactions.ts

@@ -34,7 +34,7 @@ import {
 import { DEFAULT_TRANSACTION_MEMO } from '@/constants/analytics';
 import { DialogTypes } from '@/constants/dialogs';
 import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
-import { DydxNetwork, isTestnet } from '@/constants/networks';
+import { DydxChainId, isTestnet } from '@/constants/networks';
 
 import { RootStore } from '@/state/_store';
 import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
@@ -44,7 +44,10 @@ import { StatefulOrderError } from '../errors';
 import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 import { hashFromTx, getMintscanTxLink } from '../txUtils';
-import { getDydxChainIdFromNetwork } from '../network';
+
+(BigInt.prototype as any).toJSON = function () {
+  return this.toString();
+};
 
 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
   private compositeClient: CompositeClient | undefined;
@@ -239,10 +242,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
 
       if (isTestnet) {
         console.log(
-          getMintscanTxLink(
-            getDydxChainIdFromNetwork(this.compositeClient.network.getString() as DydxNetwork),
-            hash
-          )
+          getMintscanTxLink(this.compositeClient.network.getString() as DydxChainId, hash)
         );
       } else console.log(`txHash: ${hash}`);
 
@@ -538,7 +538,6 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           const result = await this.cctpWithdraw(params);
           callback(result);
           break;
-          break;
         }
         default: {
           break;

src/lib/network.ts

@@ -1,8 +1,4 @@
 import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP, type DydxChainId } from '@/constants/networks';
 
 export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
-
-export const getDydxChainIdFromNetwork = (network: DydxNetwork) => {
-  return ENVIRONMENT_CONFIG_MAP[network].dydxChainId as DydxChainId;
-};
+  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);

src/lib/squid.ts

@@ -31,13 +31,13 @@ export const fetchSquidStatus = async (
 
   const response = await fetch(url, {
     headers: {
-      "x-integrator-id": integratorId || 'dYdX-api'
+      'x-integrator-id': integratorId || 'dYdX-api',
     },
   });
 
   if (!response.ok) {
     const error = await response.json();
-    throw new Error(error);
+    throw error;
   }
 
   return response.json();
@@ -45,4 +45,4 @@ export const fetchSquidStatus = async (
 
 export const getNobleChainId = () => {
   return isMainnet ? 'noble-1' : 'grand-1';
-}
+};