refactor(sdk): migrate more functions to ox

Author: gregfromstl

packages/thirdweb/src/utils/signatures/sign.ts

@@ -1,5 +1,4 @@
-import { secp256k1 } from "@noble/curves/secp256k1";
-import type { Signature } from "viem";
+import * as ox__Secp256k1 from "ox/Secp256k1";
 
 import { type Hex, toHex } from "../encoding/hex.js";
 
@@ -28,12 +27,12 @@ export type SignOptions = {
  * ```
  * @utils
  */
-export function sign({ hash, privateKey }: SignOptions): Signature {
-  const { r, s, recovery } = secp256k1.sign(hash.slice(2), privateKey.slice(2));
+export function sign({ hash, privateKey }: SignOptions) {
+  const { r, s, yParity } = ox__Secp256k1.sign({ payload: hash, privateKey });
   return {
     r: toHex(r, { size: 32 }),
     s: toHex(s, { size: 32 }),
-    v: recovery ? 28n : 27n,
-    yParity: recovery,
+    v: yParity === 1 ? 28n : 27n,
+    yParity,
   };
 }

packages/thirdweb/src/utils/signatures/signature-to-hex.ts

@@ -1,5 +1,6 @@
-import { secp256k1 } from "@noble/curves/secp256k1";
-import { type Hex, hexToBigInt } from "../encoding/hex.js";
+import * as ox__Hex from "ox/Hex";
+import * as ox__Signature from "ox/Signature";
+import type { Hex } from "../encoding/hex.js";
 
 // We can't migrate this to Ox without breaking changes
 
@@ -32,14 +33,9 @@ export function signatureToHex(signature: {
   v?: bigint;
   yParity?: number;
 }): Hex {
-  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()}${yParity_ === 0 ? "1b" : "1c"}`;
+  return ox__Signature.toHex({
+    r: ox__Hex.toBigInt(signature.r),
+    s: ox__Hex.toBigInt(signature.s),
+    yParity: (signature.yParity ?? signature.v === 28n) ? 1 : 0,
+  });
 }