Add another test case where extra char is not number

0xsequence · Jun 28, 2023 · 274a02a · 274a02a
1 parent 87b19b5
commit 274a02a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/provider/src/utils.ts b/packages/provider/src/utils.ts
@@ -52,7 +52,7 @@ export const removeEIP191Prefix = (prefixedMessage: Uint8Array): Uint8Array => {
     prefixAsNumber = Number(ethers.utils.hexlify(ethereumSignedMessagePartSlicedArray.slice(0, maxPrefixCharLength)))
   }
 
-  if (prefixAsNumber > ethereumSignedMessagePartSlicedArray.length) {
+  if (prefixAsNumber > ethereumSignedMessagePartSlicedArray.length || !Number.isInteger(prefixAsNumber)) {
     prefixCharLenght = maxPrefixCharLength - 1
   } else {
     prefixCharLenght = maxPrefixCharLength

diff --git a/packages/provider/tests/messages.ts b/packages/provider/tests/messages.ts
@@ -84,8 +84,10 @@ export const removeIep191Prefix_test2_raw = dlcText
 export const removeIep191Prefix_test3_raw = '1915 Robe' // 9 chars
 export const removeIep191Prefix_test4_raw =
   '123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789' // 99 chars
+export const removeIep191Prefix_test5_raw = 'Robe 1915'
 
 export const removeIep191Prefix_test1_prefixed = prefixEIP191Message(removeIep191Prefix_test1_raw)
 export const removeIep191Prefix_test2_prefixed = prefixEIP191Message(dlcText)
 export const removeIep191Prefix_test3_prefixed = prefixEIP191Message(removeIep191Prefix_test3_raw)
 export const removeIep191Prefix_test4_prefixed = prefixEIP191Message(removeIep191Prefix_test4_raw)
+export const removeIep191Prefix_test5_prefixed = prefixEIP191Message(removeIep191Prefix_test5_raw)
diff --git a/packages/provider/tests/remove-eip191prefix.spec.ts b/packages/provider/tests/remove-eip191prefix.spec.ts
@@ -9,7 +9,9 @@ import {
   removeIep191Prefix_test3_prefixed,
   removeIep191Prefix_test3_raw,
   removeIep191Prefix_test4_prefixed,
-  removeIep191Prefix_test4_raw
+  removeIep191Prefix_test4_raw,
+  removeIep191Prefix_test5_prefixed,
+  removeIep191Prefix_test5_raw
 } from './messages'
 import { removeEIP191Prefix } from '../src/utils'
 import { ethers } from 'ethers'
@@ -27,5 +29,6 @@ describe('removing eip191prefix', () => {
   it('should remove prefix for case where max prefix char as number is bigger than the length of the message', () => {
     expect(ethers.utils.toUtf8String(removeEIP191Prefix(removeIep191Prefix_test3_prefixed))).equal(removeIep191Prefix_test3_raw)
     expect(ethers.utils.toUtf8String(removeEIP191Prefix(removeIep191Prefix_test4_prefixed))).equal(removeIep191Prefix_test4_raw)
+    expect(ethers.utils.toUtf8String(removeEIP191Prefix(removeIep191Prefix_test5_prefixed))).equal(removeIep191Prefix_test5_raw)
   })
 })