Merge branch 'main' into ph/addWalletTypeUsage

Author: d4mr

package.json

@@ -67,7 +67,7 @@
     "prisma": "^5.14.0",
     "prom-client": "^15.1.3",
     "superjson": "^2.2.1",
-    "thirdweb": "5.61.3",
+    "thirdweb": "^5.71.0",
     "uuid": "^9.0.1",
     "winston": "^3.14.1",
     "zod": "^3.23.8"

sdk/yarn.lock

@@ -554,12 +554,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.9:
   version "4.22.1"
@@ -764,10 +764,10 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -1096,11 +1096,11 @@ merge2@^1.3.0:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 min-indent@^1.0.0:
@@ -1326,9 +1326,9 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rollup@^2.79.1:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  version "2.79.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
   optionalDependencies:
     fsevents "~2.3.2"
 

src/server/routes/contract/extensions/erc1155/write/claimTo.ts

@@ -1,4 +1,4 @@
-import { type Static, Type } from "@sinclair/typebox";
+import { Static, Type } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import type { Address } from "thirdweb";
@@ -33,6 +33,11 @@ const requestBodySchema = Type.Object({
   quantity: Type.String({
     description: "Quantity of NFTs to mint",
   }),
+  singlePhaseDrop: Type.Optional(
+    Type.Boolean({
+      description: "Whether the drop is a single phase drop",
+    }),
+  ),
   ...txOverridesWithValueSchema.properties,
 });
 
@@ -70,7 +75,8 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
     handler: async (request, reply) => {
       const { chain, contractAddress } = request.params;
       const { simulateTx } = request.query;
-      const { receiver, tokenId, quantity, txOverrides } = request.body;
+      const { receiver, tokenId, quantity, singlePhaseDrop, txOverrides } =
+        request.body;
       const {
         "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
@@ -91,6 +97,7 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
         to: receiver,
         quantity: BigInt(quantity),
         tokenId: BigInt(tokenId),
+        singlePhaseDrop,
       });
 
       const queueId = await queueTransaction({

src/server/routes/contract/extensions/erc20/write/claimTo.ts

@@ -1,4 +1,4 @@
-import { type Static, Type } from "@sinclair/typebox";
+import { Static, Type } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import type { Address } from "thirdweb";
@@ -28,6 +28,11 @@ const requestBodySchema = Type.Object({
   amount: Type.String({
     description: "The amount of tokens to claim.",
   }),
+  singlePhaseDrop: Type.Optional(
+    Type.Boolean({
+      description: "Whether the drop is a single phase drop",
+    }),
+  ),
   ...txOverridesWithValueSchema.properties,
 });
 
@@ -65,7 +70,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
     handler: async (request, reply) => {
       const { chain, contractAddress } = request.params;
       const { simulateTx } = request.query;
-      const { recipient, amount, txOverrides } = request.body;
+      const { recipient, amount, singlePhaseDrop, txOverrides } = request.body;
       const {
         "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
@@ -84,6 +89,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
         from: fromAddress as Address,
         to: recipient,
         quantity: amount,
+        singlePhaseDrop,
       });
 
       const queueId = await queueTransaction({

src/server/routes/contract/extensions/erc721/write/claimTo.ts

@@ -1,4 +1,4 @@
-import { type Static, Type } from "@sinclair/typebox";
+import { Static, Type } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import type { Address } from "thirdweb";
@@ -30,6 +30,11 @@ const requestBodySchema = Type.Object({
   quantity: Type.String({
     description: "Quantity of NFTs to mint",
   }),
+  singlePhaseDrop: Type.Optional(
+    Type.Boolean({
+      description: "Whether the drop is a single phase drop",
+    }),
+  ),
   ...txOverridesWithValueSchema.properties,
 });
 
@@ -66,7 +71,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
     handler: async (request, reply) => {
       const { chain, contractAddress } = request.params;
       const { simulateTx } = request.query;
-      const { receiver, quantity, txOverrides } = request.body;
+      const { receiver, quantity, singlePhaseDrop, txOverrides } = request.body;
       const {
         "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
@@ -85,6 +90,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
         from: fromAddress as Address,
         to: receiver,
         quantity: BigInt(quantity),
+        singlePhaseDrop,
       });
 
       const queueId = await queueTransaction({