thirdweb 5.64.0-nightly-cdb907f175f7472d1fb3dea6547d946514564085-20241023000322 → 5.64.0

package/src/analytics/track/track.test.ts

@@ -0,0 +1,107 @@
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
+import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
+import type { ThirdwebClient } from "../../client/client.js";
+import { track } from "./index.js";
+
+const server = setupServer(
+  http.post("https://c.thirdweb.com/event", () => {
+    return HttpResponse.json({});
+  }),
+);
+
+describe("track", () => {
+  beforeAll(() => server.listen());
+  afterEach(() => server.resetHandlers());
+  afterAll(() => server.close());
+
+  it("should send a POST request with correct data", async () => {
+    const mockClient: ThirdwebClient = {
+      clientId: "test-client-id",
+      secretKey: undefined,
+    };
+
+    let requestBody: unknown;
+    server.use(
+      http.post("https://c.thirdweb.com/event", async (handler) => {
+        requestBody = await handler.request.json();
+        return HttpResponse.json({});
+      }),
+    );
+
+    await track({
+      client: mockClient,
+      data: {
+        action: "test-action",
+        data: "test-data",
+      },
+    });
+
+    expect(requestBody).toEqual({
+      source: "sdk",
+      action: "test-action",
+      data: "test-data",
+    });
+  });
+
+  it("should not throw an error if the request fails", async () => {
+    const mockClient: ThirdwebClient = {
+      clientId: "test-client-id",
+      secretKey: undefined,
+    };
+
+    server.use(
+      http.post("https://c.thirdweb.com/event", () => {
+        return HttpResponse.error();
+      }),
+    );
+
+    expect(() =>
+      track({
+        client: mockClient,
+        data: {
+          action: "test-action",
+          data: "test-data",
+        },
+      }),
+    ).not.toThrowError();
+
+    // Wait for the asynchronous POST request to complete
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  });
+
+  it("should send a POST request with correct headers", async () => {
+    const mockClient: ThirdwebClient = {
+      clientId: "test-client-id",
+      secretKey: undefined,
+    };
+
+    let requestHeaders: Headers | undefined;
+    server.use(
+      http.post("https://c.thirdweb.com/event", (handler) => {
+        requestHeaders = handler.request.headers;
+        return HttpResponse.json({});
+      }),
+    );
+
+    await track({
+      client: mockClient,
+      ecosystem: {
+        id: "ecosystem.test-ecosystem-id",
+        partnerId: "test-partner-id",
+      },
+      data: {
+        action: "test-action",
+        data: "test-data",
+      },
+    });
+
+    expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
+    expect(requestHeaders?.get("x-ecosystem-id")).toEqual(
+      "ecosystem.test-ecosystem-id",
+    );
+    expect(requestHeaders?.get("x-ecosystem-partner-id")).toEqual(
+      "test-partner-id",
+    );
+  });
+});

package/src/analytics/track/transaction.test.ts

