Merge branch 'add_logic' into add_user_stats

Author: jusbar23

.github/workflows/indexer-build-and-push-dev-staging.yml

@@ -8,6 +8,7 @@ on: # yamllint disable-line rule:truthy
       - 'release/indexer/v[0-9]+.x'  # e.g. release/indexer/v1.x
     # TODO(DEC-837): Customize github build and push to ECR by service with paths
       - add_user_stats
+      - 'add_logic'
 
 jobs:
   # Build and push to dev

.github/workflows/protocol-build-and-push-snapshot.yml

@@ -7,6 +7,7 @@ on:  # yamllint disable-line rule:truthy
       - 'release/protocol/v[0-9]+.[0-9]+.x'  # e.g. release/protocol/v0.1.x
       - 'release/protocol/v[0-9]+.x'  # e.g. release/protocol/v1.x
       - add_user_stats
+      - 'add_logic'
 
 jobs:
   build-and-push-snapshot-dev:

.github/workflows/protocol-build-and-push.yml

@@ -7,6 +7,7 @@ on:  # yamllint disable-line rule:truthy
       - 'release/protocol/v[0-9]+.[0-9]+.x'  # e.g. release/protocol/v0.1.x
       - 'release/protocol/v[0-9]+.x'  # e.g. release/protocol/v1.x
       - add_user_stats
+      - 'add_logic'
 
 jobs:
   build-and-push-dev:

indexer/packages/v4-protos/src/codegen/dydxprotocol/stats/stats.ts

@@ -105,19 +105,22 @@ export interface EpochStats_UserWithStatsSDKType {
   user: string;
   stats?: UserStatsSDKType;
 }
-/** GlobalStats stores global stats */
+/** GlobalStats stores global stats for the rolling window (default 30d). */
 
 export interface GlobalStats {
   /** Notional USDC traded in quantums */
   notionalTraded: Long;
 }
-/** GlobalStats stores global stats */
+/** GlobalStats stores global stats for the rolling window (default 30d). */
 
 export interface GlobalStatsSDKType {
   /** Notional USDC traded in quantums */
   notional_traded: Long;
 }
