Fixes regex for fallback signatures (#229)

wevm · Mar 2, 2024 · a9300dd · a9300dd
1 parent 3798068
commit a9300dd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.changeset/poor-garlics-invite.md b/.changeset/poor-garlics-invite.md
@@ -0,0 +1,5 @@
+---
+"abitype": patch
+---
+
+Fixed regex for fallback signatures.
diff --git a/packages/abitype/src/human-readable/parseAbiItem.test.ts b/packages/abitype/src/human-readable/parseAbiItem.test.ts
@@ -61,6 +61,12 @@ test.each([
       ],
     },
   },
+  {
+    signature: ['fallback() external'],
+    expected: {
+      type: 'fallback',
+    },
+  },
 ])('parseAbiItem($signature)', ({ signature, expected }) => {
   expect(parseAbiItem(signature)).toEqual(expected)
 })

diff --git a/packages/abitype/src/human-readable/runtime/signatures.test.ts b/packages/abitype/src/human-readable/runtime/signatures.test.ts
@@ -217,7 +217,13 @@ test('execConstructorSignature', () => {
 })
 
 test('isFallbackSignature', () => {
-  expect(isFallbackSignature('fallback()')).toMatchInlineSnapshot('true')
+  expect(isFallbackSignature('fallback() external')).toMatchInlineSnapshot(
+    'true',
+  )
+  expect(
+    isFallbackSignature('fallback() external payable'),
+  ).toMatchInlineSnapshot('true')
+
   expect(isFallbackSignature('function name(string)')).toMatchInlineSnapshot(
     'false',
   )

diff --git a/packages/abitype/src/human-readable/runtime/signatures.ts b/packages/abitype/src/human-readable/runtime/signatures.ts
@@ -73,8 +73,9 @@ export function execConstructorSignature(signature: string) {
   }>(constructorSignatureRegex, signature)
 }
 
-// https://regexr.com/78u18
-const fallbackSignatureRegex = /^fallback\(\)$/
+// https://regexr.com/7srtn
+const fallbackSignatureRegex =
+  /^fallback\(\) external(?:\s(?<stateMutability>payable{1}))?$/
 export function isFallbackSignature(signature: string) {
   return fallbackSignatureRegex.test(signature)
 }