@@ -0,0 +1,130 @@
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
+import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
+import type { ThirdwebClient } from "../../client/client.js";
+import { trackTransaction } from "./transaction.js";
+
+const server = setupServer(
+  http.post("https://c.thirdweb.com/event", () => {
+    return HttpResponse.json({});
+  }),
+);
+
+describe("transaction tracking", () => {
+  beforeAll(() => server.listen());
+  afterEach(() => server.resetHandlers());
+  afterAll(() => server.close());
+
+  const mockClient: ThirdwebClient = {
+    clientId: "test-client-id",
+    secretKey: undefined,
+  };
+
+  it("should track successful transactions", async () => {
+    let requestBody: unknown;
+    server.use(
+      http.post("https://c.thirdweb.com/event", async (handler) => {
+        requestBody = await handler.request.json();
+        return HttpResponse.json({});
+      }),
+    );
+
+    await trackTransaction({
+      client: mockClient,
+      transactionHash: "0xabcdef1234567890",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
+      chainId: 1,
+      contractAddress: "0x0987654321098765432109876543210987654321",
+      functionName: "transfer",
+      gasPrice: BigInt(20000000000),
+    });
+
+    expect(requestBody).toEqual({
+      source: "sdk",
+      action: "transaction:sent",
+      clientId: "test-client-id",
+      transactionHash: "0xabcdef1234567890",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
+      chainId: 1,
+      contractAddress: "0x0987654321098765432109876543210987654321",
+      functionName: "transfer",
+      gasPrice: "20000000000",
+      errorCode: undefined,
+    });
+  });
+
+  it("should track transaction errors", async () => {
+    let requestBody: unknown;
+    server.use(
+      http.post("https://c.thirdweb.com/event", async (handler) => {
+        requestBody = await handler.request.json();
+        return HttpResponse.json({});
+      }),
+    );
+
+    await trackTransaction({
+      client: mockClient,
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
+      chainId: 1,
+      error: {
+        message: "Insufficient funds",
+        code: "INSUFFICIENT_FUNDS",
+      },
+    });
+
+    expect(requestBody).toEqual({
+      source: "sdk",
+      action: "transaction:sent",
+      clientId: "test-client-id",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
+      chainId: 1,
+      errorCode: '{"message":"Insufficient funds","code":"INSUFFICIENT_FUNDS"}',
+      transactionHash: undefined,
+      contractAddress: undefined,
+      functionName: undefined,
+      gasPrice: undefined,
+    });
+  });
+
+  it("should send a POST request with correct headers", async () => {
+    const mockClient: ThirdwebClient = {
+      clientId: "test-client-id",
+      secretKey: undefined,
+    };
+
+    let requestHeaders: Headers | undefined;
+    server.use(
+      http.post("https://c.thirdweb.com/event", (handler) => {
+        requestHeaders = handler.request.headers;
+        return HttpResponse.json({});
+      }),
+    );
+
+    await trackTransaction({
+      client: mockClient,
+      ecosystem: {
+        id: "ecosystem.test-ecosystem-id",
+        partnerId: "test-partner-id",
+      },
+      transactionHash: "0xabcdef1234567890",
+      walletAddress: "0x1234567890123456789012345678901234567890",
+      walletType: "io.metamask",
+      chainId: 1,
+      contractAddress: "0x0987654321098765432109876543210987654321",
+      functionName: "transfer",
+      gasPrice: BigInt(20000000000),
+    });
+
+    expect(requestHeaders?.get("x-client-id")).toEqual("test-client-id");
+    expect(requestHeaders?.get("x-ecosystem-id")).toEqual(
+      "ecosystem.test-ecosystem-id",
+    );
+    expect(requestHeaders?.get("x-ecosystem-partner-id")).toEqual(
+      "test-partner-id",
+    );
+  });
+});

package/src/analytics/track/transaction.ts

@@ -0,0 +1,57 @@
+import type { ThirdwebClient } from "../../client/client.js";
+import { stringify } from "../../utils/json.js";
+import type { Ecosystem } from "../../wallets/in-app/core/wallet/types.js";
+import type { WalletId } from "../../wallets/wallet-types.js";
+import { track } from "./index.js";
+
+type TransactionEvent = {
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+  transactionHash?: string;
+  walletAddress?: string;
+  walletType?: WalletId;
+  chainId?: number;
+  contractAddress?: string;
+  functionName?: string;
+  gasPrice?: bigint;
+  error?: {
+    message: string;
+    code: string;
+  };
+};
+
+/**
+ * @internal
+ */
+export async function trackTransaction(args: TransactionEvent) {
+  return trackTransactionEvent({
+    ...args,
+    action: "transaction:sent",
+  });
+}
+
+/**
+ * @internal
+ */
+function trackTransactionEvent(
+  args: TransactionEvent & {
+    action: "transaction:sent";
+  },
+) {
+  return track({
+    client: args.client,
+    ecosystem: args.ecosystem,
+    data: {
+      action: args.action,
+      clientId: args.client.clientId,
+      chainId: args.chainId,
+      transactionHash: args.transactionHash,
+      walletAddress: args.walletAddress,
+      walletType: args.walletType,
+      contractAddress: args.contractAddress,
+      functionName: args.functionName,
+      gasPrice: args.gasPrice,
+      errorCode: stringify(args.error),
+    },
+  });
+}

