wip

packages/varsig/src/__tests__/canonicalization.test.ts

@@ -1,4 +1,23 @@
-import { test } from '@jest/globals'
+import { expect, test } from '@jest/globals'
+import { BytesTape } from '../bytes-tape.js'
+import { CanonicalizationDecoder, CanonicalizationKind } from '../canonicalization.js'
+import { concat, toString } from 'uint8arrays'
+import { encode } from 'varintes/encode'
 
-test.todo('EIP712')
-test.todo('EIP191')
+test('EIP712', () => {
+  const bytes = concat([encode(0xe712)[0]])
+  const tape = new BytesTape(bytes)
+  const result = CanonicalizationDecoder.read(tape)
+  expect(result.kind).toEqual(CanonicalizationKind.EIP191)
+  // const canonicalized = toString(result('Hello'), 'hex')
+  // expect(canonicalized).toEqual('19457468657265756d205369676e6564204d6573736167653a0a3548656c6c6f')
+})
+
+test('EIP191', () => {
+  const bytes = concat([encode(0xe191)[0]])
+  const tape = new BytesTape(bytes)
+  const result = CanonicalizationDecoder.read(tape)
+  expect(result.kind).toEqual(CanonicalizationKind.EIP191)
+  const canonicalized = toString(result('Hello'), 'hex')
+  expect(canonicalized).toEqual('19457468657265756d205369676e6564204d6573736167653a0a3548656c6c6f')
+})

packages/varsig/src/canonicalization.ts

@@ -1,6 +1,5 @@
 import { BytesTape } from './bytes-tape.js'
 import * as uint8arrays from 'uint8arrays'
-import { keccak_256 } from '@noble/hashes/sha3'
 import { UnreacheableCaseError } from './unreachable-case-error.js'
 import { hashTypedData } from 'viem'
 import { CompressedDomain, decompressDomain, decompressTypes } from './encoding/eip712.js'
@@ -25,6 +24,10 @@ export type CanonicalizationAlgo = CanonicalizationEIP191 | CanonicalizationEIP7
 export class CanonicalizationDecoder {
   constructor(private readonly tape: BytesTape) {}
 
+  static read(tape: BytesTape) {
+    return new CanonicalizationDecoder(tape).read()
+  }
+
   read(): CanonicalizationAlgo {
     const sigil = this.tape.readVarint<CanonicalizationKind>()
     switch (sigil) {
@@ -47,10 +50,8 @@ export class CanonicalizationDecoder {
       }
       case CanonicalizationKind.EIP191: {
         const fn = (message: string) => {
-          return keccak_256(
-            uint8arrays.fromString(
-              `\x19Ethereum Signed Message:\n` + String(message.length) + message
-            )
+          return uint8arrays.fromString(
+            `\x19Ethereum Signed Message:\n` + String(message.length) + message
           )
         }
         fn.kind = CanonicalizationKind.EIP191

packages/varsig/test/parse-eip191.test.ts

@@ -7,6 +7,7 @@ import { BytesTape } from '../src/bytes-tape.js'
 import { SigningDecoder } from '../src/signing.js'
 import { HashingDecoder } from '../src/hashing.js'
 import { CanonicalizationDecoder, CanonicalizationKind } from '../src/canonicalization.js'
+import { keccak_256 } from '@noble/hashes/sha3'
 
 class Decoder {
   #tape: BytesTape
@@ -70,5 +71,5 @@ test('validate eip191', async () => {
   if (decoder.signing.recoveryBit) {
     signature = signature.addRecoveryBit(decoder.signing.recoveryBit - 27)
   }
-  console.log(signature.recoverPublicKey(input).toHex(false))
+  console.log(signature.recoverPublicKey(keccak_256(input)).toHex(false))
 })