-/** UserStats stores stats for a User */
+/**
+ * UserStats stores stats for a User. This is the sum of all stats for a user in
+ * the rolling window (default 30d).
+ */
 
 export interface UserStats {
   /** Taker USDC in quantums */
@@ -129,7 +132,10 @@ export interface UserStats {
 
   affiliateRevenueGeneratedQuantums: Long;
 }
-/** UserStats stores stats for a User */
+/**
+ * UserStats stores stats for a User. This is the sum of all stats for a user in
+ * the rolling window (default 30d).
+ */
 
 export interface UserStatsSDKType {
   /** Taker USDC in quantums */

indexer/services/comlink/src/config.ts

@@ -107,9 +107,10 @@ export const configSchema = {
   SOLANA_SPONSOR_PUBLIC_KEY: parseString({ default: '' }),
   SKIP_SLIPPAGE_TOLERANCE_PERCENTAGE: parseString({ default: '0' }),
   TURNKEY_EMAIL_SENDER_ADDRESS: parseString({ default: 'notifications@mail.dydx.trade' }),
-  TURNKEY_EMAIL_SENDER_NAME: parseString({ default: 'dydx Notifications' }),
+  TURNKEY_EMAIL_SENDER_NAME: parseString({ default: 'dYdX Notifications' }),
   // Alchemy auth token for the skip bridge.
   ALCHEMY_AUTH_TOKEN: parseString({ default: '' }),
+  ALCHEMY_API_KEY: parseString({ default: '' }),
   ALCHEMY_WEBHOOK_UPDATE_URL: parseString({ default: 'https://dashboard.alchemy.com/api/update-webhook-addresses' }),
   // ZeroDev RPC for skip bridge.
   ZERODEV_API_KEY: parseString({ default: '' }),
@@ -120,6 +121,8 @@ export const configSchema = {
   APPROVAL_SIGNER_PUBLIC_ADDRESS: parseString({ default: '0x3FC11ff27e5373c88EA142d2EdF5492d0839980B' }),
   // if policy approvals are enabled.
   APPROVAL_ENABLED: parseBoolean({ default: true }),
+  // largest amount we will tolerate to swap in usdc.
+  MAXIMUM_BRIDGE_AMOUNT_USDC: parseInteger({ default: 99_900 }),
 
   // webhook ids, defaults to the production webhook id.
   ETHEREUM_WEBHOOK_ID: parseString({ default: 'wh_ctbkt6y9hez91xr2' }),

indexer/services/comlink/src/controllers/api/v4/skip-bridge-controller.ts

@@ -1,3 +1,7 @@
+import {
+  createHash,
+} from 'crypto';
+
 import { logger, stats } from '@dydxprotocol-indexer/base';
 import {
   BridgeInformationTable,
@@ -45,6 +49,7 @@ import {
 import {
   getSvmSigner, getSkipCallData, getKernelAccount,
   buildUserAddresses,
+  limitAmount,
 } from '../../../helpers/skip-helper';
 import { trackTurnkeyDepositSubmitted } from '../../../lib/amplitude-helpers';
 import { handleControllerError } from '../../../lib/helpers';
@@ -257,14 +262,16 @@ class BridgeController extends Controller {
       throw new Error('Failed to derive dYdX address');
     }
 
+    const amountIn = await limitAmount(chainId, amount, sourceAssetDenom);
+
     const path = await route({
       goFast: true,
       allowUnsafe: false,
       smartRelay: true, // skip recommended to enable for better routes and less faults.
       smartSwapOptions: {
         splitRoutes: true,
       },
-      amountIn: amount,
+      amountIn,
       sourceAssetDenom,
       sourceAssetChainId: chainId,
       destAssetChainId: dydxChainId,
@@ -319,7 +326,7 @@ class BridgeController extends Controller {
         logger.info({
           message: `Broadcasted on ${c}: ${txHash}`,
           from: fromAddress,
-          amount,
+          amount: amountIn,
           sourceAssetDenom,
           chainId,
           toAddress: fromAddress,
@@ -339,7 +346,7 @@ class BridgeController extends Controller {
           message: 'Bridge transaction completed',
           fromAddress,
           chainId: c,
-          amount,
+          amount: amountIn,
           sourceAssetDenom,
           transactionHash: txHash,
           status,
@@ -357,18 +364,20 @@ class BridgeController extends Controller {
           const bridgeRecord = {
             from_address: fromAddress,
             chain_id: c,
-            amount,
+            amount: amountIn,
             transaction_hash: txHash,
             created_at: new Date().toISOString(),
           };
 
           await BridgeInformationTable.create(bridgeRecord);
-
+          const email = record.email?.trim().toLowerCase();
+          // sha256 hash email
+          const emailHash = email ? createHash('sha256').update(email).digest('hex') : record.evm_address;
           // Track TurnKey deposit confirmation event in Amplitude
           await trackTurnkeyDepositSubmitted(
-            dydxAddress,
+            emailHash,
             c,
-            amount,
+            amountIn,
             txHash,
             sourceAssetDenom,
           );
@@ -377,7 +386,7 @@ class BridgeController extends Controller {
             message: 'Bridge transaction tracked',
             fromAddress,
             chainId: c,
-            amount,
+            amount: amountIn,
             sourceAssetDenom,
             transactionHash: txHash,
             explorerLink,
@@ -389,7 +398,7 @@ class BridgeController extends Controller {
             message: 'Failed to create bridge information record on tracked',
             fromAddress,
             chainId: c,
-            amount,
+            amount: amountIn,
             error: error.message || error,
           });
           // Don't throw error to avoid breaking the bridge flow
@@ -457,13 +466,15 @@ class BridgeController extends Controller {
     if (!record || !record.dydx_address) {
       throw new Error('Failed to derive dYdX address');
     }
+    // we cannot bridge more than the max amount allowed through the bridge.
+    const amountToUse = await limitAmount(chainId, amount, sourceAssetDenom);
     let callData: Parameters<SmartAccountImplementation['encodeCalls']>[0] = [];
     try {
       callData = await getSkipCallData(
         srcAddress,
         sourceAssetDenom,
         record.dydx_address,
-        amount,
+        amountToUse,
         chainId,
       );
     } catch (error) {
@@ -534,7 +545,7 @@ class BridgeController extends Controller {
         const bridgeRecord: BridgeInformationCreateObject = {
           from_address: fromAddress,
           chain_id: chainId,
-          amount,
+          amount: amountToUse,
           transaction_hash: receipt.transactionHash,
           created_at: new Date().toISOString(),
         };
@@ -543,12 +554,22 @@ class BridgeController extends Controller {
         );
 
         // Track TurnKey deposit confirmation event in Amplitude
-        const dydxAddress = await getDydxAddress(fromAddress, chainId);
-        if (dydxAddress) {
+        if (record.email) {
+          const email = record.email.trim().toLowerCase();
+          // sha256 hash email
+          const emailHash = createHash('sha256').update(email).digest('hex');
+          await trackTurnkeyDepositSubmitted(
+            emailHash,
+            chainId,
+            amountToUse,
+            receipt.transactionHash,
+            sourceAssetDenom,
+          );
+        } else {
           await trackTurnkeyDepositSubmitted(
-            dydxAddress,
+            record.evm_address,
             chainId,
-            amount,
+            amountToUse,
             receipt.transactionHash,
             sourceAssetDenom,
           );

indexer/services/comlink/src/helpers/alchemy-helpers.ts

@@ -3,6 +3,7 @@ import { findByEvmAddress, findBySmartAccountAddress, findBySvmAddress } from '@
 import { TurnkeyUserFromDatabase } from '@dydxprotocol-indexer/postgres/build/src/types';
 import { getKernelAddressFromECDSA } from '@zerodev/ecdsa-validator';
 import { getEntryPoint, KERNEL_V3_1 } from '@zerodev/sdk/constants';
+import { Alchemy } from 'alchemy-sdk';
 import { decode, encode } from 'bech32';
 import express from 'express';
 import {
@@ -54,6 +55,10 @@ export const publicClients = Object.keys(chains).reduce((acc, chainId) => {
   return acc;
 }, {} as Record<string, PublicClient>);
 
+const alchemy = new Alchemy({
+  apiKey: config.ALCHEMY_API_KEY,
+});
+
 export async function addAddressesToAlchemyWebhook(evm?: string, svm?: string): Promise<void> {
   const errors: string[] = [];
 
@@ -300,3 +305,38 @@ export function verifyAlchemyWebhook(
   }
   return next();
 }
+
+export async function getETHPrice(): Promise<number> {
+  try {
+    const price = await alchemy.prices.getTokenPriceBySymbol(['ETH']);
+
+    // Check if we have valid price data
+    if (!price.data || price.data.length === 0) {
+      throw new Error('No price data returned from Alchemy API');
+    }
+
+    const priceData = price.data[0];
+    if (!priceData.prices || priceData.prices.length === 0) {
+      if (priceData.error) {
+        throw new Error(`Alchemy API error: ${priceData.error.message}`);
+      }
+      throw new Error('No price data available for ETH');
+    }
+
+    return parseFloat(priceData.prices[0].value);
+  } catch (error) {
+    // Properly serialize error for logging
+    const errorDetails = {
+      message: error instanceof Error ? error.message : String(error),
+      name: error instanceof Error ? error.name : 'Unknown',
+      stack: error instanceof Error ? error.stack : undefined,
+    };
+
+    logger.error({
+      at: 'alchemy-helpers#getETHPrice',
+      message: 'Failed to get ETH price',
+      error: errorDetails,
+    });
+    throw error;
+  }
+}