package/src/auth/core/verify-login-payload.ts

@@ -1,3 +1,4 @@
+import { trackLogin } from "../../analytics/track/siwe.js";
 import { getCachedChain } from "../../chains/utils.js";
 import { verifySignature } from "../verify-signature.js";
 import { DEFAULT_LOGIN_STATEMENT, DEFAULT_LOGIN_VERSION } from "./constants.js";
@@ -42,7 +43,7 @@ export type VerifyLoginPayloadResult =
  * @internal
  */
 export function verifyLoginPayload(options: AuthOptions) {
-  return async ({
+  const verifyLoginPayloadFn = async ({
     payload,
     signature,
   }: VerifyLoginPayloadParams): Promise<VerifyLoginPayloadResult> => {
@@ -152,4 +153,27 @@ export function verifyLoginPayload(options: AuthOptions) {
       payload: { ...payload, [VERIFIED_SYMBOL]: true },
     };
   };
+
+  return async ({
+    payload,
+    signature,
+  }: VerifyLoginPayloadParams): Promise<VerifyLoginPayloadResult> => {
+    const result = await verifyLoginPayloadFn({ payload, signature });
+
+    // We can only track logins if the client is provided
+    if (options.client) {
+      trackLogin({
+        client: options.client,
+        walletAddress: payload.address,
+        chainId: payload.chain_id
+          ? Number.parseInt(payload.chain_id)
+          : undefined,
+        error: !result.valid
+          ? { message: result.error, code: "401" }
+          : undefined,
+      });
+    }
+
+    return result;
+  };
 }

package/src/exports/extensions/erc721.ts

@@ -213,3 +213,7 @@ export {
   type UpdateTokenURIParams,
   isUpdateTokenURISupported,
 } from "../../extensions/erc721/write/updateTokenURI.js";
+export {
+  claimToBatch,
+  type ClaimToBatchParams,
+} from "../../extensions/erc721/drops/write/claimToBatch.js";

package/src/exports/pay.ts

@@ -10,9 +10,9 @@ export {
   type GetBuyWithCryptoTransferParams,
 } from "../pay/buyWithCrypto/getTransfer.js";
 
-export {
-  type QuoteApprovalParams,
-  type QuoteTokenInfo,
+export type {
+  QuoteApprovalParams,
+  QuoteTokenInfo,
 } from "../pay/buyWithCrypto/commonTypes.js";
 
 export {

package/src/exports/react.native.ts

@@ -34,9 +34,9 @@ export { useWaitForReceipt } from "../react/core/hooks/contract/useWaitForReceip
 export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
 
 // transaction
-export {
-  type SendTransactionConfig,
-  type SendTransactionPayModalConfig,
+export type {
+  SendTransactionConfig,
+  SendTransactionPayModalConfig,
 } from "../react/core/hooks/transaction/useSendTransaction.js";
 export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
 export { useSendTransaction } from "../react/native/hooks/transaction/useSendTransaction.js";

package/src/exports/react.ts

@@ -6,7 +6,7 @@ export type {
 
 export { ConnectButton } from "../react/web/ui/ConnectWallet/ConnectButton.js";
 export { ConnectEmbed } from "../react/web/ui/ConnectWallet/Modal/ConnectEmbed.js";
-export { type ConnectEmbedProps } from "../react/core/hooks/connection/ConnectEmbedProps.js";
+export type { ConnectEmbedProps } from "../react/core/hooks/connection/ConnectEmbedProps.js";
 
 export type {
   ConnectButtonProps,
@@ -70,9 +70,9 @@ export { useWaitForReceipt } from "../react/core/hooks/contract/useWaitForReceip
 export { useContractEvents } from "../react/core/hooks/contract/useContractEvents.js";
 
 // transaction
-export {
-  type SendTransactionConfig,
-  type SendTransactionPayModalConfig,
+export type {
+  SendTransactionConfig,
+  SendTransactionPayModalConfig,
 } from "../react/core/hooks/transaction/useSendTransaction.js";
 export { useSimulateTransaction } from "../react/core/hooks/transaction/useSimulateTransaction.js";
 export { useSendTransaction } from "../react/web/hooks/transaction/useSendTransaction.js";
@@ -123,7 +123,7 @@ export { AutoConnect } from "../react/web/ui/AutoConnect/AutoConnect.js";
 export type { AutoConnectProps } from "../react/core/hooks/connection/types.js";
 
 // auth
-export { type SiweAuthOptions } from "../react/core/hooks/auth/useSiweAuth.js";
+export type { SiweAuthOptions } from "../react/core/hooks/auth/useSiweAuth.js";
 
 export {
   PayEmbed,

package/src/exports/thirdweb.ts

@@ -180,9 +180,9 @@ export {
   type GetBuyWithCryptoQuoteParams,
 } from "../pay/buyWithCrypto/getQuote.js";
 
-export {
-  type QuoteApprovalParams,
-  type QuoteTokenInfo,
+export type {
+  QuoteApprovalParams,
+  QuoteTokenInfo,
 } from "../pay/buyWithCrypto/commonTypes.js";
 
 export {

package/src/exports/wallets/embedded.ts

@@ -12,4 +12,4 @@ export {
   getUserEmail,
 } from "../../wallets/in-app/web/lib/auth/index.js";
 
-export { type GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
+export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";

package/src/exports/wallets/in-app.native.ts

@@ -11,7 +11,7 @@ export {
   linkProfile,
 } from "../../wallets/in-app/native/auth/index.js";
 
-export { type GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
+export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
 export type {
   InAppWalletCreationOptions,
   InAppWalletAuth,

package/src/exports/wallets/in-app.ts

@@ -11,7 +11,7 @@ export {
   linkProfile,
 } from "../../wallets/in-app/web/lib/auth/index.js";
 
-export { type GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
+export type { GetAuthenticatedUserParams } from "../../wallets/in-app/core/authentication/types.js";
 export type {
   InAppWalletCreationOptions,
   InAppWalletAuth,
@@ -21,4 +21,7 @@ export type {
 
 export { hasStoredPasskey } from "../../wallets/in-app/web/lib/auth/passkeys.js";
 
-export { socialIcons } from "../../react/core/utils/walletIcon.js";
+export {
+  socialIcons,
+  getSocialIcon,
+} from "../../react/core/utils/walletIcon.js";

package/src/exports/wallets.native.ts

@@ -116,7 +116,7 @@ export type {
 
 export { getAllWalletsList } from "../wallets/getAllWalletsList.js";
 export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
-export { type WalletInfo } from "../wallets/wallet-info.js";
+export type { WalletInfo } from "../wallets/wallet-info.js";
 
 export { createWalletAdapter } from "../adapters/wallet-adapter.js";
 export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";

package/src/exports/wallets.ts

@@ -125,7 +125,7 @@ export type {
 
 export { getAllWalletsList } from "../wallets/getAllWalletsList.js";
 export { getWalletInfo } from "../wallets/__generated__/getWalletInfo.js";
-export { type WalletInfo } from "../wallets/wallet-info.js";
+export type { WalletInfo } from "../wallets/wallet-info.js";
 
 export { createWalletAdapter } from "../adapters/wallet-adapter.js";
 export type { AdapterWalletOptions } from "../adapters/wallet-adapter.js";