checksum addresses to RPC

Author: arcoraven

docker-compose.yml

@@ -38,20 +38,6 @@ services:
     volumes:
       - redis_data:/data
 
-  bullboard:
-    container_name: bullboard
-    image: deadly0/bull-board:3.2.6
-    restart: always
-    ports:
-      - 3333:3000
-    environment:
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      REDIS_USE_TLS: "false"
-      BULL_PREFIX: bull
-    depends_on:
-      - redis
-
   engine:
     profiles:
       - engine

src/server/routes/transaction/syncRetry.ts

@@ -7,7 +7,7 @@ import { getAccount } from "../../../utils/account";
 import { getBlockNumberish } from "../../../utils/block";
 import { getChain } from "../../../utils/chain";
 import { msSince } from "../../../utils/date";
-import { maybeBigInt } from "../../../utils/primitiveTypes";
+import { getChecksumAddress, maybeBigInt } from "../../../utils/primitiveTypes";
 import { thirdwebClient } from "../../../utils/sdk";
 import { SentTransaction } from "../../../utils/transaction/types";
 import { enqueueTransactionWebhook } from "../../../utils/transaction/webhook";
@@ -82,7 +82,7 @@ export async function syncRetryTransaction(fastify: FastifyInstance) {
 
       // Prepare transaction.
       const populatedTransaction = await toSerializableTransaction({
-        from,
+        from: getChecksumAddress(from),
         transaction: {
           client: thirdwebClient,
           chain: await getChain(chainId),

src/utils/primitiveTypes.ts

@@ -1,4 +1,4 @@
-import { Address } from "thirdweb";
+import { Address, getAddress } from "thirdweb";
 
 export const maybeBigInt = (val?: string) => (val ? BigInt(val) : undefined);
 
@@ -14,6 +14,17 @@ export function normalizeAddress(
   return val ? (val.toLowerCase() as Address) : undefined;
 }
 
+export function getChecksumAddress(val: Address): Address;
+export function getChecksumAddress(val?: Address): Address | undefined;
+export function getChecksumAddress(val: string): Address;
+export function getChecksumAddress(val?: string): Address | undefined;
+export function getChecksumAddress(val: string | null): undefined;
+export function getChecksumAddress(
+  val?: string | Address | null,
+): Address | undefined {
+  return val ? getAddress(val) : undefined;
+}
+
 export function maybeDate(val: number): Date;
 export function maybeDate(val?: number): Date | undefined;
 export function maybeDate(val?: number): Date | undefined {

src/utils/transaction/cancelTransaction.ts

@@ -1,6 +1,7 @@
 import { Address, toSerializableTransaction } from "thirdweb";
 import { getAccount } from "../account";
 import { getChain } from "../chain";
+import { getChecksumAddress } from "../primitiveTypes";
 import { thirdwebClient } from "../sdk";
 
 interface CancellableTransaction {
@@ -16,7 +17,7 @@ export const sendCancellationTransaction = async (
 
   const chain = await getChain(chainId);
   const populatedTransaction = await toSerializableTransaction({
-    from,
+    from: getChecksumAddress(from),
     transaction: {
       client: thirdwebClient,
       chain,

src/utils/transaction/insertTransaction.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "crypto";
 import { TransactionDB } from "../../db/transactions/db";
 import { createCustomError } from "../../server/middleware/error";
 import { SendTransactionQueue } from "../../worker/queues/sendTransactionQueue";
-import { normalizeAddress } from "../primitiveTypes";
+import { getChecksumAddress } from "../primitiveTypes";
 import { reportUsage } from "../usage";
 import { doSimulateTransaction } from "./simulateQueuedTransaction";
 import { InsertedTransaction, QueuedTransaction } from "./types";
@@ -42,13 +42,12 @@ export const insertTransaction = async (
     queuedAt: new Date(),
     resendCount: 0,
 
-    // Standardize address formats.
-    from: normalizeAddress(insertedTransaction.from),
-    to: normalizeAddress(insertedTransaction.to),
-    signerAddress: normalizeAddress(insertedTransaction.signerAddress),
-    accountAddress: normalizeAddress(insertedTransaction.accountAddress),
-    target: normalizeAddress(insertedTransaction.target),
-    sender: normalizeAddress(insertedTransaction.sender),
+    from: getChecksumAddress(insertedTransaction.from),
+    to: getChecksumAddress(insertedTransaction.to),
+    signerAddress: getChecksumAddress(insertedTransaction.signerAddress),
+    accountAddress: getChecksumAddress(insertedTransaction.accountAddress),
+    target: getChecksumAddress(insertedTransaction.target),
+    sender: getChecksumAddress(insertedTransaction.sender),
     value: insertedTransaction.value ?? 0n,
   };
 

src/worker/tasks/sendTransactionWorker.ts

@@ -23,6 +23,7 @@ import {
   isReplacementGasFeeTooLow,
   prettifyError,
 } from "../../utils/error";
+import { getChecksumAddress } from "../../utils/primitiveTypes";
 import { redis } from "../../utils/redis/redis";
 import { thirdwebClient } from "../../utils/sdk";
 import {
@@ -138,7 +139,7 @@ const _sendTransaction = async (
   let populatedTransaction: TransactionSerializable;
   try {
     populatedTransaction = await toSerializableTransaction({
-      from,
+      from: getChecksumAddress(from),
       transaction: {
         client: thirdwebClient,
         chain,
@@ -219,7 +220,7 @@ const _resendTransaction = async (
   // Populate the transaction with double gas.
   const { chainId, from } = sentTransaction;
   const populatedTransaction = await toSerializableTransaction({
-    from,
+    from: getChecksumAddress(from),
     transaction: {
       client: thirdwebClient,
       chain: await getChain(chainId),