Merge remote-tracking branch 'origin/main' into ph/removeMigrateWorker

arcoraven · arcoraven · commit 8e141489f894 · 2024-12-10T11:38:24.000+08:00
diff --git a/src/server/routes/contract/extensions/erc1155/write/mintTo.ts b/src/server/routes/contract/extensions/erc1155/write/mintTo.ts
@@ -1,8 +1,12 @@
 import { Type, type Static } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { queueTx } from "../../../../../../db/transactions/queueTx";
-import { getContract } from "../../../../../../utils/cache/getContract";
+import { getContract } from "thirdweb";
+import { mintTo } from "thirdweb/extensions/erc1155";
+import type { NFTInput } from "thirdweb/utils";
+import { getChain } from "../../../../../../utils/chain";
+import { thirdwebClient } from "../../../../../../utils/sdk";
+import { queueTransaction } from "../../../../../../utils/transaction/queueTransation";
 import { AddressSchema } from "../../../../../schemas/address";
 import { nftAndSupplySchema } from "../../../../../schemas/nft";
 import {
@@ -12,10 +16,13 @@ import {
   transactionWritesResponseSchema,
 } from "../../../../../schemas/sharedApiSchemas";
 import { txOverridesWithValueSchema } from "../../../../../schemas/txOverrides";
-import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
+import {
+  maybeAddress,
+  requiredAddress,
+  walletWithAAHeaderSchema,
+} from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
-// INPUTS
 const requestSchema = erc1155ContractParamSchema;
 const requestBodySchema = Type.Object({
   receiver: {
@@ -66,34 +73,62 @@ export async function erc1155mintTo(fastify: FastifyInstance) {
       },
     },
     handler: async (request, reply) => {
-      const { chain, contractAddress } = request.params;
+      const { chain: _chain, contractAddress } = request.params;
       const { simulateTx } = request.query;
       const { receiver, metadataWithSupply, txOverrides } = request.body;
       const {
-        "x-backend-wallet-address": walletAddress,
+        "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
         "x-idempotency-key": idempotencyKey,
+        "x-account-factory-address": accountFactoryAddress,
+        "x-account-salt": accountSalt,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
-      const chainId = await getChainIdFromChain(chain);
-      const contract = await getContract({
-        chainId,
-        contractAddress,
-        walletAddress,
-        accountAddress,
+      const chainId = await getChainIdFromChain(_chain);
+      const chain = await getChain(chainId);
+
+      const contract = getContract({
+        chain,
+        client: thirdwebClient,
+        address: contractAddress,
       });
-      const tx = await contract.erc1155.mintTo.prepare(
-        receiver,
-        metadataWithSupply,
-      );
 
-      const queueId = await queueTx({
-        tx,
-        chainId,
-        simulateTx,
-        extension: "erc1155",
-        idempotencyKey,
+      // Backward compatibility: Transform the request body's v4 shape to v5.
+      const { metadata, supply } = metadataWithSupply;
+      const nft: NFTInput | string =
+        typeof metadata === "string"
+          ? metadata
+          : {
+              name: metadata.name?.toString() ?? undefined,
+              description: metadata.description ?? undefined,
+              image: metadata.image ?? undefined,
+              animation_url: metadata.animation_url ?? undefined,
+              external_url: metadata.external_url ?? undefined,
+              background_color: metadata.background_color ?? undefined,
+              properties: metadata.properties,
+            };
+      const transaction = mintTo({
+        contract,
+        to: receiver,
+        nft,
+        supply: BigInt(supply),
+      });
+
+      const queueId = await queueTransaction({
+        transaction,
+        fromAddress: requiredAddress(fromAddress, "x-backend-wallet-address"),
+        toAddress: maybeAddress(contractAddress, "to"),
+        accountAddress: maybeAddress(accountAddress, "x-account-address"),
+        accountFactoryAddress: maybeAddress(
+          accountFactoryAddress,
+          "x-account-factory-address",
+        ),
+        accountSalt,
         txOverrides,
+        idempotencyKey,
+        extension: "erc1155",
+        functionName: "mintTo",
+        shouldSimulate: simulateTx,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc20/write/mintTo.ts b/src/server/routes/contract/extensions/erc20/write/mintTo.ts
@@ -1,8 +1,11 @@
 import { Type, type Static } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { queueTx } from "../../../../../../db/transactions/queueTx";
-import { getContract } from "../../../../../../utils/cache/getContract";
+import { getContract } from "thirdweb";
+import { mintTo } from "thirdweb/extensions/erc20";
+import { getChain } from "../../../../../../utils/chain";
+import { thirdwebClient } from "../../../../../../utils/sdk";
+import { queueTransaction } from "../../../../../../utils/transaction/queueTransation";
 import { AddressSchema } from "../../../../../schemas/address";
 import {
   erc20ContractParamSchema,
@@ -11,7 +14,11 @@ import {
   transactionWritesResponseSchema,
 } from "../../../../../schemas/sharedApiSchemas";
 import { txOverridesWithValueSchema } from "../../../../../schemas/txOverrides";
-import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
+import {
+  maybeAddress,
+  requiredAddress,
+  walletWithAAHeaderSchema,
+} from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 // INPUTS
@@ -59,31 +66,46 @@ export async function erc20mintTo(fastify: FastifyInstance) {
       },
     },
     handler: async (request, reply) => {
-      const { chain, contractAddress } = request.params;
+      const { chain: _chain, contractAddress } = request.params;
       const { simulateTx } = request.query;
       const { toAddress, amount, txOverrides } = request.body;
       const {
-        "x-backend-wallet-address": walletAddress,
+        "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
         "x-idempotency-key": idempotencyKey,
+        "x-account-factory-address": accountFactoryAddress,
+        "x-account-salt": accountSalt,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
-      const chainId = await getChainIdFromChain(chain);
-      const contract = await getContract({
-        chainId,
-        contractAddress,
-        walletAddress,
-        accountAddress,
+      const chainId = await getChainIdFromChain(_chain);
+      const chain = await getChain(chainId);
+
+      const contract = getContract({
+        chain,
+        client: thirdwebClient,
+        address: contractAddress,
+      });
+      const transaction = mintTo({
+        contract,
+        to: toAddress,
+        amount,
       });
-      const tx = await contract.erc20.mintTo.prepare(toAddress, amount);
 
-      const queueId = await queueTx({
-        tx,
-        chainId,
-        simulateTx,
-        extension: "erc20",
-        idempotencyKey,
+      const queueId = await queueTransaction({
+        transaction,
+        fromAddress: requiredAddress(fromAddress, "x-backend-wallet-address"),
+        toAddress: maybeAddress(contractAddress, "to"),
+        accountAddress: maybeAddress(accountAddress, "x-account-address"),
+        accountFactoryAddress: maybeAddress(
+          accountFactoryAddress,
+          "x-account-factory-address",
+        ),
+        accountSalt,
         txOverrides,
+        idempotencyKey,
+        extension: "erc20",
+        functionName: "mintTo",
+        shouldSimulate: simulateTx,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc721/write/mintTo.ts b/src/server/routes/contract/extensions/erc721/write/mintTo.ts
@@ -120,6 +120,8 @@ export async function erc721mintTo(fastify: FastifyInstance) {
         accountSalt,
         txOverrides,
         idempotencyKey,
+        extension: "erc721",
+        functionName: "mintTo",
         shouldSimulate: simulateTx,
       });
 
diff --git a/src/tests/math.test.ts b/src/tests/math.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getPercentile } from "../utils/math";
+import { bigMath, getPercentile } from "../utils/math";
 
 describe("getPercentile", () => {
   it("should correctly calculate the p50 (median) of a sorted array", () => {
@@ -27,3 +27,81 @@ describe("getPercentile", () => {
     expect(getPercentile(numbers, 50)).toBe(0);
   });
 });
+
+describe("bigMath", () => {
+  describe("min", () => {
+    it("should return the smaller of two positive numbers", () => {
+      const a = 5n;
+      const b = 10n;
+      expect(bigMath.min(a, b)).toBe(5n);
+    });
+
+    it("should return the smaller of two negative numbers", () => {
+      const a = -10n;
+      const b = -5n;
+      expect(bigMath.min(a, b)).toBe(-10n);
+    });
+
+    it("should handle equal numbers", () => {
+      const a = 5n;
+      const b = 5n;
+      expect(bigMath.min(a, b)).toBe(5n);
+    });
+
+    it("should handle zero and positive number", () => {
+      const a = 0n;
+      const b = 5n;
+      expect(bigMath.min(a, b)).toBe(0n);
+    });
+
+    it("should handle zero and negative number", () => {
+      const a = 0n;
+      const b = -5n;
+      expect(bigMath.min(a, b)).toBe(-5n);
+    });
+
+    it("should handle very large numbers", () => {
+      const a = BigInt(Number.MAX_SAFE_INTEGER) * 2n;
+      const b = BigInt(Number.MAX_SAFE_INTEGER);
+      expect(bigMath.min(a, b)).toBe(b);
+    });
+  });
+
+  describe("max", () => {
+    it("should return the larger of two positive numbers", () => {
+      const a = 5n;
+      const b = 10n;
+      expect(bigMath.max(a, b)).toBe(10n);
+    });
+
+    it("should return the larger of two negative numbers", () => {
+      const a = -10n;
+      const b = -5n;
+      expect(bigMath.max(a, b)).toBe(-5n);
+    });
+
+    it("should handle equal numbers", () => {
+      const a = 5n;
+      const b = 5n;
+      expect(bigMath.max(a, b)).toBe(5n);
+    });
+
+    it("should handle zero and positive number", () => {
+      const a = 0n;
+      const b = 5n;
+      expect(bigMath.max(a, b)).toBe(5n);
+    });
+
+    it("should handle zero and negative number", () => {
+      const a = 0n;
+      const b = -5n;
+      expect(bigMath.max(a, b)).toBe(0n);
+    });
+
+    it("should handle very large numbers", () => {
+      const a = BigInt(Number.MAX_SAFE_INTEGER) * 2n;
+      const b = BigInt(Number.MAX_SAFE_INTEGER);
+      expect(bigMath.max(a, b)).toBe(a);
+    });
+  });
+});
diff --git a/src/utils/env.ts b/src/utils/env.ts
@@ -102,10 +102,12 @@ export const env = createEnv({
     /**
      * Experimental env vars. These may be renamed or removed in future non-major releases.
      */
-    // Sets how long the mine worker waits for a transaction receipt before considering the transaction dropped (default: 30 minutes).
+    // Sets how long the mine worker waits for a transaction receipt before considering the transaction dropped. Default: 30 minutes
     EXPERIMENTAL__MINE_WORKER_TIMEOUT_SECONDS: z.coerce
       .number()
       .default(30 * 60),
+    // Sets the max gas price for a transaction attempt. Most RPCs reject transactions above a certain gas price. Default: 10^18 wei.
+    EXPERIMENTAL__MAX_GAS_PRICE_WEI: z.coerce.number().default(10 ** 18),
   },
   clientPrefix: "NEVER_USED",
   client: {},
@@ -144,6 +146,8 @@ export const env = createEnv({
     NONCE_MAP_COUNT: process.env.NONCE_MAP_COUNT,
     EXPERIMENTAL__MINE_WORKER_TIMEOUT_SECONDS:
       process.env.EXPERIMENTAL__MINE_WORKER_TIMEOUT_SECONDS,
+    EXPERIMENTAL__MAX_GAS_PRICE_WEI:
+      process.env.EXPERIMENTAL__MAX_GAS_PRICE_WEI,
     METRICS_PORT: process.env.METRICS_PORT,
     METRICS_ENABLED: process.env.METRICS_ENABLED,
   },
diff --git a/src/utils/math.ts b/src/utils/math.ts
@@ -7,3 +7,8 @@ export const getPercentile = (arr: number[], percentile: number): number => {
   const index = Math.floor((percentile / 100) * (arr.length - 1));
   return arr[index];
 };
+
+export const BigIntMath = {
+  min: (a: bigint, b: bigint) => (a < b ? a : b),
+  max: (a: bigint, b: bigint) => (a > b ? a : b),
+};
diff --git a/src/worker/tasks/sendTransactionWorker.ts b/src/worker/tasks/sendTransactionWorker.ts
@@ -39,6 +39,7 @@ import {
   isReplacementGasFeeTooLow,
   wrapError,
 } from "../../utils/error";
+import { BigIntMath } from "../../utils/math";
 import { getChecksumAddress } from "../../utils/primitiveTypes";
 import { recordMetrics } from "../../utils/prometheus";
 import { redis } from "../../utils/redis/redis";
@@ -565,34 +566,37 @@ const _minutesFromNow = (minutes: number) =>
  * @param populatedTransaction The transaction with estimated gas from RPC.
  * @param resendCount The resend attempt #. Example: 2 = the transaction was initially sent, then resent once. This is the second resend attempt.
  */
-export const _updateGasFees = (
+export function _updateGasFees(
   populatedTransaction: PopulatedTransaction,
   resendCount: number,
   overrides: SentTransaction["overrides"],
-): PopulatedTransaction => {
+): PopulatedTransaction {
   if (resendCount === 0) {
     return populatedTransaction;
   }
 
-  const multiplier = BigInt(Math.min(10, resendCount * 2));
-
+  const multiplier = BigIntMath.min(10n, BigInt(resendCount) * 2n);
   const updated = { ...populatedTransaction };
 
   // Update gas fees (unless they were explicitly overridden).
+  // Do not exceed MAX_GAS_PRICE_WEI.
+  const MAX_GAS_PRICE_WEI = BigInt(env.EXPERIMENTAL__MAX_GAS_PRICE_WEI);
 
   if (updated.gasPrice && !overrides?.gasPrice) {
-    updated.gasPrice *= multiplier;
+    const newGasPrice = updated.gasPrice * multiplier;
+    updated.gasPrice = BigIntMath.min(newGasPrice, MAX_GAS_PRICE_WEI);
   }
   if (updated.maxPriorityFeePerGas && !overrides?.maxPriorityFeePerGas) {
     updated.maxPriorityFeePerGas *= multiplier;
   }
   if (updated.maxFeePerGas && !overrides?.maxFeePerGas) {
-    updated.maxFeePerGas =
+    const newMaxFeePerGas =
       updated.maxFeePerGas * 2n + (updated.maxPriorityFeePerGas ?? 0n);
+    updated.maxFeePerGas = BigIntMath.min(newMaxFeePerGas, MAX_GAS_PRICE_WEI);
   }
 
   return updated;
-};
+}
 
 // Must be explicitly called for the worker to run on this host.
 export const initSendTransactionWorker = () => {
