@toon-protocol/sdk 3.0.0 → 3.1.1

package/dist/index.js

@@ -2364,9 +2364,9 @@ function validateConfig(config) {
 }
 
 // src/settlement/evm.ts
-import { secp256k1 } from "@noble/curves/secp256k1.js";
 import { keccak_256 } from "@noble/hashes/sha3.js";
 import { bytesToHex } from "@noble/hashes/utils.js";
+import { recoverEvmSigner } from "@toon-protocol/settlement-digest";
 
 // src/settlement/hashes.ts
 import {
@@ -2422,10 +2422,6 @@ function recoverEvmSignerAddress(claim, chainId, verifyingContract) {
       `EVM signature v must be 27 or 28, got ${v}`
     );
   }
-  const recovery = v - 27;
-  const compactRS = claim.claimBytes.slice(0, 64);
-  let msgHash;
-  let uncompressedPubkey;
   try {
     const channelIdBytes = hexToBytes2(claim.channelId);
     const recipientBytes = hexToBytes2(claim.recipient);
@@ -2445,7 +2441,7 @@ function recoverEvmSignerAddress(claim, chainId, verifyingContract) {
         `verifyingContract must be 20 bytes (got ${verifyingContractBytes.length})`
       );
     }
-    msgHash = balanceProofHashEvm(
+    const msgHash = balanceProofHashEvm(
       channelIdBytes,
       BigInt(claim.cumulativeAmount),
       BigInt(claim.nonce),
@@ -2453,12 +2449,7 @@ function recoverEvmSignerAddress(claim, chainId, verifyingContract) {
       BigInt(chainId),
       verifyingContractBytes
     );
-    const sig = secp256k1.Signature.fromBytes(
-      compactRS,
-      "compact"
-    ).addRecoveryBit(recovery);
-    const point = sig.recoverPublicKey(msgHash);
-    uncompressedPubkey = point.toBytes(false);
+    return recoverEvmSigner(msgHash, claim.claimBytes);
   } catch (err) {
     throw new SettlementTxError(
       "ENCODING_FAILED",
@@ -2466,8 +2457,6 @@ function recoverEvmSignerAddress(claim, chainId, verifyingContract) {
       { cause: err }
     );
   }
-  const addrHash = keccak_256(uncompressedPubkey.slice(1));
-  return "0x" + bytesToHex(addrHash.slice(-20)).toLowerCase();
 }
 function padLeft32(bytes) {
   if (bytes.length > 32) {