fix: allow non-prefixed string and bytearray inputs (#1)

src/index.ts

@@ -8,9 +8,10 @@ import {
 import { keccak256 } from '@ethersproject/keccak256'
 import { toUtf8Bytes } from '@ethersproject/strings'
 import { type BytesLike, hexlify } from '@ethersproject/bytes'
+import { addHexPrefix } from './utils'
 
 export function splitCallData(calldata: BytesLike): [string, string] {
- const cd = hexlify(calldata)
+ const cd = typeof calldata === 'string' ? addHexPrefix(calldata) : hexlify(calldata)
 
  return [cd.substring(0, 10), `0x${cd.substring(10)}`]
 }
@@ -36,10 +37,8 @@ export function getSighash(abiFragment: string | Fragment | JsonFragment): strin
 }
 
 export function findMethodById(methodId: BytesLike, abi: JsonFragment[]): JsonFragment | undefined {
- const mId = typeof methodId === 'string' ? methodId : hexlify(methodId)
- return abi
- .filter((a) => a.type === 'function')
- .find((a) => getMethodId(getSighash(a)) === mId)
+ const mId = typeof methodId === 'string' ? addHexPrefix(methodId) : hexlify(methodId)
+ return abi.filter((a) => a.type === 'function').find((a) => getMethodId(getSighash(a)) === mId)
 }
 
 export function decodeCallData(calldata: BytesLike, abi: JsonFragment[], loose?: boolean) {

src/utils.ts

@@ -0,0 +1,10 @@
+/**
+ * Strips prefix from a string
+ *
+ * @param s string input
+ */
+export function addHexPrefix(s: string): string {
+ if (typeof s === 'string' && /^[0-9a-f]+$/i.test(s)) return `0x${s}`
+
+ return s
+}

test/index.spec.ts

@@ -1,6 +1,7 @@
 import decodeCallData, { decodeInputs, findMethodById, getMethodId, getSighash } from '../src/index'
 import { BigNumber } from '@ethersproject/bignumber'
-import abi2 from './abi2.json'
+import { arrayify } from '@ethersproject/bytes'
+import abi2 from './data/abi2.json'
 
 describe('getMethodId', () => {
  const testValues = [{ input: 'mint(uint256,uint256)', output: '0x1b2ef1ca' }]
@@ -88,12 +89,24 @@ describe('decodeInputs', () => {
 })
 
 describe('findMethodById', () => {
- test('should find method in abi', () => {
+ test('should find method in abi as string with prefix', () => {
  const res = findMethodById('0x1b2ef1ca', abi2)
 
  expect(res).toBeDefined()
  expect(res?.name).toEqual('mint')
  })
+ test('should find method in abi as string without prefix', () => {
+ const res = findMethodById('1b2ef1ca', abi2)
+
+ expect(res).toBeDefined()
+ expect(res?.name).toEqual('mint')
+ })
+ test('should find method in abi as bytearray', () => {
+ const res = findMethodById(arrayify('0x1b2ef1ca'), abi2)
+
+ expect(res).toBeDefined()
+ expect(res?.name).toEqual('mint')
+ })
  test('should not find method in abi', () => {
  const res = findMethodById('0x00000000', abi2)
 
@@ -102,8 +115,29 @@ describe('findMethodById', () => {
 })
 
 describe('decodeCalldata', () => {
- test('should decode call data', () => {
- const res = decodeCallData('0x1b2ef1ca0000000000000000000000000000000000000000000000070c1cc73b00c800000000000000000000000000000000000000000000000001567fdd05cd25f80000', abi2)
+ test('should decode call data as prefixed string', () => {
+ const res = decodeCallData(
+ '0x1b2ef1ca0000000000000000000000000000000000000000000000070c1cc73b00c800000000000000000000000000000000000000000000000001567fdd05cd25f80000',
+ abi2
+ )
+
+ expect(res.method.name).toEqual('mint')
+ })
+ test('should decode call data as bytes array', () => {
+ const res = decodeCallData(
+ '1b2ef1ca0000000000000000000000000000000000000000000000070c1cc73b00c800000000000000000000000000000000000000000000000001567fdd05cd25f80000',
+ abi2
+ )
+
+ expect(res.method.name).toEqual('mint')
+ })
+ test('should decode call data as string without prefix', () => {
+ const res = decodeCallData(
+ arrayify(
+ '0x1b2ef1ca0000000000000000000000000000000000000000000000070c1cc73b00c800000000000000000000000000000000000000000000000001567fdd05cd25f80000'
+ ),
+ abi2
+ )
 
  expect(res.method.name).toEqual('mint')
  })