Merge pull request #491 from everclearorg/prod

preethamr · web-flow · commit 4be09aaee666 · 2026-01-16T10:23:01.000-07:00
diff --git a/docker/admin/Dockerfile b/docker/admin/Dockerfile
@@ -50,8 +50,11 @@ COPY yarn.lock /tmp/build/
 # Install dependencies including devDependencies
 # Note: --mode=skip-build skips preinstall/postinstall scripts during install
 # This avoids the "npx only-allow pnpm" check in @eth-optimism/core-utils
-# Then we run rebuild to build native modules with our build tools
-RUN yarn install --immutable --mode=skip-build && \
+# Clear yarn cache before install to avoid corrupted package downloads
+# Retry install on failure to handle transient npm registry issues
+RUN yarn cache clean --all && \
+    yarn install --immutable --mode=skip-build || \
+    (yarn cache clean --all && sleep 2 && yarn install --immutable --mode=skip-build) && \
     yarn workspaces foreach -A run rebuild
 
 # Copy source files
diff --git a/docker/poller/Dockerfile b/docker/poller/Dockerfile
@@ -50,8 +50,11 @@ COPY yarn.lock /tmp/build/
 # Install dependencies including devDependencies
 # Note: --mode=skip-build skips preinstall/postinstall scripts during install
 # This avoids the "npx only-allow pnpm" check in @eth-optimism/core-utils
-# Then we run rebuild to build native modules with our build tools
-RUN yarn install --immutable --mode=skip-build && \
+# Clear yarn cache before install to avoid corrupted package downloads
+# Retry install on failure to handle transient npm registry issues
+RUN yarn cache clean --all && \
+    yarn install --immutable --mode=skip-build || \
+    (yarn cache clean --all && sleep 2 && yarn install --immutable --mode=skip-build) && \
     yarn workspaces foreach -A run rebuild
 
 # Copy source files
diff --git a/packages/adapters/database/src/db.ts b/packages/adapters/database/src/db.ts
@@ -906,7 +906,7 @@ export async function getRebalanceOperationByRecipient(
   }
 
   if (recipient) {
-    conditions.push(`ro."recipient" = $${paramCount}`);
+    conditions.push(`LOWER(ro."recipient") = LOWER($${paramCount})`);
     values.push(recipient);
     paramCount++;
   }
diff --git a/packages/poller/src/init.ts b/packages/poller/src/init.ts
@@ -186,7 +186,7 @@ function initializeAdapters(config: MarkConfiguration, logger: Logger): MarkAdap
     web3Signer as EthWallet,
     logger,
   );
-
+  
   // Initialize fill service chain service if FS signer URL is configured
   // This allows TAC rebalancing to use a separate sender address for FS
   // senderAddress defaults to fillService.address if not explicitly set (same key = same address)
@@ -328,6 +328,7 @@ export const initPoller = async (): Promise<{ statusCode: number; body: string }
   try {
     adapters = initializeAdapters(config, logger);
     const addresses = await adapters.chainService.getAddress();
+    const fillServiceAddresses = adapters.fillServiceChainService ? await adapters.fillServiceChainService.getAddress() : undefined;
 
     const context: ProcessingContext = {
       ...adapters,
@@ -346,6 +347,7 @@ export const initPoller = async (): Promise<{ statusCode: number; body: string }
         stage: config.stage,
         environment: config.environment,
         addresses,
+        fillServiceAddresses
       });
 
       const rebalanceOperations = await rebalanceMantleEth(context);
@@ -376,6 +378,7 @@ export const initPoller = async (): Promise<{ statusCode: number; body: string }
         stage: config.stage,
         environment: config.environment,
         addresses,
+        fillServiceAddresses
       });
 
       const rebalanceOperations = await rebalanceTacUsdt(context);
@@ -406,6 +409,7 @@ export const initPoller = async (): Promise<{ statusCode: number; body: string }
         stage: config.stage,
         environment: config.environment,
         addresses,
+        fillServiceAddresses
       });
 
       const rebalanceOperations = await rebalanceSolanaUsdc(context);
@@ -438,6 +442,7 @@ export const initPoller = async (): Promise<{ statusCode: number; body: string }
         stage: config.stage,
         environment: config.environment,
         addresses,
+        fillServiceAddresses
       });
 
       invoiceResult = await pollAndProcessInvoices(context);
diff --git a/packages/poller/src/rebalance/mantleEth.ts b/packages/poller/src/rebalance/mantleEth.ts
@@ -324,15 +324,17 @@ const evaluateFillServiceRebalance = async (
       continue;
     }
 
-    // Check if an active earmark already exists for this intent before executing operations
-    const existingActive = await database.getActiveEarmarkForInvoice(intent.intent_id);
+    // Check if an earmark already exists for this intent before executing operations
+    const existingEarmarks = await database.getEarmarks({
+      invoiceId: intent.intent_id,
+    });
 
