Merge branch 'main' into ike/i18n

Author: ikethirdweb

.changeset/funny-eels-watch.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/auth": patch
+---
+
+Update to call uuidv4 to generate jti

.changeset/slimy-bees-greet.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/auth": patch
+---
+
+Expose buildJWT function

.changeset/two-plants-approve.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/sdk": patch
+---
+
+[SDK] Various small improvements

.changeset/wise-boats-perform.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/auth": patch
+---
+
+Update to use uuidv4 for default jti

packages/auth/src/core/functions/jwt.ts

@@ -38,7 +38,10 @@ function base64decode(data: string): string {
 /**
  * Build JWT token based on the authentication payload
  */
-async function buildJWT({ wallet, payload }: BuildJwtParams): Promise<string> {
+export async function buildJWT({
+  wallet,
+  payload,
+}: BuildJwtParams): Promise<string> {
   const payloadData = AuthenticationPayloadDataSchema.parse(payload);
 
   const message = JSON.stringify(payloadData);

packages/auth/src/core/index.ts

@@ -3,6 +3,7 @@ export { ThirdwebAuth } from "./auth";
 
 // Export individual auth functions
 export {
+  buildJWT,
   generateJWT,
   parseJWT,
   refreshJWT,

packages/auth/src/core/schema/authenticate.ts

@@ -9,7 +9,7 @@ export const AuthenticationPayloadDataSchema = z.object({
   exp: RawDateSchema,
   nbf: RawDateSchema,
   iat: RawDateSchema,
-  jti: z.string().default(uuidv4()),
+  jti: z.string().default(() => uuidv4()),
   ctx: JsonSchema.optional(),
 });
 

packages/auth/src/core/schema/login.ts

@@ -44,7 +44,7 @@ export const LoginPayloadDataSchema = z.object({
   uri: z.string().optional(),
   version: z.string().default("1"),
   chain_id: z.string().optional(),
-  nonce: z.string().default(uuidv4()),
+  nonce: z.string().default(() => uuidv4()),
   issued_at: z
     .date()
     .default(new Date())

packages/sdk/src/evm/common/legacy.ts

@@ -7,12 +7,13 @@ export async function getPrebuiltInfo(
 ): Promise<{ type: string; version: number } | undefined> {
   try {
     const contract = new Contract(address, IThirdwebContractABI, provider);
-    const [type, version] = await Promise.all([
-      utils
-        .toUtf8String(await contract.contractType()) // eslint-disable-next-line no-control-regex
-        .replace(/\x00/g, ""),
-      await contract.contractVersion(),
+    const [_type, version] = await Promise.all([
+      contract.contractType(),
+      contract.contractVersion(),
     ]);
+    const type = utils
+      .toUtf8String(_type) // eslint-disable-next-line no-control-regex
+      .replace(/\x00/g, "");
     return {
       type,
       version,

packages/sdk/src/evm/common/parseSnapshotInputs.ts

@@ -9,8 +9,11 @@ export async function parseSnapshotInputs(inputs: SnapshotInput) {
   );
 
   const results = [];
-  for (const chunk of chunks) {
-    results.push(...(await SnapshotInputSchema.parseAsync(chunk)));
+  const parsedChunks = await Promise.all(
+    chunks.map((chunk) => SnapshotInputSchema.parseAsync(chunk)),
+  );
+  for (const chunk of parsedChunks) {
+    results.push(...chunk);
   }
 
   return results;

packages/sdk/src/evm/common/permit.ts

@@ -131,14 +131,19 @@ export async function signDAIPermit(
   deadline?: BigNumberish,
   nonce?: BigNumberish,
 ) {
+  const [name, chainId, signerNonce] = await Promise.all([
+    getTokenName(signer, currencyAddress),
+    signer.getChainId(),
+    getSignerNonce(signer, currencyAddress),
+  ]);
   const domain = await getChainDomainSeperator(signer, {
-    name: await getTokenName(signer, currencyAddress),
+    name,
     version: "1",
-    chainId: await signer.getChainId(),
+    chainId,
     verifyingContract: currencyAddress,
   });
 
-  nonce = nonce || (await getSignerNonce(signer, currencyAddress)).toString();
+  nonce = nonce || signerNonce.toString();
   deadline = deadline || constants.MaxUint256;
 
   const message = {
@@ -186,14 +191,19 @@ export async function signEIP2612Permit(
   deadline?: BigNumberish,
   nonce?: BigNumberish,
 ) {
+  const [name, chainId, signerNonce] = await Promise.all([
+    getTokenName(signer, currencyAddress),
+    signer.getChainId(),
+    getSignerNonce(signer, currencyAddress),
+  ]);
   const domain = await getChainDomainSeperator(signer, {
-    name: await getTokenName(signer, currencyAddress),
+    name,
     version: "1",
-    chainId: await signer.getChainId(),
+    chainId,
     verifyingContract: currencyAddress,
   });
 
-  nonce = nonce || (await getSignerNonce(signer, currencyAddress)).toString();
+  nonce = nonce || signerNonce.toString();
   deadline = deadline || constants.MaxUint256;
 
   const message = {

packages/sdk/src/evm/common/sign.ts

@@ -55,7 +55,7 @@ export async function signTypedDataInternal(
   // an indirect way for accessing walletconnect's underlying provider
   if ((provider as any)?.provider?.isWalletConnect) {
     signature = await provider.send("eth_signTypedData", [
-      (await signer.getAddress()).toLowerCase(),
+      signerAddress,
       JSON.stringify(payload),
     ]);
   } else {