core, node: Accept external key config in executeDeposit action

packages/core/src/createExternalKeyConfig.ts

@@ -1,5 +1,5 @@
 import invariant from 'tiny-invariant'
-import type { SignMessageReturnType } from 'viem'
+import type { Address, PublicClient, SignMessageReturnType } from 'viem'
 import type { BaseConfig } from './createConfig.js'
 import type * as rustUtils from './utils.d.ts'
 
@@ -15,10 +15,15 @@ export type CreateExternalKeyConfigParameters = {
    *
    */
   signMessage: (message: string) => Promise<SignMessageReturnType>
-  // Wallet secrets generated by offline script
+  /** Wallet secrets generated by offline script */
   symmetricKey: `0x${string}`
   walletId: string
   publicKey: `0x${string}`
+  /** Viem client */
+  viemClient?: PublicClient
+  /** Dark pool address */
+  darkPoolAddress: Address
+  /** Utils */
   utils?: typeof rustUtils
 }
 
@@ -40,6 +45,8 @@ export function createExternalKeyConfig(
     walletId,
     publicKey: initialPublicKey,
     websocketUrl,
+    viemClient,
+    darkPoolAddress,
   } = parameters
   invariant(
     parameters.utils,
@@ -73,6 +80,8 @@ export function createExternalKeyConfig(
     getSymmetricKey: () => {
       return symmetricKey
     },
+    viemClient,
+    darkPoolAddress,
   }
 }
 
@@ -85,4 +94,6 @@ export type ExternalConfig = BaseConfig & {
   getBaseUrl: (route?: string) => string
   renegadeKeyType: 'external'
   setPublicKey: (newPublicKey: `0x${string}`) => void
+  viemClient?: PublicClient
+  darkPoolAddress: Address
 }

packages/core/src/exports/index.ts

@@ -240,6 +240,7 @@ export {
   type BaseConfig,
   type Config,
   type CreateConfigParameters,
+  type RenegadeConfig,
   type State,
   createConfig,
 } from '../createConfig.js'

packages/node/package.json

@@ -50,7 +50,8 @@
   },
   "dependencies": {
     "@renegade-fi/core": "workspace:*",
-    "@wagmi/core": "^2.13.4"
+    "@wagmi/core": "^2.13.4",
+    "tiny-invariant": "^1.3.3"
   },
   "devDependencies": {
     "@wagmi/cli": "^2.1.15"

packages/node/src/actions/executeDeposit.ts

@@ -1,12 +1,13 @@
 import {
-  type Config,
   type DepositReturnType,
+  type RenegadeConfig,
   deposit,
   getBackOfQueueWallet,
   getPkRootScalars,
   waitForTaskCompletionWs,
 } from '@renegade-fi/core'
 import { type createConfig, waitForTransactionReceipt } from '@wagmi/core'
+import invariant from 'tiny-invariant'
 import { type Address, type WalletClient, zeroAddress } from 'viem'
 import { readErc20Allowance, writeErc20Approve } from '../generated.js'
 import { signPermit2 } from '../utils/permit2.js'
@@ -17,15 +18,24 @@ export type ExecuteDepositParameters = {
   permit2Address: Address
   walletClient: WalletClient
   viemConfig: ReturnType<typeof createConfig>
-  awaitTask: boolean
+  awaitTask?: boolean
+  newPublicKey?: string
 }
 
 export async function executeDeposit(
-  config: Config,
+  config: RenegadeConfig,
   parameters: ExecuteDepositParameters,
 ): DepositReturnType {
-  const { mint, amount, permit2Address, walletClient, viemConfig, awaitTask } =
-    parameters
+  const {
+    mint,
+    amount,
+    permit2Address,
+    walletClient,
+    viemConfig,
+    awaitTask,
+    newPublicKey,
+  } = parameters
+  invariant(config.viemClient, 'Viem client is required')
   const chainId = config.viemClient.chain?.id
 
   if (mint === zeroAddress || mint === '0x') {
@@ -51,6 +61,7 @@ export async function executeDeposit(
     address: mint,
     account: walletClient.account,
     args: [walletClient.account.address, permit2Address],
+    chainId,
   })
 
   // If not enough allowance, approve max amount
@@ -91,6 +102,7 @@ export async function executeDeposit(
     permitNonce: nonce,
     permitDeadline: deadline,
     permit: signature,
+    newPublicKey,
   })
 
   if (awaitTask) {