-    if (existingActive) {
-      logger.warn('Active earmark already exists for intent, skipping rebalance operations', {
+    if (existingEarmarks.length > 0) {
+      logger.warn('Earmark already exists for intent, skipping rebalance operations', {
         requestId,
         invoiceId: intent.intent_id,
-        existingEarmarkId: existingActive.id,
-        existingStatus: existingActive.status,
+        existingEarmarkId: existingEarmarks[0].id,
+        existingStatus: existingEarmarks[0].status,
       });
       continue;
     }
@@ -441,6 +443,18 @@ const evaluateFillServiceRebalance = async (
   // PRIORITY 2: Threshold Rebalancing (FS → FS)
   // FS sender does not have enough funds on Mantle, rebalance from WETH on Mainnet
   // Get FS receiver's mETH balance
+  const { operations: inFlightOps } = await database.getRebalanceOperations(undefined, undefined, {
+    status: [RebalanceOperationStatus.PENDING, RebalanceOperationStatus.AWAITING_CALLBACK],
+    bridge: [SupportedBridge.Mantle, `${SupportedBridge.Across}-mantle`],
+    earmarkId: null
+  });
+  if(inFlightOps.length) {
+    logger.info(`Found inflight rebalance operations ${inFlightOps.length}. Threshold rebalancing skipping....`, {
+      requestId,
+    });
+    return actions;
+  }
+
   let fsReceiverMethBalance = 0n;
   if (fsConfig.address) {
     try {
diff --git a/packages/poller/src/rebalance/tacUsdt.ts b/packages/poller/src/rebalance/tacUsdt.ts
@@ -8,6 +8,7 @@ import {
   convertToNativeUnits,
   convertTo18Decimals,
   safeParseBigInt,
+  getTonAssetDecimals,
 } from '../helpers';
 import { jsonifyMap, jsonifyError } from '@mark/logger';
 import {
@@ -182,7 +183,8 @@ async function getTonNativeBalance(
     }
 
     return safeParseBigInt(data.balance.toString());
-  } catch {
+  } catch (error) {
+    console.log('getTonNativeBalance error', error);
     return 0n;
   }
 }
@@ -352,7 +354,6 @@ interface RebalanceRunState {
 export async function rebalanceTacUsdt(context: ProcessingContext): Promise<RebalanceAction[]> {
   const { logger, requestId, config, rebalance, prometheus } = context;
   const actions: RebalanceAction[] = [];
-
   // Always check destination callbacks to ensure operations complete
   await executeTacCallbacks(context);
 
@@ -1932,6 +1933,7 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
               });
               continue;
             }
+            const tonUSDTDecimals = getTonAssetDecimals(operation.tickerHash, config) ?? 6;
 
             // Check TON native balance for gas
             const tonNativeBalance = await getTonNativeBalance(tonWalletAddress, tonApiKey);
@@ -1948,6 +1950,14 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
 
             // Get actual USDT balance on TON
             const actualUsdtBalance = await getTonJettonBalance(tonWalletAddress, jettonAddress, tonApiKey);
+            const actualUsdtBalance18 = convertTo18Decimals(actualUsdtBalance, tonUSDTDecimals);
+            logger.info('Ton Jetton Balance', {
+              tonWalletAddress,
+              jettonAddress,
+              decimals: 6,
+              actualUsdtBalance: actualUsdtBalance.toString(),
+              actualUsdtBalance18: actualUsdtBalance18.toString(),
+            });
 
             // CRITICAL: Use operation-specific amount, NOT the full wallet balance
             // This prevents mixing funds from multiple concurrent flows
@@ -1967,22 +1977,22 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
             const minExpectedAmount = calculateMinExpectedAmount(expectedAmount, slippageBps);
 
             // Validate: TON wallet must have at least the minimum expected amount
-            if (actualUsdtBalance < minExpectedAmount) {
+            if (actualUsdtBalance18 < minExpectedAmount) {
               // Not enough funds yet - Stargate might still be in transit or another flow took funds
               logger.warn('Insufficient USDT on TON for this operation - waiting for Stargate delivery', {
                 ...logContext,
                 expectedAmount: expectedAmount.toString(),
                 minExpectedAmount: minExpectedAmount.toString(),
-                actualUsdtBalance: actualUsdtBalance.toString(),
-                shortfall: (minExpectedAmount - actualUsdtBalance).toString(),
+                actualUsdtBalance18: actualUsdtBalance18.toString(),
+                shortfall: (minExpectedAmount - actualUsdtBalance18).toString(),
                 note: 'Will retry when funds arrive. If persists, check Stargate bridge status.',
               });
               continue;
             }
 
             // Calculate amount to bridge: min(expectedAmount, actualBalance)
             // NEVER bridge more than the operation's expected amount
-            const amountToBridgeBigInt = actualUsdtBalance < expectedAmount ? actualUsdtBalance : expectedAmount;
+            const amountToBridgeBigInt = actualUsdtBalance18 < expectedAmount ? actualUsdtBalance18 : expectedAmount;
             const amountToBridge = amountToBridgeBigInt.toString();
 
             // Log if we're bridging less than expected (Stargate took fees)
@@ -1993,18 +2003,19 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
               recipient,
               expectedAmount: expectedAmount.toString(),
               minExpectedAmount: minExpectedAmount.toString(),
-              actualUsdtBalance: actualUsdtBalance.toString(),
+              actualUsdtBalance18: actualUsdtBalance18.toString(),
               amountToBridge,
               stargateFeesDeducted: tookFees,
               note: tookFees
                 ? `Bridging ${amountToBridge} (Stargate took ${expectedAmount - amountToBridgeBigInt} in fees)`
                 : 'Bridging expected amount',
             });
 
+            const amountToBridgeNative = convertToNativeUnits(amountToBridgeBigInt, tonUSDTDecimals).toString();
             const transactionLinker = await tacInnerAdapter.executeTacBridge(
               tonMnemonic,
               recipient,
-              amountToBridge,
+              amountToBridgeNative,
               jettonAddress, // CRITICAL: Pass the TON jetton address for the asset to bridge
             );
 
@@ -2030,7 +2041,7 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
                 originChainId: Number(TON_LZ_CHAIN_ID),
                 destinationChainId: Number(TAC_CHAIN_ID),
                 tickerHash: operation.tickerHash,
-                amount: amountToBridge, // Use actual amount, not original
+                amount: amountToBridgeBigInt.toString(), // 18 decimals
                 slippage: 100,
                 // Use AWAITING_CALLBACK if we have transactionLinker (bridge submitted, awaiting completion)
                 // Use PENDING if no transactionLinker (bridge failed to submit, will retry)
@@ -2134,10 +2145,12 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
               });
               continue;
             }
