Skip to content

Commit

Permalink
fix: normalize AbiFallback.inputs type and zod
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Bour committed Oct 14, 2023
1 parent 32cf12d commit d5dadf7
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .changeset/angry-taxis-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"abitype": patch
---

normalize AbiFallback.inputs type and zod
2 changes: 1 addition & 1 deletion packages/abitype/src/abi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export type AbiConstructor = {
/** ABI ["fallback"](https://docs.soliditylang.org/en/latest/abi-spec.html#json) type */
export type AbiFallback = {
type: 'fallback'
inputs?: readonly [] | undefined
inputs?: readonly never[] | undefined
/**
* @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
* @see https://github.com/ethereum/solidity/issues/992
Expand Down
53 changes: 53 additions & 0 deletions packages/abitype/src/zod.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import type {
AbiConstructor,
AbiError,
AbiEvent,
AbiFallback,
AbiFunction,
AbiParameter,
} from './abi.js'
import {
customSolidityErrorsAbi,
ensRegistryWithFallbackAbi,
erc20Abi,
wethAbi,
} from './abis/json.js'
import {
Abi as AbiSchema,
AbiConstructor as AbiConstructorSchema,
AbiError as AbiErrorSchema,
AbiEvent as AbiEventSchema,
AbiFallback as AbiFallbackSchema,
AbiFunction as AbiFunctionSchema,
AbiParameter as AbiParameterSchema,
} from './zod.js'

Expand Down Expand Up @@ -87,6 +92,54 @@ describe('Zod Types', () => {
})
})

describe('AbiFunction', () => {
const approveFunction = erc20Abi[3]

test('assignable to AbiFunction', () => {
const parsed: AbiFunction = AbiFunctionSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFunction ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})

test('extends AbiFunction', () => {
const parsed = AbiFunctionSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFunction ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})
})

describe('AbiFallback', () => {
const approveFunction = wethAbi[11]

test('assignable to AbiFallback', () => {
const parsed: AbiFallback = AbiFallbackSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFallback ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})

test('extends AbiFallback', () => {
const parsed = AbiFallbackSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFallback ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})
})

describe('AbiFunction', () => {
const approveFunction = erc20Abi[3]

test('assignable to AbiFunction', () => {
const parsed: AbiFunction = AbiFunctionSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFunction ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})

test('extends AbiFunction', () => {
const parsed = AbiFunctionSchema.parse(approveFunction)
type Result = typeof parsed extends AbiFunction ? true : false
expectTypeOf<Result>().toEqualTypeOf<true>()
})
})

describe('AbiParameter', () => {
const approvalOwnerParameter = erc20Abi[0].inputs[0]

Expand Down
2 changes: 1 addition & 1 deletion packages/abitype/src/zod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const AbiFallback = z.preprocess(
* @deprecated use `pure` or `view` from {@link AbiStateMutability} instead
* https://github.com/ethereum/solidity/issues/992
*/
inputs: z.tuple([]).optional(),
inputs: z.tuple([]).readonly().optional(),
/**
* @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
* https://github.com/ethereum/solidity/issues/992
Expand Down

0 comments on commit d5dadf7

Please sign in to comment.