thirdweb 5.44.0 → 5.44.2-nightly-7c2f616dfe6880beefa4eb48f8dcbce6bba9461a-20240808000401

package/src/transaction/serialize-transaction.ts

@@ -246,7 +246,12 @@ function serializeTransactionLegacy(
     if (typeof s === "undefined")
       throw new Error(`Invalid legacy signature value s: ${s}`);
 
-    serializedTransaction = [...serializedTransaction, toHex(v_), r, s];
+    serializedTransaction = [
+      ...serializedTransaction,
+      toHex(v_),
+      r === "0x00" ? "0x" : r,
+      s === "0x00" ? "0x" : s,
+    ];
   } else if (chainId > 0) {
     serializedTransaction = [
       ...serializedTransaction,
@@ -262,11 +267,16 @@ function serializeTransactionLegacy(
 export function toYParitySignatureArray(
   signature: ExactPartial<Signature>,
 ): Hex[] {
-  const { r, s, v, yParity } = signature;
-  if (typeof r === "undefined") return [];
-  if (typeof s === "undefined") return [];
+  const { v, yParity } = signature;
+
+  if (typeof signature.r === "undefined") return [];
+  if (typeof signature.s === "undefined") return [];
+
   if (typeof v === "undefined" && typeof yParity === "undefined") return [];
 
+  const r = trim(signature.r);
+  const s = trim(signature.s);
+
   const yParity_ = (() => {
     if (yParity === 1 || yParity === 0) return yParity ? toHex(1) : "0x";
     if (typeof yParity !== "undefined")
@@ -276,5 +286,5 @@ export function toYParitySignatureArray(
     if (v === 1n || v === 28n) return toHex(1);
     throw new Error(`Invalid signature value v: ${v}`);
   })();
-  return [yParity_, trim(r), trim(s)];
+  return [yParity_, r === "0x00" ? "0x" : r, s === "0x00" ? "0x" : s];
 }

package/src/utils/signatures/sign-message.test.ts

@@ -21,6 +21,15 @@ test("default", async () => {
   ).toMatchInlineSnapshot(
     '"0xc0cd7599731c37aa4c0815a89dc8dcb4ce479f83df7ee8ffc606a9ef29323e814b54bb8935b56e7c690f1ee4c6290da5c2f6df6fc3443fbe96bb1846a2c4fefc1c"',
   );
+
+  expect(
+    signMessage({
+      message: "0x787037Ba5b7eA8a8737627FfB67d35FdCaAd9A18",
+      privateKey: ANVIL_PKEY_A,
+    }),
+  ).toMatchInlineSnapshot(
+    '"0x151436da0ef734f06ae71f4b907a062fa5683b40af4221e86dfe5f2fc9f09ffa40c90fee4a0e48311506b84dc6f20e513dc4dc434f0f70a03af6ff3e22c7b7591c"',
+  );
 });
 
 test("raw", async () => {

package/src/utils/signatures/sign.ts

@@ -31,8 +31,8 @@ export type SignOptions = {
 export function sign({ hash, privateKey }: SignOptions): Signature {
   const { r, s, recovery } = secp256k1.sign(hash.slice(2), privateKey.slice(2));
   return {
-    r: toHex(r),
-    s: toHex(s),
+    r: toHex(r, { size: 32 }),
+    s: toHex(s, { size: 32 }),
     v: recovery ? 28n : 27n,
     yParity: recovery,
   };

package/src/utils/signatures/signature-to-hex.test.ts

@@ -30,4 +30,32 @@ test("default", () => {
   ).toMatchInlineSnapshot(
     '"0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81b"',
   );
+
+  expect(
+    signatureToHex({
+      r: toHex(
+        49782753348462494199823712700004552394425719014458918871452329774910450607807n,
+      ),
+      s: toHex(
+        33726695977844476214676913201140481102225469284307016937915595756355928419768n,
+      ),
+      yParity: 1,
+    }),
+  ).toMatchInlineSnapshot(
+    '"0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81c"',
+  );
+
+  expect(
+    signatureToHex({
+      r: toHex(
+        49782753348462494199823712700004552394425719014458918871452329774910450607807n,
+      ),
+      s: toHex(
+        33726695977844476214676913201140481102225469284307016937915595756355928419768n,
+      ),
+      yParity: 0,
+    }),
+  ).toMatchInlineSnapshot(
+    '"0x6e100a352ec6ad1b70802290e18aeed190704973570f3b8ed42cb9808e2ea6bf4a90a229a244495b41890987806fcbd2d5d23fc0dbe5f5256c2613c039d76db81b"',
+  );
 });

package/src/utils/signatures/signature-to-hex.ts

@@ -26,19 +26,14 @@ import { type Hex, hexToBigInt } from "../encoding/hex.js";
  * @utils
  */
 export function signatureToHex(signature: Signature): Hex {
-  const { r, s, v } = signature;
-  const vHex = (() => {
-    if (v === 27n) {
-      return "1b";
-    }
-    if (v === 28n) {
-      return "1c";
-    }
-    throw new Error("Invalid v value");
+  const { r, s, v, yParity } = signature;
+  const yParity_ = (() => {
+    if (yParity === 0 || yParity === 1) return yParity;
+    if (v && (v === 27n || v === 28n || v >= 35n)) return v % 2n === 0n ? 1 : 0;
+    throw new Error("Invalid `v` or `yParity` value");
   })();
-
   return `0x${new secp256k1.Signature(
     hexToBigInt(r),
     hexToBigInt(s),
-  ).toCompactHex()}${vHex}`;
+  ).toCompactHex()}${yParity_ === 0 ? "1b" : "1c"}`;
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.44.0";
+export const version = "5.44.2-nightly-7c2f616dfe6880beefa4eb48f8dcbce6bba9461a-20240808000401";