+            const tonUSDTDecimals = getTonAssetDecimals(operation.tickerHash, config) ?? 6;
 
             if (tonMnemonic && tonWalletAddress) {
               // Get actual USDT balance on TON
               const actualUsdtBalance = await getTonJettonBalance(tonWalletAddress, jettonAddress, tonApiKey);
+              const actualUsdtBalance18 = convertTo18Decimals(actualUsdtBalance, tonUSDTDecimals);
 
               if (actualUsdtBalance === 0n) {
                 // No USDT on TON - bridge might have already succeeded!
@@ -2163,20 +2176,21 @@ const executeTacCallbacks = async (context: ProcessingContext): Promise<void> =>
                 const minExpectedAmount = calculateMinExpectedAmount(expectedAmount, slippageDbps);
 
                 // Validate: Must have at least minimum expected amount
-                if (actualUsdtBalance < minExpectedAmount) {
+                if (actualUsdtBalance18 < minExpectedAmount) {
                   logger.warn('Insufficient USDT on TON for this operation (retry) - waiting', {
                     ...logContext,
                     expectedAmount: expectedAmount.toString(),
                     minExpectedAmount: minExpectedAmount.toString(),
-                    actualUsdtBalance: actualUsdtBalance.toString(),
+                    actualUsdtBalance18: actualUsdtBalance18.toString(),
                     note: 'Another flow may have taken funds or Stargate still in transit',
                   });
                   continue;
                 }
 
                 // Calculate amount: min(expectedAmount, actualBalance) - never more than expected
-                const amountToBridgeBigInt = actualUsdtBalance < expectedAmount ? actualUsdtBalance : expectedAmount;
-                const amountToBridge = amountToBridgeBigInt.toString();
+                const amountToBridgeBigInt =
+                  actualUsdtBalance18 < expectedAmount ? actualUsdtBalance18 : expectedAmount;
+                const amountToBridge = convertToNativeUnits(amountToBridgeBigInt, tonUSDTDecimals).toString();
 
                 logger.info('Retrying TAC SDK bridge execution (no transactionLinker)', {
                   ...logContext,

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ export async function getRebalanceOperationByRecipient(`
`906`	`906`	`}`
`907`	`907`
`908`	`908`	`if (recipient) {`
`909`		- conditions.push(`ro."recipient" = $${paramCount}`);
	`909`	+ conditions.push(`LOWER(ro."recipient") = LOWER($${paramCount})`);
`910`	`910`	`values.push(recipient);`
`911`	`911`	`paramCount++;`
`912`	`912`	`}`