Merge pull request #11 from InternetMaximalism/wallet

Wallet

Author: signature18632

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 22.13.0
+        node-version: 22.14.0
 
     - name: Enable Corepack
       run: corepack enable

.nvmrc

@@ -1 +1 @@
-22.13.0
+22.14.0

README.md

@@ -33,7 +33,7 @@ yarn workspace watcher dev
 # migrate dev
 yarn migrate
 
-# deploy
+# migration prod
 yarn migrate:deploy
 
 # reset

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
   "formatter": {
     "enabled": true,
     "formatWithErrors": false,

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.13.0-bookworm-slim AS builder
+FROM node:22.14.0-bookworm-slim AS builder
 
 RUN corepack enable && \
     corepack prepare yarn@4.6.0 --activate && \
@@ -16,7 +16,7 @@ RUN yarn install --immutable
 RUN yarn generate
 RUN yarn build
 
-FROM node:22.13.0-bookworm-slim
+FROM node:22.14.0-bookworm-slim
 
 RUN corepack enable && \
     corepack prepare yarn@4.6.0 --activate && \

package.json

@@ -20,13 +20,13 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@prisma/client": "6.3.0",
-    "prisma": "^6.3.0"
+    "@prisma/client": "6.3.1",
+    "prisma": "^6.3.1"
   },
   "prisma": {
     "seed": "tsx --env-file=./.env prisma/seed.ts"

packages/processor/src/constants.ts

@@ -6,8 +6,8 @@ export const DEFAULT_ID_LENGTH = 20;
 // poll
 export const DEFAULT_POLL_OPTIONS: Required<PollOptions> = {
   maxAttempts: 30,
-  intervalMs: 6_000,
-  timeoutMs: 180_000,
+  intervalMs: 10_000,
+  timeoutMs: 300_000,
 };
 
 // transaction
@@ -19,7 +19,7 @@ export const TRANSACTION_WAIT_TIMEOUT_ERROR_MESSAGE =
   "Timed out while waiting for transaction with hash";
 export const EXECUTION_REVERTED_ERROR_MESSAGE = "Execution reverted";
 export const TRANSACTION_REPLACEMENT_FEE_TOO_LOW = "replacement fee too low";
-export const TRANSACTION_MISSING_REVERT_DATA = "missing revert data"; // because of the gasPrice
+export const TRANSACTION_MISSING_REVERT_DATA = "missing revert data"; // NOTE: because of the gasPrice
 
 // ethers
 export const ETHERS_WAIT_TRANSACTION_TIMEOUT_MESSAGE = "timeout";

packages/processor/src/lib/healthCheck.ts

@@ -1,4 +1,4 @@
-import http from "http";
+import http from "node:http";
 import { config, logger } from "@intmax2-withdrawal-aggregator/shared";
 import { name } from "../../package.json";
 

packages/shared/package.json

@@ -9,7 +9,7 @@
     "ethers": "^6.13.5",
     "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
-    "viem": "^2.22.21"
+    "viem": "^2.23.2"
   },
   "scripts": {
     "build": "rm -rf dist tsconfig.tsbuildinfo && tsc",

packages/shared/src/blockchain/ethersTransaction.ts

@@ -8,6 +8,11 @@ import type {
   WaitForTransactionOptions,
 } from "../types";
 
+const DEFAULT_OPTIONS: Required<WaitForTransactionOptions> = {
+  confirms: 1,
+  timeout: 30_000,
+};
+
 export const getEthersTxOptions = (
   contractCallParams: ContractCallParameters,
   contractCallOptions: ContractCallOptionsEthers,
@@ -95,11 +100,6 @@ export const replacedEthersTransaction = async ({
   }
 };
 
-const DEFAULT_OPTIONS: Required<WaitForTransactionOptions> = {
-  confirms: 1,
-  timeout: 30_000,
-};
-
 export const ethersWaitForTransactionConfirmation = async (
   ethereumClient: PublicClient,
   transactionHash: string,

packages/shared/src/blockchain/wallet.ts

@@ -8,7 +8,7 @@ type WalletType = "builder" | "depositAnalyzer" | "withdrawal";
 const walletConfigs: Record<WalletType, number> = {
   builder: 0,
   depositAnalyzer: 1,
-  withdrawal: 3, // NOTE: 2 is unused
+  withdrawal: 2,
 };
 
 export const getWalletClient = (

packages/shared/src/config/index.ts

@@ -28,7 +28,7 @@ export const config = cleanEnv(process.env, {
   // contracts
   LIQUIDITY_CONTRACT_ADDRESS: str({ devDefault: "0x" }),
   LIQUIDITY_CONTRACT_DEPLOYED_BLOCK: num({ devDefault: 0 }),
-  WITHDRAWAL_CONTRACT_ADDRESS: str(),
+  WITHDRAWAL_CONTRACT_ADDRESS: str({ devDefault: "0x" }),
   // private key
   INTMAX2_OWNER_MNEMONIC: str(),
   // zkp

packages/shared/src/constants.ts

@@ -3,7 +3,7 @@ import { config } from "./config";
 // block event
 export const BLOCK_RANGE_MINIMUM = 10000n;
 
-// config
+// contract
 export const LIQUIDITY_CONTRACT_ADDRESS = config.LIQUIDITY_CONTRACT_ADDRESS as `0x${string}`;
 export const LIQUIDITY_CONTRACT_DEPLOYED_BLOCK = BigInt(
   config.LIQUIDITY_CONTRACT_DEPLOYED_BLOCK,

packages/shared/src/types/blockchain.ts

@@ -1,5 +1,3 @@
-import type { Abi, Account } from "viem";
-
 export interface BaseEvent {
   name: string;
   address: string;
@@ -32,35 +30,3 @@ export interface ClaimedWithdrawalEvent extends BaseEvent {
 export interface ClaimedWithdrawalEventLog extends WithdrawalEventLog {
   recipient: string;
 }
-
-export interface ContractCallParameters {
-  contractAddress: `0x${string}`;
-  abi: Abi;
-  functionName: string;
-  account: Account;
-  args: any[];
-}
-
-export interface ContractCallOptionsEthers {
-  value?: bigint;
-  nonce?: number;
-  gasPrice?: bigint;
-  maxFeePerGas?: bigint;
-  maxPriorityFeePerGas?: bigint;
-}
-
-export interface RetryOptionsEthers {
-  nonce?: number | null;
-  gasPrice: bigint | null;
-}
-
-export interface EthersTransactionExecutionParams {
-  functionName: string;
-  contract: any;
-  callArgs: any;
-}
-
-export interface WaitForTransactionOptions {
-  confirms?: number;
-  timeout?: number;
-}

packages/shared/src/types/index.ts

@@ -1,3 +1,4 @@
 export * from "./app";
 export * from "./blockchain";
 export * from "./withdrawal";
+export * from "./transaction";

packages/shared/src/types/transaction.ts

@@ -0,0 +1,33 @@
+import type { Abi, Account } from "viem";
+
+export interface ContractCallParameters {
+  contractAddress: `0x${string}`;
+  abi: Abi;
+  functionName: string;
+  account: Account;
+  args: any[];
+}
+
+export interface ContractCallOptionsEthers {
+  value?: bigint;
+  nonce?: number;
+  gasPrice?: bigint;
+  maxFeePerGas?: bigint;
+  maxPriorityFeePerGas?: bigint;
+}
+
+export interface RetryOptionsEthers {
+  nonce?: number | null;
+  gasPrice: bigint | null;
+}
+
+export interface EthersTransactionExecutionParams {
+  functionName: string;
+  contract: any;
+  callArgs: any;
+}
+
+export interface WaitForTransactionOptions {
+  confirms?: number;
+  timeout?: number;
+}

packages/watcher/package.json

@@ -2,7 +2,9 @@
   "name": "watcher",
   "version": "1.0.0",
   "dependencies": {
-    "@intmax2-withdrawal-aggregator/shared": "workspace:*"
+    "@intmax2-withdrawal-aggregator/shared": "workspace:*",
+    "abitype": "^1.0.8",
+    "viem": "^2.23.2"
   },
   "scripts": {
     "start": "node dist/index.js",