Skip to content

Commit

Permalink
use ethers abi parser to validate function abi
Browse files Browse the repository at this point in the history
  • Loading branch information
piotr-roslaniec committed Jun 28, 2023
1 parent 50dd01c commit 32e6a94
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 37 deletions.
49 changes: 35 additions & 14 deletions src/conditions/base/contract.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ethers } from 'ethers';
import Joi from 'joi';

import { ETH_ADDRESS_REGEXP } from '../const';
Expand All @@ -6,31 +7,51 @@ import { RpcCondition, rpcConditionRecord } from './rpc';

export const STANDARD_CONTRACT_TYPES = ['ERC20', 'ERC721'];

const functionAbiVariable = Joi.object({
internalType: Joi.string(), // TODO is this needed?
name: Joi.string().required(),
type: Joi.string().required(),
});

const functionAbiSchema = Joi.object({
name: Joi.string().required(),
type: Joi.string().valid('function').required(),
inputs: Joi.array().items(functionAbiVariable),
outputs: Joi.array().items(functionAbiVariable),
// TODO: Should we restrict this to 'view'?
stateMutability: Joi.string(),
inputs: Joi.array(),
outputs: Joi.array(),
stateMutability: Joi.string().valid('view', 'pure').required(),
}).custom((functionAbi, helper) => {
// Is `functionABI` a valid function fragment?
let asInterface;
try {
asInterface = new ethers.utils.Interface([functionAbi]);
} catch (e: unknown) {
const { message } = e as Error;
return helper.message({
custom: message,
});
}

if (!asInterface.fragments) {
return helper.message({
custom: '"functionAbi" is missing a function fragment',
});
}

if (asInterface.fragments.length > 1) {
return helper.message({
custom: '"functionAbi" must contain exactly one function fragment',
});
}

// Now we just need to validate against the parent schema
// Validate method name
const method = helper.state.ancestors[0].method;
if (functionAbi.name !== method) {
const functionFragment = asInterface.fragments.filter(
(f) => f.name === method
)[0];
if (!functionFragment) {
return helper.message({
custom: '"method" must be the same as "functionAbi.name"',
custom: '"functionAbi" does not contain the method specified as "method"',
});
}

// Validate nr of parameters
const parameters = helper.state.ancestors[0].parameters;
if (functionAbi.inputs?.length !== parameters.length) {
if (functionFragment.inputs.length !== parameters.length) {
return helper.message({
custom: '"parameters" must have the same length as "functionAbi.inputs"',
});
Expand All @@ -39,7 +60,7 @@ const functionAbiSchema = Joi.object({
return functionAbi;
});

export const contractConditionRecord: Record<string, Joi.Schema> = {
export const contractConditionRecord = {
...rpcConditionRecord,
contractAddress: Joi.string().pattern(ETH_ADDRESS_REGEXP).required(),
standardContractType: Joi.string()
Expand Down
24 changes: 2 additions & 22 deletions test/unit/conditions/base/contract.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { ContractCondition } from '../../../../src/conditions/base';
import { USER_ADDRESS_PARAM } from '../../../../src/conditions/const';
import { fakeWeb3Provider } from '../../../utils';
import { testContractConditionObj } from '../../testVariables';
import { testContractConditionObj, testFunctionAbi } from '../../testVariables';

describe('validation', () => {
it('accepts on a valid schema', () => {
Expand Down Expand Up @@ -103,30 +103,10 @@ describe('accepts either standardContractType or functionAbi but not both or non
});

describe('supports custom function abi', () => {
const fakeFunctionAbi = {
name: 'myFunction',
type: 'function',
inputs: [
{
name: 'account',
type: 'address',
},
{
name: 'myCustomParam',
type: 'uint256',
},
],
outputs: [
{
name: 'someValue',
type: 'uint256',
},
],
};
const contractConditionObj = {
...testContractConditionObj,
standardContractType: undefined,
functionAbi: fakeFunctionAbi,
functionAbi: testFunctionAbi,
method: 'myFunction',
parameters: [USER_ADDRESS_PARAM, ':customParam'],
returnValueTest: {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/testVariables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const testContractConditionObj = {
export const testFunctionAbi = {
name: 'myFunction',
type: 'function',
stateMutability: 'view',
inputs: [
{
internalType: 'address',
Expand All @@ -67,5 +68,4 @@ export const testFunctionAbi = {
type: 'uint256',
},
],
stateMutability: 'view',
};

1 comment on commit 32e6a94

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bundled size for the package is listed below:

build/module/types/ethers-contracts/factories: 82.03 KB
build/module/types/ethers-contracts: 152.34 KB
build/module/types: 156.25 KB
build/module/test: 42.97 KB
build/module/src/sdk/strategy: 31.25 KB
build/module/src/sdk: 46.88 KB
build/module/src/characters: 89.84 KB
build/module/src/conditions/context: 42.97 KB
build/module/src/conditions/predefined: 19.53 KB
build/module/src/conditions/base: 54.69 KB
build/module/src/conditions: 156.25 KB
build/module/src/agents: 35.16 KB
build/module/src/policies: 19.53 KB
build/module/src/kits: 19.53 KB
build/module/src: 433.59 KB
build/module: 687.50 KB
build/main/types/ethers-contracts/factories: 82.03 KB
build/main/types/ethers-contracts: 152.34 KB
build/main/types: 156.25 KB
build/main/test: 46.88 KB
build/main/src/sdk/strategy: 31.25 KB
build/main/src/sdk: 46.88 KB
build/main/src/characters: 89.84 KB
build/main/src/conditions/context: 42.97 KB
build/main/src/conditions/predefined: 19.53 KB
build/main/src/conditions/base: 54.69 KB
build/main/src/conditions: 156.25 KB
build/main/src/agents: 35.16 KB
build/main/src/policies: 19.53 KB
build/main/src/kits: 19.53 KB
build/main/src: 437.50 KB
build/main: 695.31 KB
build: 1.35 MB

Please sign in to comment.