fix(registry-backend): rebase onto main post-api changes

Author: awisniew207

packages/apps/registry-backend/package.json

@@ -27,7 +27,7 @@
     "@lit-protocol/vincent-ability-relay-link": "2.0.0",
     "@lit-protocol/vincent-app-sdk": "2.7.0",
     "@lit-protocol/vincent-contracts-sdk": "8.1.0",
-    "@lit-protocol/vincent-registry-sdk": "6.0.0",
+    "@lit-protocol/vincent-registry-sdk": "workspace:*",
     "@t3-oss/env-core": "^0.13.6",
     "@zerodev/ecdsa-validator": "^5.4.9",
     "@zerodev/permissions": "^5.6.2",

packages/apps/registry-backend/src/env.ts

@@ -38,5 +38,6 @@ export const env = createEnv({
     SMART_ACCOUNT_CHAIN_RPC_URL: z.string(),
     SMART_ACCOUNT_CHAIN_ID: z.coerce.number(),
     ZERODEV_PROJECT_ID: z.string(),
+    SPONSOR_WITHDRAW_GAS: BooleanOrBooleanStringSchema.default(false),
   },
 });

packages/apps/registry-backend/src/lib/completeWithdraw.ts

@@ -9,7 +9,8 @@ import type {
   SignedWithdrawal,
 } from '@lit-protocol/vincent-registry-sdk';
 
-import { getChainForNetwork, getBundlerUrlForNetwork } from './utils/chainConfig';
+import { getChainForNetwork } from './utils/chainConfig';
+import { getZerodevBundlerRpcUrl } from './getZerodevBundlerRpcUrl';
 
 const POLL_INTERVAL_MS = 3000;
 const MAX_POLL_ATTEMPTS = 5; // 5 attempts * 3 seconds = 15s max wait
@@ -24,8 +25,8 @@ async function submitWithdrawal(withdrawal: SignedWithdrawal): Promise<{
   userOpHash: string;
 }> {
   const { network, userOp, signature } = withdrawal;
-  const { chain } = getChainForNetwork(network);
-  const bundlerUrl = getBundlerUrlForNetwork(network);
+  const { chain, chainId } = getChainForNetwork(network);
+  const bundlerUrl = getZerodevBundlerRpcUrl(chainId);
 
   const publicClient = createPublicClient({
     chain,

packages/apps/registry-backend/src/lib/requestWithdraw.ts

@@ -29,12 +29,8 @@ import type { AlchemyTokenInfo } from './utils/alchemy';
 
 import { env } from '../env';
 import { fetchTokenBalances } from './utils/alchemy';
-import {
-  SUPPORTED_NETWORKS,
-  getChainForNetwork,
-  getRpcUrlForNetwork,
-  getBundlerUrlForNetwork,
-} from './utils/chainConfig';
+import { SUPPORTED_NETWORKS, getChainForNetwork, getRpcUrlForNetwork } from './utils/chainConfig';
+import { getZerodevBundlerRpcUrl } from './getZerodevBundlerRpcUrl';
 
 const entryPoint = getEntryPoint('0.7');
 const kernelVersion = KERNEL_V3_3;
@@ -176,9 +172,9 @@ export async function requestWithdraw(
 
   const sponsorWithdrawalGas = env.SPONSOR_WITHDRAW_GAS;
 
-  // ZeroDev bundler URL is always required for ERC-4337 operations
-  if (!env.ZERODEV_BUNDLER_URL) {
-    throw new Error('ZERODEV_BUNDLER_URL is required for withdrawal operations');
+  // ZeroDev project ID is always required for ERC-4337 operations
+  if (!env.ZERODEV_PROJECT_ID) {
+    throw new Error('ZERODEV_PROJECT_ID is required for withdrawal operations');
   }
 
   // Group assets by network
@@ -215,9 +211,9 @@ export async function requestWithdraw(
     }
 
     try {
-      const { chain } = getChainForNetwork(network);
+      const { chain, chainId } = getChainForNetwork(network);
       const networkRpcUrl = getRpcUrlForNetwork(network);
-      const bundlerUrl = getBundlerUrlForNetwork(network);
+      const bundlerUrl = getZerodevBundlerRpcUrl(chainId);
 
       const publicClient = createPublicClient({
         chain,

packages/apps/registry-backend/src/lib/utils/chainConfig.ts

@@ -42,18 +42,6 @@ export function getRpcUrlForNetwork(network: string): string {
   return `https://${config.alchemySubdomain}.g.alchemy.com/v2/${env.ALCHEMY_API_KEY}`;
 }
 
-/**
- * Returns the ZeroDev bundler URL for a given network.
- * Appends the chain ID to the base ZERODEV_BUNDLER_URL.
- */
-export function getBundlerUrlForNetwork(network: string): string {
-  if (!env.ZERODEV_BUNDLER_URL) {
-    throw new Error('ZERODEV_BUNDLER_URL is required for bundler operations');
-  }
-  const config = getChainForNetwork(network);
-  return `${env.ZERODEV_BUNDLER_URL}/chain/${config.chainId}`;
-}
-
 /**
  * Returns the appropriate chain configuration based on IS_DEVELOPMENT.
  * - Production: Base mainnet (chain ID 8453)
@@ -65,13 +53,13 @@ export function getBaseChain() {
 
 /**
  * Creates a viem public client configured for the appropriate Base network.
- * Uses BASE_RPC_URL from environment (should point to Base Sepolia in development).
+ * Uses SMART_ACCOUNT_CHAIN_RPC_URL from environment.
  */
 export function getBasePublicClient() {
   const chain = getBaseChain();
   return createPublicClient({
     chain,
-    transport: http(env.BASE_RPC_URL),
+    transport: http(env.SMART_ACCOUNT_CHAIN_RPC_URL),
   });
 }