@sovereign-sdk/signers 0.5.1 → 0.5.2

package/dist/ledger-solana/node.mjs

@@ -1,24 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
 // src/ledger-solana/node.ts
 import TransportNodeHid from "@ledgerhq/hw-transport-node-hid";
 
@@ -32,83 +11,73 @@ var LedgerSolanaSignerBase = class {
     this.transport = null;
     this.solanaApp = null;
   }
-  connect() {
-    return __async(this, null, function* () {
-      if (this.transport && this.solanaApp) {
-        return;
-      }
-      try {
-        this.transport = yield this.loadTransport();
-        const solana = new Solana(this.transport);
-        const version = yield solana.getAppConfiguration().then((r) => r.version);
-        const [major, minor, _patch] = version.split(".").map(Number);
-        if (major < 1 || major === 1 && minor < 8) {
-          throw new Error(
-            "Signing off-chain messages requires Solana Ledger App 1.8.0 or later"
-          );
-        }
-        this.solanaApp = solana;
-      } catch (error) {
-        throw new Error(`Failed to connect to Ledger device: ${error}`);
-      }
-    });
-  }
-  sign(message) {
-    return __async(this, null, function* () {
-      yield this.connect();
-      if (!this.solanaApp) {
-        throw new Error("Ledger Solana app not initialized");
-      }
-      try {
-        const result = yield this.solanaApp.signOffchainMessage(
-          this.derivationPath,
-          Buffer.from(message)
+  async connect() {
+    if (this.transport && this.solanaApp) {
+      return;
+    }
+    try {
+      this.transport = await this.loadTransport();
+      const solana = new Solana(this.transport);
+      const version = await solana.getAppConfiguration().then((r) => r.version);
+      const [major, minor, _patch] = version.split(".").map(Number);
+      if (major < 1 || major === 1 && minor < 8) {
+        throw new Error(
+          "Signing off-chain messages requires Solana Ledger App 1.8.0 or later"
         );
-        return new Uint8Array(result.signature);
-      } catch (error) {
-        throw new Error(`Failed to sign message with Ledger: ${error}`);
       }
-    });
+      this.solanaApp = solana;
+    } catch (error) {
+      throw new Error(`Failed to connect to Ledger device: ${error}`);
+    }
   }
-  publicKey() {
-    return __async(this, null, function* () {
-      yield this.connect();
-      if (!this.solanaApp) {
-        throw new Error("Ledger Solana app not initialized");
-      }
-      try {
-        const result = yield this.solanaApp.getAddress(
-          this.derivationPath,
-          false
-        );
-        return new Uint8Array(result.address);
-      } catch (error) {
-        throw new Error(`Failed to get public key from Ledger: ${error}`);
-      }
-    });
+  async sign(message) {
+    await this.connect();
+    if (!this.solanaApp) {
+      throw new Error("Ledger Solana app not initialized");
+    }
+    try {
+      const result = await this.solanaApp.signOffchainMessage(
+        this.derivationPath,
+        Buffer.from(message)
+      );
+      return new Uint8Array(result.signature);
+    } catch (error) {
+      throw new Error(`Failed to sign message with Ledger: ${error}`);
+    }
   }
-  disconnect() {
-    return __async(this, null, function* () {
-      if (this.transport) {
-        yield this.transport.close();
-        this.transport = null;
-        this.solanaApp = null;
-      }
-    });
+  async publicKey() {
+    await this.connect();
+    if (!this.solanaApp) {
+      throw new Error("Ledger Solana app not initialized");
+    }
+    try {
+      const result = await this.solanaApp.getAddress(
+        this.derivationPath,
+        false
+      );
+      return new Uint8Array(result.address);
+    } catch (error) {
+      throw new Error(`Failed to get public key from Ledger: ${error}`);
+    }
+  }
+  async disconnect() {
+    if (this.transport) {
+      await this.transport.close();
+      this.transport = null;
+      this.solanaApp = null;
+    }
   }
 };
 
 // src/ledger-solana/node.ts
-function loadNodeTransport() {
-  return __async(this, null, function* () {
-    try {
-      return yield TransportNodeHid.create();
-    } catch (error) {
-      throw new Error(
-        `Failed to connect via Node HID transport. Make sure your Ledger is connected. Error: ${error}`
-      );
-    }
-  });
+async function loadNodeTransport() {
+  try {
+    return await TransportNodeHid.create();
+  } catch (error) {
+    throw new Error(
+      `Failed to connect via Node HID transport. Make sure your Ledger is connected. Error: ${error}`
+    );
+  }
 }
 var LedgerSolanaSigner = class extends LedgerSolanaSignerBase {
   constructor(derivationPath = "44'/501'") {

package/dist/ledger-solana/node.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/ledger-solana/node.ts","../../src/ledger-solana/common.ts"],"sourcesContent":["import type Transport from \"@ledgerhq/hw-transport\";\nimport TransportNodeHid from \"@ledgerhq/hw-transport-node-hid\";\nimport { LedgerSolanaSignerBase } from \"./common\";\n\nasync function loadNodeTransport(): Promise<Transport> {\n  try {\n    return await TransportNodeHid.create();\n  } catch (error) {\n    throw new Error(\n      `Failed to connect via Node HID transport. Make sure your Ledger is connected. Error: ${error}`,\n    );\n  }\n}\n\nexport class LedgerSolanaSigner extends LedgerSolanaSignerBase {\n  constructor(derivationPath = \"44'/501'\") {\n    super(loadNodeTransport, derivationPath);\n  }\n}\n","import Solana from \"@ledgerhq/hw-app-solana\";\nimport type Transport from \"@ledgerhq/hw-transport\";\nimport type { Signer } from \"../signer\";\n\nexport type TransportLoader = () => Promise<Transport>;\n\nexport class LedgerSolanaSignerBase implements Signer {\n  readonly __ledgerSolanaSigner = true as const;\n\n  private transport: Transport | null = null;\n  private solanaApp: Solana | null = null;\n\n  constructor(\n    private loadTransport: TransportLoader,\n    private derivationPath = \"44'/501'\",\n  ) {}\n\n  private async connect(): Promise<void> {\n    if (this.transport && this.solanaApp) {\n      return;\n    }\n\n    try {\n      this.transport = await this.loadTransport();\n\n      const solana = new Solana(this.transport);\n      const version = await solana.getAppConfiguration().then((r) => r.version);\n      const [major, minor, _patch] = version.split(\".\").map(Number);\n      if (major < 1 || (major === 1 && minor < 8)) {\n        throw new Error(\n          \"Signing off-chain messages requires Solana Ledger App 1.8.0 or later\",\n        );\n      }\n      this.solanaApp = solana;\n    } catch (error) {\n      throw new Error(`Failed to connect to Ledger device: ${error}`);\n    }\n  }\n\n  public async sign(message: Uint8Array): Promise<Uint8Array> {\n    await this.connect();\n\n    if (!this.solanaApp) {\n      throw new Error(\"Ledger Solana app not initialized\");\n    }\n\n    try {\n      const result = await this.solanaApp.signOffchainMessage(\n        this.derivationPath,\n        Buffer.from(message),\n      );\n      return new Uint8Array(result.signature);\n    } catch (error) {\n      throw new Error(`Failed to sign message with Ledger: ${error}`);\n    }\n  }\n\n  public async publicKey(): Promise<Uint8Array> {\n    await this.connect();\n\n    if (!this.solanaApp) {\n      throw new Error(\"Ledger Solana app not initialized\");\n    }\n\n    try {\n      const result = await this.solanaApp.getAddress(\n        this.derivationPath,\n        false,\n      );\n      return new Uint8Array(result.address);\n    } catch (error) {\n      throw new Error(`Failed to get public key from Ledger: ${error}`);\n    }\n  }\n\n  public async disconnect(): Promise<void> {\n    if (this.transport) {\n      await this.transport.close();\n      this.transport = null;\n      this.solanaApp = null;\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,sBAAsB;;;ACD7B,OAAO,YAAY;AAMZ,IAAM,yBAAN,MAA+C;AAAA,EAMpD,YACU,eACA,iBAAiB,YACzB;AAFQ;AACA;AAPV,SAAS,uBAAuB;AAEhC,SAAQ,YAA8B;AACtC,SAAQ,YAA2B;AAAA,EAKhC;AAAA,EAEW,UAAyB;AAAA;AACrC,UAAI,KAAK,aAAa,KAAK,WAAW;AACpC;AAAA,MACF;AAEA,UAAI;AACF,aAAK,YAAY,MAAM,KAAK,cAAc;AAE1C,cAAM,SAAS,IAAI,OAAO,KAAK,SAAS;AACxC,cAAM,UAAU,MAAM,OAAO,oBAAoB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO;AACxE,cAAM,CAAC,OAAO,OAAO,MAAM,IAAI,QAAQ,MAAM,GAAG,EAAE,IAAI,MAAM;AAC5D,YAAI,QAAQ,KAAM,UAAU,KAAK,QAAQ,GAAI;AAC3C,gBAAM,IAAI;AAAA,YACR;AAAA,UACF;AAAA,QACF;AACA,aAAK,YAAY;AAAA,MACnB,SAAS,OAAO;AACd,cAAM,IAAI,MAAM,uCAAuC,KAAK,EAAE;AAAA,MAChE;AAAA,IACF;AAAA;AAAA,EAEa,KAAK,SAA0C;AAAA;AAC1D,YAAM,KAAK,QAAQ;AAEnB,UAAI,CAAC,KAAK,WAAW;AACnB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,UAAU;AAAA,UAClC,KAAK;AAAA,UACL,OAAO,KAAK,OAAO;AAAA,QACrB;AACA,eAAO,IAAI,WAAW,OAAO,SAAS;AAAA,MACxC,SAAS,OAAO;AACd,cAAM,IAAI,MAAM,uCAAuC,KAAK,EAAE;AAAA,MAChE;AAAA,IACF;AAAA;AAAA,EAEa,YAAiC;AAAA;AAC5C,YAAM,KAAK,QAAQ;AAEnB,UAAI,CAAC,KAAK,WAAW;AACnB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,UAAU;AAAA,UAClC,KAAK;AAAA,UACL;AAAA,QACF;AACA,eAAO,IAAI,WAAW,OAAO,OAAO;AAAA,MACtC,SAAS,OAAO;AACd,cAAM,IAAI,MAAM,yCAAyC,KAAK,EAAE;AAAA,MAClE;AAAA,IACF;AAAA;AAAA,EAEa,aAA4B;AAAA;AACvC,UAAI,KAAK,WAAW;AAClB,cAAM,KAAK,UAAU,MAAM;AAC3B,aAAK,YAAY;AACjB,aAAK,YAAY;AAAA,MACnB;AAAA,IACF;AAAA;AACF;;;AD9EA,SAAe,oBAAwC;AAAA;AACrD,QAAI;AACF,aAAO,MAAM,iBAAiB,OAAO;AAAA,IACvC,SAAS,OAAO;AACd,YAAM,IAAI;AAAA,QACR,wFAAwF,KAAK;AAAA,MAC/F;AAAA,IACF;AAAA,EACF;AAAA;AAEO,IAAM,qBAAN,cAAiC,uBAAuB;AAAA,EAC7D,YAAY,iBAAiB,YAAY;AACvC,UAAM,mBAAmB,cAAc;AAAA,EACzC;AACF;","names":[]}
+{"version":3,"sources":["../../src/ledger-solana/node.ts","../../src/ledger-solana/common.ts"],"sourcesContent":["import type Transport from \"@ledgerhq/hw-transport\";\nimport TransportNodeHid from \"@ledgerhq/hw-transport-node-hid\";\nimport { LedgerSolanaSignerBase } from \"./common\";\n\nasync function loadNodeTransport(): Promise<Transport> {\n  try {\n    return await TransportNodeHid.create();\n  } catch (error) {\n    throw new Error(\n      `Failed to connect via Node HID transport. Make sure your Ledger is connected. Error: ${error}`,\n    );\n  }\n}\n\nexport class LedgerSolanaSigner extends LedgerSolanaSignerBase {\n  constructor(derivationPath = \"44'/501'\") {\n    super(loadNodeTransport, derivationPath);\n  }\n}\n","import Solana from \"@ledgerhq/hw-app-solana\";\nimport type Transport from \"@ledgerhq/hw-transport\";\nimport type { Signer } from \"../signer\";\n\nexport type TransportLoader = () => Promise<Transport>;\n\nexport class LedgerSolanaSignerBase implements Signer {\n  readonly __ledgerSolanaSigner = true as const;\n\n  private transport: Transport | null = null;\n  private solanaApp: Solana | null = null;\n\n  constructor(\n    private loadTransport: TransportLoader,\n    private derivationPath = \"44'/501'\",\n  ) {}\n\n  private async connect(): Promise<void> {\n    if (this.transport && this.solanaApp) {\n      return;\n    }\n\n    try {\n      this.transport = await this.loadTransport();\n\n      const solana = new Solana(this.transport);\n      const version = await solana.getAppConfiguration().then((r) => r.version);\n      const [major, minor, _patch] = version.split(\".\").map(Number);\n      if (major < 1 || (major === 1 && minor < 8)) {\n        throw new Error(\n          \"Signing off-chain messages requires Solana Ledger App 1.8.0 or later\",\n        );\n      }\n      this.solanaApp = solana;\n    } catch (error) {\n      throw new Error(`Failed to connect to Ledger device: ${error}`);\n    }\n  }\n\n  public async sign(message: Uint8Array): Promise<Uint8Array> {\n    await this.connect();\n\n    if (!this.solanaApp) {\n      throw new Error(\"Ledger Solana app not initialized\");\n    }\n\n    try {\n      const result = await this.solanaApp.signOffchainMessage(\n        this.derivationPath,\n        Buffer.from(message),\n      );\n      return new Uint8Array(result.signature);\n    } catch (error) {\n      throw new Error(`Failed to sign message with Ledger: ${error}`);\n    }\n  }\n\n  public async publicKey(): Promise<Uint8Array> {\n    await this.connect();\n\n    if (!this.solanaApp) {\n      throw new Error(\"Ledger Solana app not initialized\");\n    }\n\n    try {\n      const result = await this.solanaApp.getAddress(\n        this.derivationPath,\n        false,\n      );\n      return new Uint8Array(result.address);\n    } catch (error) {\n      throw new Error(`Failed to get public key from Ledger: ${error}`);\n    }\n  }\n\n  public async disconnect(): Promise<void> {\n    if (this.transport) {\n      await this.transport.close();\n      this.transport = null;\n      this.solanaApp = null;\n    }\n  }\n}\n"],"mappings":";AACA,OAAO,sBAAsB;;;ACD7B,OAAO,YAAY;AAMZ,IAAM,yBAAN,MAA+C;AAAA,EAMpD,YACU,eACA,iBAAiB,YACzB;AAFQ;AACA;AAPV,SAAS,uBAAuB;AAEhC,SAAQ,YAA8B;AACtC,SAAQ,YAA2B;AAAA,EAKhC;AAAA,EAEH,MAAc,UAAyB;AACrC,QAAI,KAAK,aAAa,KAAK,WAAW;AACpC;AAAA,IACF;AAEA,QAAI;AACF,WAAK,YAAY,MAAM,KAAK,cAAc;AAE1C,YAAM,SAAS,IAAI,OAAO,KAAK,SAAS;AACxC,YAAM,UAAU,MAAM,OAAO,oBAAoB,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO;AACxE,YAAM,CAAC,OAAO,OAAO,MAAM,IAAI,QAAQ,MAAM,GAAG,EAAE,IAAI,MAAM;AAC5D,UAAI,QAAQ,KAAM,UAAU,KAAK,QAAQ,GAAI;AAC3C,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAAA,MACF;AACA,WAAK,YAAY;AAAA,IACnB,SAAS,OAAO;AACd,YAAM,IAAI,MAAM,uCAAuC,KAAK,EAAE;AAAA,IAChE;AAAA,EACF;AAAA,EAEA,MAAa,KAAK,SAA0C;AAC1D,UAAM,KAAK,QAAQ;AAEnB,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,mCAAmC;AAAA,IACrD;AAEA,QAAI;AACF,YAAM,SAAS,MAAM,KAAK,UAAU;AAAA,QAClC,KAAK;AAAA,QACL,OAAO,KAAK,OAAO;AAAA,MACrB;AACA,aAAO,IAAI,WAAW,OAAO,SAAS;AAAA,IACxC,SAAS,OAAO;AACd,YAAM,IAAI,MAAM,uCAAuC,KAAK,EAAE;AAAA,IAChE;AAAA,EACF;AAAA,EAEA,MAAa,YAAiC;AAC5C,UAAM,KAAK,QAAQ;AAEnB,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,mCAAmC;AAAA,IACrD;AAEA,QAAI;AACF,YAAM,SAAS,MAAM,KAAK,UAAU;AAAA,QAClC,KAAK;AAAA,QACL;AAAA,MACF;AACA,aAAO,IAAI,WAAW,OAAO,OAAO;AAAA,IACtC,SAAS,OAAO;AACd,YAAM,IAAI,MAAM,yCAAyC,KAAK,EAAE;AAAA,IAClE;AAAA,EACF;AAAA,EAEA,MAAa,aAA4B;AACvC,QAAI,KAAK,WAAW;AAClB,YAAM,KAAK,UAAU,MAAM;AAC3B,WAAK,YAAY;AACjB,WAAK,YAAY;AAAA,IACnB;AAAA,EACF;AACF;;;AD9EA,eAAe,oBAAwC;AACrD,MAAI;AACF,WAAO,MAAM,iBAAiB,OAAO;AAAA,EACvC,SAAS,OAAO;AACd,UAAM,IAAI;AAAA,MACR,wFAAwF,KAAK;AAAA,IAC/F;AAAA,EACF;AACF;AAEO,IAAM,qBAAN,cAAiC,uBAAuB;AAAA,EAC7D,YAAY,iBAAiB,YAAY;AACvC,UAAM,mBAAmB,cAAc;AAAA,EACzC;AACF;","names":[]}

package/dist/wasm.d.mts

@@ -18,6 +18,7 @@ declare class Eip712Signer implements Signer {
     constructor(provider: MetaMaskInpageProvider, schemaJson: Record<string, unknown>, address: string);
     /**
      * Cache the public key recovered from a signature.
+     * Uses viem's parseSignature which accepts high-s signatures (unlike ethers).
      */
     private cachePublicKey;
     /**

package/dist/wasm.d.ts

@@ -18,6 +18,7 @@ declare class Eip712Signer implements Signer {
     constructor(provider: MetaMaskInpageProvider, schemaJson: Record<string, unknown>, address: string);
     /**
      * Cache the public key recovered from a signature.
+     * Uses viem's parseSignature which accepts high-s signatures (unlike ethers).
      */
     private cachePublicKey;
     /**

package/dist/wasm.js

@@ -26,26 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 
 // src/wasm.ts
 var wasm_exports = {};
@@ -58,7 +38,7 @@ module.exports = __toCommonJS(wasm_exports);
 var secp = __toESM(require("@noble/secp256k1"));
 var import_universal_wallet_wasm = require("@sovereign-sdk/universal-wallet-wasm");
 var import_utils = require("@sovereign-sdk/utils");
-var import_ethers = require("ethers");
+var import_viem = require("viem");
 
 // src/errors.ts
 var SignerError = class extends Error {
@@ -77,6 +57,15 @@ var SignerError = class extends Error {
 };
 
 // src/wasm/eip712.ts
+function normalizeSignature(signature) {
+  const r = (0, import_utils.hexToBytes)(signature.r.slice(2));
+  const s = (0, import_utils.hexToBytes)(signature.s.slice(2));
+  let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));
+  if (secpSig.hasHighS()) {
+    secpSig = secpSig.normalizeS();
+  }
+  return secpSig.toCompactRawBytes();
+}
 var _Eip712Signer = class _Eip712Signer {
   constructor(provider, schemaJson, address) {
     if (!address) {
@@ -88,83 +77,78 @@ var _Eip712Signer = class _Eip712Signer {
   }
   /**
    * Cache the public key recovered from a signature.
+   * Uses viem's parseSignature which accepts high-s signatures (unlike ethers).
    */
   cachePublicKey(signingHash, signature) {
     if (this.cachedPublicKey) return;
-    let secpSig = secp.Signature.fromCompact(
-      new Uint8Array([
-        ...(0, import_utils.hexToBytes)(signature.r.slice(2)),
-        ...(0, import_utils.hexToBytes)(signature.s.slice(2))
-      ])
-    );
-    secpSig = secpSig.addRecoveryBit(signature.yParity);
+    const r = (0, import_utils.hexToBytes)(signature.r.slice(2));
+    const s = (0, import_utils.hexToBytes)(signature.s.slice(2));
+    let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));
+    secpSig = secpSig.addRecoveryBit(signature.yParity ?? 0);
     const publicKey = secpSig.recoverPublicKey(signingHash);
     this.cachedPublicKey = publicKey.toBytes(true);
   }
   /**
    * Get the public key. Requires sign() to be called first to recover the key from a signature.
    */
-  publicKey() {
-    return __async(this, null, function* () {
-      if (!this.cachedPublicKey) {
-        throw new SignerError(
-          "Public key was not available, you must call sign() first",
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      return this.cachedPublicKey;
-    });
+  async publicKey() {
+    if (!this.cachedPublicKey) {
+      throw new SignerError(
+        "Public key was not available, you must call sign() first",
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    return this.cachedPublicKey;
   }
   /**
    * Sign an UnsignedTransaction using EIP-712 typed data signing.
    */
-  sign(message) {
-    return __async(this, null, function* () {
-      const address = this.address;
-      if (message.length < 32) {
-        throw new SignerError(
-          "Message too short, expected at least 32 bytes for chain hash",
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      const unsignedTxBytes = message.slice(0, -32);
-      const typeIndex = this.schema.knownTypeIndex(
-        import_universal_wallet_wasm.KnownTypeId.UnsignedTransaction
+  async sign(message) {
+    const address = this.address;
+    if (message.length < 32) {
+      throw new SignerError(
+        "Message too short, expected at least 32 bytes for chain hash",
+        _Eip712Signer.SIGNER_ID
       );
-      let eip712Json;
-      try {
-        eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);
-      } catch (error) {
-        throw new SignerError(
-          `Failed to generate EIP-712 JSON from message: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      let signingHash;
-      try {
-        signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);
-      } catch (error) {
-        throw new SignerError(
-          `Failed to generate EIP-712 signing hash: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      let signatureHex;
-      try {
-        signatureHex = yield this.provider.request({
-          method: "eth_signTypedData_v4",
-          params: [address, eip712Json]
-        });
-      } catch (error) {
-        throw new SignerError(
-          `Failed to sign with EIP-712: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      const signature = import_ethers.Signature.from(signatureHex);
-      this.cachePublicKey(signingHash, signature);
-      return (0, import_utils.hexToBytes)(signature.compactSerialized.slice(2));
-    });
+    }
+    const unsignedTxBytes = message.slice(0, -32);
+    const typeIndex = this.schema.knownTypeIndex(
+      import_universal_wallet_wasm.KnownTypeId.UnsignedTransaction
+    );
+    let eip712Json;
+    try {
+      eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);
+    } catch (error) {
+      throw new SignerError(
+        `Failed to generate EIP-712 JSON from message: ${error}`,
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    let signingHash;
+    try {
+      signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);
+    } catch (error) {
+      throw new SignerError(
+        `Failed to generate EIP-712 signing hash: ${error}`,
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    let signatureHex;
+    try {
+      signatureHex = await this.provider.request({
+        method: "eth_signTypedData_v4",
+        params: [address, eip712Json]
+      });
+    } catch (error) {
+      throw new SignerError(
+        `Failed to sign with EIP-712: ${error}`,
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    const normalizedHex = signatureHex.startsWith("0x") ? signatureHex : `0x${signatureHex}`;
+    const signature = (0, import_viem.parseSignature)(normalizedHex);
+    this.cachePublicKey(signingHash, signature);
+    return normalizeSignature(signature);
   }
 };
 _Eip712Signer.SIGNER_ID = "Eip712";

package/dist/wasm.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/wasm.ts","../src/wasm/eip712.ts","../src/errors.ts"],"sourcesContent":["export { type Signer } from \"./signer\";\nexport * from \"./wasm/eip712\";\n","import type { MetaMaskInpageProvider } from \"@metamask/providers\";\nimport * as secp from \"@noble/secp256k1\";\nimport { KnownTypeId, Schema } from \"@sovereign-sdk/universal-wallet-wasm\";\nimport { hexToBytes } from \"@sovereign-sdk/utils\";\nimport { Signature } from \"ethers\";\nimport { SignerError } from \"../errors\";\nimport type { Signer } from \"../signer\";\n\n/**\n * EIP-712 signer implementation that uses MetaMask's eth_signTypedData_v4 method.\n *\n * This signer expects the message to be a valid UnsignedTransaction that can be\n * parsed by the schema's eip712Json() method.\n *\n * The signer uses the provided address for signing operations.\n */\nexport class Eip712Signer implements Signer {\n  private readonly provider: MetaMaskInpageProvider;\n  private readonly schema: Schema;\n  private readonly address: string;\n  private cachedPublicKey?: Uint8Array;\n  private static readonly SIGNER_ID = \"Eip712\";\n\n  constructor(\n    provider: MetaMaskInpageProvider,\n    schemaJson: Record<string, unknown>,\n    address: string,\n  ) {\n    if (!address) {\n      throw new SignerError(\"Address is required\", Eip712Signer.SIGNER_ID);\n    }\n    this.provider = provider;\n    this.schema = Schema.fromJSON(JSON.stringify(schemaJson));\n    this.address = address;\n  }\n\n  /**\n   * Cache the public key recovered from a signature.\n   */\n  private cachePublicKey(signingHash: Uint8Array, signature: Signature): void {\n    if (this.cachedPublicKey) return;\n\n    let secpSig = secp.Signature.fromCompact(\n      new Uint8Array([\n        ...hexToBytes(signature.r.slice(2)),\n        ...hexToBytes(signature.s.slice(2)),\n      ]),\n    );\n    secpSig = secpSig.addRecoveryBit(signature.yParity);\n    const publicKey = secpSig.recoverPublicKey(signingHash);\n\n    this.cachedPublicKey = publicKey.toBytes(true); // compressed form\n  }\n\n  /**\n   * Get the public key. Requires sign() to be called first to recover the key from a signature.\n   */\n  async publicKey(): Promise<Uint8Array> {\n    if (!this.cachedPublicKey) {\n      throw new SignerError(\n        \"Public key was not available, you must call sign() first\",\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    return this.cachedPublicKey;\n  }\n\n  /**\n   * Sign an UnsignedTransaction using EIP-712 typed data signing.\n   */\n  async sign(message: Uint8Array): Promise<Uint8Array> {\n    const address = this.address;\n\n    // Rollups invoke the signer with the chain hash appended, so drop the last 32 bytes of the message\n    if (message.length < 32) {\n      throw new SignerError(\n        \"Message too short, expected at least 32 bytes for chain hash\",\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n    const unsignedTxBytes = message.slice(0, -32);\n\n    // Get the UnsignedTransaction type index\n    const typeIndex = this.schema.knownTypeIndex(\n      KnownTypeId.UnsignedTransaction,\n    );\n\n    // Generate the EIP-712 JSON from the message bytes\n    let eip712Json: string;\n    try {\n      eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);\n    } catch (error) {\n      throw new SignerError(\n        `Failed to generate EIP-712 JSON from message: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    // Get the EIP-712 signing hash for public key recovery\n    let signingHash: Uint8Array;\n    try {\n      signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);\n    } catch (error) {\n      throw new SignerError(\n        `Failed to generate EIP-712 signing hash: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    let signatureHex: string;\n    try {\n      signatureHex = (await this.provider.request({\n        method: \"eth_signTypedData_v4\",\n        params: [address, eip712Json],\n      })) as string;\n    } catch (error) {\n      throw new SignerError(\n        `Failed to sign with EIP-712: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    // Parse the signature for public key recovery\n    const signature = Signature.from(signatureHex);\n    this.cachePublicKey(signingHash, signature);\n\n    // Return the standard compact serialized signature (r + s, 64 bytes)\n    return hexToBytes(signature.compactSerialized.slice(2));\n  }\n}\n","/**\n * An error that can be thrown by a signer.\n */\nexport class SignerError extends Error {\n  public readonly signerId: string;\n\n  /**\n   * Create a new SignerError.\n   *\n   * @param message - The error message\n   * @param signerId - The ID of the signer that threw the error\n   */\n  constructor(message: string, signerId: string) {\n    super(`[${signerId}] ${message}`);\n\n    this.signerId = signerId;\n    this.name = this.constructor.name;\n    this.stack = new Error().stack;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACCA,WAAsB;AACtB,mCAAoC;AACpC,mBAA2B;AAC3B,oBAA0B;;;ACDnB,IAAM,cAAN,cAA0B,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASrC,YAAY,SAAiB,UAAkB;AAC7C,UAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;AAEhC,SAAK,WAAW;AAChB,SAAK,OAAO,KAAK,YAAY;AAC7B,SAAK,QAAQ,IAAI,MAAM,EAAE;AAAA,EAC3B;AACF;;;ADHO,IAAM,gBAAN,MAAM,cAA+B;AAAA,EAO1C,YACE,UACA,YACA,SACA;AACA,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,YAAY,uBAAuB,cAAa,SAAS;AAAA,IACrE;AACA,SAAK,WAAW;AAChB,SAAK,SAAS,oCAAO,SAAS,KAAK,UAAU,UAAU,CAAC;AACxD,SAAK,UAAU;AAAA,EACjB;AAAA;AAAA;AAAA;AAAA,EAKQ,eAAe,aAAyB,WAA4B;AAC1E,QAAI,KAAK,gBAAiB;AAE1B,QAAI,UAAe,eAAU;AAAA,MAC3B,IAAI,WAAW;AAAA,QACb,OAAG,yBAAW,UAAU,EAAE,MAAM,CAAC,CAAC;AAAA,QAClC,OAAG,yBAAW,UAAU,EAAE,MAAM,CAAC,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AACA,cAAU,QAAQ,eAAe,UAAU,OAAO;AAClD,UAAM,YAAY,QAAQ,iBAAiB,WAAW;AAEtD,SAAK,kBAAkB,UAAU,QAAQ,IAAI;AAAA,EAC/C;AAAA;AAAA;AAAA;AAAA,EAKM,YAAiC;AAAA;AACrC,UAAI,CAAC,KAAK,iBAAiB;AACzB,cAAM,IAAI;AAAA,UACR;AAAA,UACA,cAAa;AAAA,QACf;AAAA,MACF;AAEA,aAAO,KAAK;AAAA,IACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAKM,KAAK,SAA0C;AAAA;AACnD,YAAM,UAAU,KAAK;AAGrB,UAAI,QAAQ,SAAS,IAAI;AACvB,cAAM,IAAI;AAAA,UACR;AAAA,UACA,cAAa;AAAA,QACf;AAAA,MACF;AACA,YAAM,kBAAkB,QAAQ,MAAM,GAAG,GAAG;AAG5C,YAAM,YAAY,KAAK,OAAO;AAAA,QAC5B,yCAAY;AAAA,MACd;AAGA,UAAI;AACJ,UAAI;AACF,qBAAa,KAAK,OAAO,WAAW,WAAW,eAAe;AAAA,MAChE,SAAS,OAAO;AACd,cAAM,IAAI;AAAA,UACR,iDAAiD,KAAK;AAAA,UACtD,cAAa;AAAA,QACf;AAAA,MACF;AAGA,UAAI;AACJ,UAAI;AACF,sBAAc,KAAK,OAAO,kBAAkB,WAAW,eAAe;AAAA,MACxE,SAAS,OAAO;AACd,cAAM,IAAI;AAAA,UACR,4CAA4C,KAAK;AAAA,UACjD,cAAa;AAAA,QACf;AAAA,MACF;AAEA,UAAI;AACJ,UAAI;AACF,uBAAgB,MAAM,KAAK,SAAS,QAAQ;AAAA,UAC1C,QAAQ;AAAA,UACR,QAAQ,CAAC,SAAS,UAAU;AAAA,QAC9B,CAAC;AAAA,MACH,SAAS,OAAO;AACd,cAAM,IAAI;AAAA,UACR,gCAAgC,KAAK;AAAA,UACrC,cAAa;AAAA,QACf;AAAA,MACF;AAGA,YAAM,YAAY,wBAAU,KAAK,YAAY;AAC7C,WAAK,eAAe,aAAa,SAAS;AAG1C,iBAAO,yBAAW,UAAU,kBAAkB,MAAM,CAAC,CAAC;AAAA,IACxD;AAAA;AACF;AAlHa,cAKa,YAAY;AAL/B,IAAM,eAAN;","names":[]}
+{"version":3,"sources":["../src/wasm.ts","../src/wasm/eip712.ts","../src/errors.ts"],"sourcesContent":["export { type Signer } from \"./signer\";\nexport * from \"./wasm/eip712\";\n","import type { MetaMaskInpageProvider } from \"@metamask/providers\";\nimport * as secp from \"@noble/secp256k1\";\nimport { KnownTypeId, Schema } from \"@sovereign-sdk/universal-wallet-wasm\";\nimport { hexToBytes } from \"@sovereign-sdk/utils\";\nimport { type Signature, parseSignature } from \"viem\";\nimport { SignerError } from \"../errors\";\nimport type { Signer } from \"../signer\";\n\n/**\n * Normalize a signature to low-s form if needed.\n * MetaMask's eth_signTypedData_v4 may return high-s signatures (~50% of the time).\n * The rollup server requires low-s signatures.\n */\nfunction normalizeSignature(signature: Signature): Uint8Array {\n  const r = hexToBytes(signature.r.slice(2));\n  const s = hexToBytes(signature.s.slice(2));\n  let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));\n\n  // Normalize s if it's > n/2 (convert high-s to low-s)\n  if (secpSig.hasHighS()) {\n    secpSig = secpSig.normalizeS();\n  }\n\n  return secpSig.toCompactRawBytes();\n}\n\n/**\n * EIP-712 signer implementation that uses MetaMask's eth_signTypedData_v4 method.\n *\n * This signer expects the message to be a valid UnsignedTransaction that can be\n * parsed by the schema's eip712Json() method.\n *\n * The signer uses the provided address for signing operations.\n */\nexport class Eip712Signer implements Signer {\n  private readonly provider: MetaMaskInpageProvider;\n  private readonly schema: Schema;\n  private readonly address: string;\n  private cachedPublicKey?: Uint8Array;\n  private static readonly SIGNER_ID = \"Eip712\";\n\n  constructor(\n    provider: MetaMaskInpageProvider,\n    schemaJson: Record<string, unknown>,\n    address: string,\n  ) {\n    if (!address) {\n      throw new SignerError(\"Address is required\", Eip712Signer.SIGNER_ID);\n    }\n    this.provider = provider;\n    this.schema = Schema.fromJSON(JSON.stringify(schemaJson));\n    this.address = address;\n  }\n\n  /**\n   * Cache the public key recovered from a signature.\n   * Uses viem's parseSignature which accepts high-s signatures (unlike ethers).\n   */\n  private cachePublicKey(signingHash: Uint8Array, signature: Signature): void {\n    if (this.cachedPublicKey) return;\n\n    const r = hexToBytes(signature.r.slice(2));\n    const s = hexToBytes(signature.s.slice(2));\n\n    let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));\n    secpSig = secpSig.addRecoveryBit(signature.yParity ?? 0);\n    const publicKey = secpSig.recoverPublicKey(signingHash);\n\n    this.cachedPublicKey = publicKey.toBytes(true); // compressed form\n  }\n\n  /**\n   * Get the public key. Requires sign() to be called first to recover the key from a signature.\n   */\n  async publicKey(): Promise<Uint8Array> {\n    if (!this.cachedPublicKey) {\n      throw new SignerError(\n        \"Public key was not available, you must call sign() first\",\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    return this.cachedPublicKey;\n  }\n\n  /**\n   * Sign an UnsignedTransaction using EIP-712 typed data signing.\n   */\n  async sign(message: Uint8Array): Promise<Uint8Array> {\n    const address = this.address;\n\n    // Rollups invoke the signer with the chain hash appended, so drop the last 32 bytes of the message\n    if (message.length < 32) {\n      throw new SignerError(\n        \"Message too short, expected at least 32 bytes for chain hash\",\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n    const unsignedTxBytes = message.slice(0, -32);\n\n    // Get the UnsignedTransaction type index\n    const typeIndex = this.schema.knownTypeIndex(\n      KnownTypeId.UnsignedTransaction,\n    );\n\n    // Generate the EIP-712 JSON from the message bytes\n    let eip712Json: string;\n    try {\n      eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);\n    } catch (error) {\n      throw new SignerError(\n        `Failed to generate EIP-712 JSON from message: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    // Get the EIP-712 signing hash for public key recovery\n    let signingHash: Uint8Array;\n    try {\n      signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);\n    } catch (error) {\n      throw new SignerError(\n        `Failed to generate EIP-712 signing hash: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    let signatureHex: string;\n    try {\n      signatureHex = (await this.provider.request({\n        method: \"eth_signTypedData_v4\",\n        params: [address, eip712Json],\n      })) as string;\n    } catch (error) {\n      throw new SignerError(\n        `Failed to sign with EIP-712: ${error}`,\n        Eip712Signer.SIGNER_ID,\n      );\n    }\n\n    // Parse the signature using viem (accepts high-s signatures unlike ethers)\n    // Normalize to ensure 0x prefix\n    const normalizedHex = signatureHex.startsWith(\"0x\")\n      ? signatureHex\n      : `0x${signatureHex}`;\n    const signature = parseSignature(normalizedHex as `0x${string}`);\n    this.cachePublicKey(signingHash, signature);\n\n    // Normalize to low-s form\n    // (EIP-2 low-s requirement only applies to transactions, not off-chain message signing,\n    // but the rollup server expects low-s signatures)\n    return normalizeSignature(signature);\n  }\n}\n","/**\n * An error that can be thrown by a signer.\n */\nexport class SignerError extends Error {\n  public readonly signerId: string;\n\n  /**\n   * Create a new SignerError.\n   *\n   * @param message - The error message\n   * @param signerId - The ID of the signer that threw the error\n   */\n  constructor(message: string, signerId: string) {\n    super(`[${signerId}] ${message}`);\n\n    this.signerId = signerId;\n    this.name = this.constructor.name;\n    this.stack = new Error().stack;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/wasm.mjs

@@ -1,29 +1,8 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-
 // src/wasm/eip712.ts
 import * as secp from "@noble/secp256k1";
 import { KnownTypeId, Schema } from "@sovereign-sdk/universal-wallet-wasm";
 import { hexToBytes } from "@sovereign-sdk/utils";
-import { Signature as Signature2 } from "ethers";
+import { parseSignature } from "viem";
 
 // src/errors.ts
 var SignerError = class extends Error {
@@ -42,6 +21,15 @@ var SignerError = class extends Error {
 };
 
 // src/wasm/eip712.ts
+function normalizeSignature(signature) {
+  const r = hexToBytes(signature.r.slice(2));
+  const s = hexToBytes(signature.s.slice(2));
+  let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));
+  if (secpSig.hasHighS()) {
+    secpSig = secpSig.normalizeS();
+  }
+  return secpSig.toCompactRawBytes();
+}
 var _Eip712Signer = class _Eip712Signer {
   constructor(provider, schemaJson, address) {
     if (!address) {
@@ -53,83 +41,78 @@ var _Eip712Signer = class _Eip712Signer {
   }
   /**
    * Cache the public key recovered from a signature.
+   * Uses viem's parseSignature which accepts high-s signatures (unlike ethers).
    */
   cachePublicKey(signingHash, signature) {
     if (this.cachedPublicKey) return;
-    let secpSig = secp.Signature.fromCompact(
-      new Uint8Array([
-        ...hexToBytes(signature.r.slice(2)),
-        ...hexToBytes(signature.s.slice(2))
-      ])
-    );
-    secpSig = secpSig.addRecoveryBit(signature.yParity);
+    const r = hexToBytes(signature.r.slice(2));
+    const s = hexToBytes(signature.s.slice(2));
+    let secpSig = secp.Signature.fromCompact(new Uint8Array([...r, ...s]));
+    secpSig = secpSig.addRecoveryBit(signature.yParity ?? 0);
     const publicKey = secpSig.recoverPublicKey(signingHash);
     this.cachedPublicKey = publicKey.toBytes(true);
   }
   /**
    * Get the public key. Requires sign() to be called first to recover the key from a signature.
    */
-  publicKey() {
-    return __async(this, null, function* () {
-      if (!this.cachedPublicKey) {
-        throw new SignerError(
-          "Public key was not available, you must call sign() first",
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      return this.cachedPublicKey;
-    });
+  async publicKey() {
+    if (!this.cachedPublicKey) {
+      throw new SignerError(
+        "Public key was not available, you must call sign() first",
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    return this.cachedPublicKey;
   }
   /**
    * Sign an UnsignedTransaction using EIP-712 typed data signing.
    */
-  sign(message) {
-    return __async(this, null, function* () {
-      const address = this.address;
-      if (message.length < 32) {
-        throw new SignerError(
-          "Message too short, expected at least 32 bytes for chain hash",
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      const unsignedTxBytes = message.slice(0, -32);
-      const typeIndex = this.schema.knownTypeIndex(
-        KnownTypeId.UnsignedTransaction
+  async sign(message) {
+    const address = this.address;
+    if (message.length < 32) {
+      throw new SignerError(
+        "Message too short, expected at least 32 bytes for chain hash",
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    const unsignedTxBytes = message.slice(0, -32);
+    const typeIndex = this.schema.knownTypeIndex(
+      KnownTypeId.UnsignedTransaction
+    );
+    let eip712Json;
+    try {
+      eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);
+    } catch (error) {
+      throw new SignerError(
+        `Failed to generate EIP-712 JSON from message: ${error}`,
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    let signingHash;
+    try {
+      signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);
+    } catch (error) {
+      throw new SignerError(
+        `Failed to generate EIP-712 signing hash: ${error}`,
+        _Eip712Signer.SIGNER_ID
       );
-      let eip712Json;
-      try {
-        eip712Json = this.schema.eip712Json(typeIndex, unsignedTxBytes);
-      } catch (error) {
-        throw new SignerError(
-          `Failed to generate EIP-712 JSON from message: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      let signingHash;
-      try {
-        signingHash = this.schema.eip712SigningHash(typeIndex, unsignedTxBytes);
-      } catch (error) {
-        throw new SignerError(
-          `Failed to generate EIP-712 signing hash: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      let signatureHex;
-      try {
-        signatureHex = yield this.provider.request({
-          method: "eth_signTypedData_v4",
-          params: [address, eip712Json]
-        });
-      } catch (error) {
-        throw new SignerError(
-          `Failed to sign with EIP-712: ${error}`,
-          _Eip712Signer.SIGNER_ID
-        );
-      }
-      const signature = Signature2.from(signatureHex);
-      this.cachePublicKey(signingHash, signature);
-      return hexToBytes(signature.compactSerialized.slice(2));
-    });
+    }
+    let signatureHex;
+    try {
+      signatureHex = await this.provider.request({
+        method: "eth_signTypedData_v4",
+        params: [address, eip712Json]
+      });
+    } catch (error) {
+      throw new SignerError(
+        `Failed to sign with EIP-712: ${error}`,
+        _Eip712Signer.SIGNER_ID
+      );
+    }
+    const normalizedHex = signatureHex.startsWith("0x") ? signatureHex : `0x${signatureHex}`;
+    const signature = parseSignature(normalizedHex);
+    this.cachePublicKey(signingHash, signature);
+    return normalizeSignature(signature);
   }
 };
 _Eip712Signer.SIGNER_ID = "Eip712";