@subsquid/evm-typegen 3.3.0 → 4.0.1

package/lib/multicall.js

@@ -1,31 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Multicall = void 0;
-const ethers = __importStar(require("ethers"));
-const abi_support_1 = require("./abi.support");
+/**
+ * TODO migrate multicall
+import * as ethers from 'ethers'
+import {ContractBase, Func} from './abi.support'
+
+
 const abi = new ethers.Interface([
     {
         type: 'function',
@@ -36,14 +15,14 @@ const abi = new ethers.Interface([
                 name: 'calls',
                 type: 'tuple[]',
                 components: [
-                    { name: 'target', type: 'address' },
-                    { name: 'callData', type: 'bytes' },
+                    {name: 'target', type: 'address'},
+                    {name: 'callData', type: 'bytes'},
                 ]
             }
         ],
         outputs: [
-            { name: 'blockNumber', type: 'uint256' },
-            { name: 'returnData', type: 'bytes[]' },
+            {name: 'blockNumber', type: 'uint256'},
+            {name: 'returnData', type: 'bytes[]'},
         ]
     },
     {
@@ -51,13 +30,13 @@ const abi = new ethers.Interface([
         type: 'function',
         stateMutability: 'nonpayable',
         inputs: [
-            { name: 'requireSuccess', type: 'bool' },
+            {name: 'requireSuccess', type: 'bool'},
             {
                 name: 'calls',
                 type: 'tuple[]',
                 components: [
-                    { name: 'target', type: 'address' },
-                    { name: 'callData', type: 'bytes' },
+                    {name: 'target', type: 'address'},
+                    {name: 'callData', type: 'bytes'},
                 ]
             }
         ],
@@ -66,110 +45,173 @@ const abi = new ethers.Interface([
                 name: 'returnData',
                 type: 'tuple[]',
                 components: [
-                    { name: 'success', type: 'bool' },
-                    { name: 'returnData', type: 'bytes' },
+                    {name: 'success', type: 'bool'},
+                    {name: 'returnData', type: 'bytes'},
                 ]
             },
         ]
     }
-]);
-const aggregate = new abi_support_1.Func(abi, abi.getFunction('aggregate').selector);
-const try_aggregate = new abi_support_1.Func(abi, abi.getFunction('tryAggregate').selector);
-class Multicall extends abi_support_1.ContractBase {
-    async aggregate(...args) {
-        let [calls, funcs, page] = this.makeCalls(args);
-        let size = calls.length;
-        let results = new Array(size);
+])
+
+
+type AnyFunc = Func<any, {}, any>
+type Call = [address: string, bytes: string]
+
+
+const aggregate = new Func<[calls: Call[]], {}, {blockNumber: bigint, returnData: string[]}>(
+    abi, abi.getFunction('aggregate')!.selector
+)
+
+
+const try_aggregate = new Func<[requireSuccess: boolean, calls: Array<[target: string, callData: string]>], {}, Array<{success: boolean, returnData: string}>>(
+    abi, abi.getFunction('tryAggregate')!.selector
+)
+
+
+export type MulticallResult<T> = {
+    success: true
+    value: T
+} | {
+    success: false
+    returnData?: string
+    value?: undefined
+}
+
+
+export class Multicall extends ContractBase {
+    static aggregate = aggregate
+    static try_aggregate = try_aggregate
+
+    aggregate<Args extends any[], R>(
+        func: Func<Args, {}, R>,
+        address: string,
+        calls: Args[],
+        paging?: number
+    ): Promise<R[]>
+
+    aggregate<Args extends any[], R>(
+        func: Func<Args, {}, R>,
+        calls: [address: string, args: Args][],
+        paging?: number
+    ): Promise<R[]>
+
+    aggregate(
+        calls: [func: AnyFunc, address: string, args: any[]][],
+        paging?: number
+    ): Promise<any[]>
+
+    async aggregate(...args: any[]): Promise<any[]> {
+        let [calls, funcs, page] = this.makeCalls(args)
+        let size = calls.length
+        let results = new Array(size)
         for (let [from, to] of splitIntoPages(size, page)) {
-            let { returnData } = await this.eth_call(aggregate, [calls.slice(from, to)]);
+            let {returnData} = await this.eth_call(aggregate, [calls.slice(from, to)])
             for (let i = from; i < to; i++) {
-                let data = returnData[i - from];
-                results[i] = funcs[i].decodeResult(data);
+                let data = returnData[i - from]
+                results[i] = funcs[i].decodeResult(data)
             }
         }
-        return results;
+        return results
     }
-    async tryAggregate(...args) {
-        let [calls, funcs, page] = this.makeCalls(args);
-        let size = calls.length;
-        let results = new Array(size);
+
+    tryAggregate<Args extends any[], R>(
+        func: Func<Args, {}, R>,
+        address: string,
+        calls: Args[],
+        paging?: number
+    ): Promise<MulticallResult<R>[]>
+
+    tryAggregate<Args extends any[], R>(
+        func: Func<Args, {}, R>,
+        calls: [address: string, args: Args][],
+        paging?: number
+    ): Promise<MulticallResult<R>[]>
+
+    tryAggregate(
+        calls: [func: AnyFunc, address: string, args: any[]][],
+        paging?: number
+    ): Promise<MulticallResult<any>[]>
+
+    async tryAggregate(...args: any[]): Promise<any[]> {
+        let [calls, funcs, page] = this.makeCalls(args)
+        let size = calls.length
+        let results = new Array(size)
         for (let [from, to] of splitIntoPages(size, page)) {
-            let response = await this.eth_call(try_aggregate, [false, calls.slice(from, to)]);
+            let response = await this.eth_call(try_aggregate, [false, calls.slice(from, to)])
             for (let i = from; i < to; i++) {
-                let res = response[i - from];
+                let res = response[i - from]
                 if (res.success) {
                     try {
                         results[i] = {
                             success: true,
                             value: funcs[i].decodeResult(res.returnData)
-                        };
+                        }
+                    } catch(err: any) {
+                        results[i] = {success: false, returnData: res.returnData}
                     }
-                    catch (err) {
-                        results[i] = { success: false, returnData: res.returnData };
-                    }
-                }
-                else {
-                    results[i] = { success: false };
+                } else {
+                    results[i] = {success: false}
                 }
             }
         }
-        return results;
+        return results
     }
-    makeCalls(args) {
-        let page = typeof args[args.length - 1] == 'number' ? args.pop() : Number.MAX_SAFE_INTEGER;
-        switch (args.length) {
+
+    private makeCalls(args: any[]): [calls: Call[], funcs: AnyFunc[], page: number] {
+        let page = typeof args[args.length-1] == 'number' ? args.pop()! : Number.MAX_SAFE_INTEGER
+        switch(args.length) {
             case 1: {
-                let list = args[0];
-                let calls = new Array(list.length);
-                let funcs = new Array(list.length);
+                let list: [func: AnyFunc, address: string, args: any[]][] = args[0]
+                let calls = new Array(list.length)
+                let funcs = new Array(list.length)
                 for (let i = 0; i < list.length; i++) {
-                    let [func, address, args] = list[i];
-                    calls[i] = [address, func.encode(args)];
-                    funcs[i] = func;
+                    let [func, address, args] = list[i]
+                    calls[i] = [address, func.encode(args)]
+                    funcs[i] = func
                 }
-                return [calls, funcs, page];
+                return [calls, funcs, page]
             }
             case 2: {
-                let func = args[0];
-                let list = args[1];
-                let calls = new Array(list.length);
-                let funcs = new Array(list.length);
+                let func: AnyFunc = args[0]
+                let list: [address: string, args: any[]][] = args[1]
+                let calls = new Array(list.length)
+                let funcs = new Array(list.length)
                 for (let i = 0; i < list.length; i++) {
-                    let [address, args] = list[i];
-                    calls[i] = [address, func.encode(args)];
-                    funcs[i] = func;
+                    let [address, args] = list[i]
+                    calls[i] = [address, func.encode(args)]
+                    funcs[i] = func
                 }
-                return [calls, funcs, page];
+                return [calls, funcs, page]
             }
             case 3: {
-                let func = args[0];
-                let address = args[1];
-                let list = args[2];
-                let calls = new Array(list.length);
-                let funcs = new Array(list.length);
+                let func: AnyFunc = args[0]
+                let address: string = args[1]
+                let list: any[][] = args[2]
+                let calls = new Array(list.length)
+                let funcs = new Array(list.length)
                 for (let i = 0; i < list.length; i++) {
-                    let args = list[i];
-                    calls[i] = [address, func.encode(args)];
-                    funcs[i] = func;
+                    let args = list[i]
+                    calls[i] = [address, func.encode(args)]
+                    funcs[i] = func
                 }
-                return [calls, funcs, page];
+                return [calls, funcs, page]
             }
             default:
-                throw new Error('unexpected number of arguments');
+                throw new Error('unexpected number of arguments')
         }
     }
 }
-exports.Multicall = Multicall;
-Multicall.aggregate = aggregate;
-Multicall.try_aggregate = try_aggregate;
-function* splitIntoPages(size, page) {
-    let from = 0;
+
+
+function* splitIntoPages(size: number, page: number): Iterable<[from: number, to: number]> {
+    let from = 0
     while (size) {
-        let step = Math.min(page, size);
-        let to = from + step;
-        yield [from, to];
-        size -= step;
-        from = to;
+        let step = Math.min(page, size)
+        let to = from + step
+        yield [from, to]
+        size -= step
+        from = to
     }
 }
+*/
 //# sourceMappingURL=multicall.js.map

package/lib/multicall.js.map

@@ -1 +1 @@
-{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../src/multicall.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multicall.js","sourceRoot":"","sources":["../src/multicall.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsNE"}

package/lib/typegen.d.ts

@@ -1,21 +1,29 @@
-import * as ethers from 'ethers';
 import { Logger } from '@subsquid/logger';
+import type { Abi } from 'abitype';
 import { OutDir } from '@subsquid/util-internal-code-printer';
 export declare class Typegen {
-    private dest;
     private abi;
-    private basename;
     private log;
     private out;
-    constructor(dest: OutDir, abi: ethers.Interface, basename: string, log: Logger);
-    generate(): void;
-    private writeAbi;
+    constructor(dest: OutDir, abi: Abi, basename: string, log: Logger);
+    generate(): Promise<void>;
     private generateEvents;
+    private topic0;
+    private toTypes;
     private generateFunctions;
+    private functionSelector;
     private generateContract;
-    private getRef;
+    private cannonicalType;
+    private sighash;
     private getPropName;
+    private getPropNameGetter;
     private getOverloads;
+    private capitalize;
+    private getOverloadIndex;
+    private toEventType;
+    private generateEventTypes;
+    private toFunctionTypes;
+    private generateFunctionTypes;
     private functionOverloads;
     private eventOverloads;
     private getFunctions;

package/lib/typegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typegen.d.ts","sourceRoot":"","sources":["../src/typegen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAEvC,OAAO,EAAa,MAAM,EAAC,MAAM,sCAAsC,CAAA;AAIvE,qBAAa,OAAO;IAGJ,OAAO,CAAC,IAAI;IAAU,OAAO,CAAC,GAAG;IAAoB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,GAAG;IAFtG,OAAO,CAAC,GAAG,CAAY;gBAEH,IAAI,EAAE,MAAM,EAAU,GAAG,EAAE,MAAM,CAAC,SAAS,EAAU,QAAQ,EAAE,MAAM,EAAU,GAAG,EAAE,MAAM;IAI9G,QAAQ,IAAI,IAAI;IAgBhB,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,SAAS;CAGpB"}
+{"version":3,"file":"typegen.d.ts","sourceRoot":"","sources":["../src/typegen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAIzC,OAAO,KAAK,EAAE,GAAG,EAAuC,MAAM,SAAS,CAAA;AACvE,OAAO,EAAc,MAAM,EAAE,MAAM,sCAAsC,CAAA;AAYzE,qBAAa,OAAO;IAKhB,OAAO,CAAC,GAAG;IAEX,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,GAAG,CAAY;gBAGrB,IAAI,EAAE,MAAM,EACJ,GAAG,EAAE,GAAG,EAChB,QAAQ,EAAE,MAAM,EACR,GAAG,EAAE,MAAM;IAKf,QAAQ;IAmBd,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,qBAAqB;IAqB7B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,SAAS;CAGlB"}

package/lib/typegen.js

@@ -1,70 +1,45 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Typegen = void 0;
-const ethers = __importStar(require("ethers"));
 const util_internal_1 = require("@subsquid/util-internal");
+const evm_abi_1 = require("@subsquid/evm-abi");
 const types_1 = require("./util/types");
+function areItemEqual(item1, item2) {
+    if (item1.name !== item2.name || item1.inputs.length !== item2.inputs.length || item1.type !== item2.type) {
+        return false;
+    }
+    return item1.inputs.every((input, idx) => {
+        const input2 = item2.inputs[idx];
+        return input.name === input2.name && input.type === input2.type;
+    });
+}
 class Typegen {
     constructor(dest, abi, basename, log) {
-        this.dest = dest;
         this.abi = abi;
-        this.basename = basename;
         this.log = log;
         this.out = dest.file(basename + '.ts');
     }
-    generate() {
-        this.out.line("import * as ethers from 'ethers'");
-        this.out.line("import {LogEvent, Func, ContractBase} from './abi.support'");
-        this.out.line(`import {ABI_JSON} from './${this.basename}.abi'`);
-        this.out.line();
-        this.out.line("export const abi = new ethers.Interface(ABI_JSON);");
+    async generate() {
+        this.out.line(`import * as p from '@subsquid/evm-codec'`);
+        this.out.line(`import { event, fun, indexed, ContractBase } from '@subsquid/evm-abi'`);
+        this.out.line(`import type { EventParams as EParams, FunctionArguments, FunctionReturn } from '@subsquid/evm-abi'`);
         this.generateEvents();
         this.generateFunctions();
         this.generateContract();
-        this.writeAbi();
-        this.out.write();
+        this.generateEventTypes();
+        this.generateFunctionTypes();
+        await this.out.write();
         this.log.info(`saved ${this.out.file}`);
     }
-    writeAbi() {
-        let out = this.dest.file(this.basename + '.abi.ts');
-        let json = this.abi.formatJson();
-        json = JSON.stringify(JSON.parse(json), null, 4);
-        out.line(`export const ABI_JSON = ${json}`);
-        out.write();
-        this.log.info(`saved ${out.file}`);
-    }
     generateEvents() {
         let events = this.getEvents();
         if (events.length == 0) {
@@ -73,12 +48,16 @@ class Typegen {
         this.out.line();
         this.out.block(`export const events =`, () => {
             for (let e of events) {
-                this.out.line(`${this.getPropName(e)}: new LogEvent<${(0, types_1.getFullTupleType)(e.inputs)}>(`);
-                this.out.indentation(() => this.out.line(`abi, '${e.topicHash}'`));
-                this.out.line('),');
+                this.out.line(`${this.getPropName(e)}: event("${this.topic0(e)}", {${this.toTypes(e.inputs)}}),`);
             }
         });
     }
+    topic0(e) {
+        return `0x${(0, evm_abi_1.keccak256)(this.sighash(e)).toString('hex')}`;
+    }
+    toTypes(inputs) {
+        return inputs.map((input, idx) => (0, types_1.getType)(input, idx)).join(', ');
+    }
     generateFunctions() {
         let functions = this.getFunctions();
         if (functions.length == 0) {
@@ -87,57 +66,127 @@ class Typegen {
         this.out.line();
         this.out.block(`export const functions =`, () => {
             for (let f of functions) {
-                let sighash = f.selector;
-                let pArgs = (0, types_1.getTupleType)(f.inputs);
-                let pArgStruct = (0, types_1.getStructType)(f.inputs);
-                let pResult = (0, types_1.getReturnType)(f.outputs);
-                this.out.line(`${this.getPropName(f)}: new Func<${pArgs}, ${pArgStruct}, ${pResult}>(`);
-                this.out.indentation(() => this.out.line(`abi, '${sighash}'`));
-                this.out.line('),');
+                let returnType = '';
+                if (f.outputs?.length === 1) {
+                    returnType = (0, types_1.getType)({ ...f.outputs[0], name: undefined });
+                }
+                if (f.outputs?.length > 1) {
+                    returnType = `{${this.toTypes(f.outputs)}}`;
+                }
+                this.out.line(`${this.getPropName(f)}: fun("${this.functionSelector(f)}", {${this.toTypes(f.inputs)}}, ${returnType}),`);
             }
         });
     }
+    functionSelector(f) {
+        const sighash = this.sighash(f);
+        return `0x${(0, evm_abi_1.keccak256)(sighash).slice(0, 4).toString('hex')}`;
+    }
     generateContract() {
         this.out.line();
         this.out.block(`export class Contract extends ContractBase`, () => {
             let functions = this.getFunctions();
             for (let f of functions) {
-                if (f.constant && f.outputs?.length) {
+                if ((f.stateMutability === 'pure' || f.stateMutability === 'view') &&
+                    f.outputs?.length) {
                     this.out.line();
-                    let argNames = f.inputs.map((a, idx) => a.name || `arg${idx}`);
-                    let args = f.inputs.map((a, idx) => `${argNames[idx]}: ${(0, types_1.getType)(a)}`).join(', ');
-                    this.out.block(`${this.getPropName(f)}(${args}): Promise<${(0, types_1.getReturnType)(f.outputs)}>`, () => {
-                        this.out.line(`return this.eth_call(functions${this.getRef(f)}, [${argNames.join(', ')}])`);
+                    let argNames = f.inputs.map((a, idx) => a.name || `_${idx}`);
+                    const ref = this.getPropNameGetter(f);
+                    const [argsType] = this.toFunctionTypes(f);
+                    let args = f.inputs
+                        .map((a, idx) => `${argNames[idx]}: ${argsType}["${argNames[idx]}"]`)
+                        .join(', ');
+                    this.out.block(`${this.getPropName(f)}(${args})`, () => {
+                        this.out.line(`return this.eth_call(functions${ref}, {${argNames.join(', ')}})`);
                     });
                 }
             }
         });
     }
-    getRef(item) {
-        let key = this.getPropName(item);
-        if (key[0] == "'") {
-            return `[${key}]`;
-        }
-        else {
-            return '.' + key;
+    cannonicalType(param) {
+        if (!param.type.startsWith('tuple')) {
+            return param.type;
         }
+        const arrayBrackets = param.type.slice(5);
+        return `(${param.components.map((param) => this.cannonicalType(param))})${arrayBrackets}`;
+    }
+    sighash(item) {
+        return `${item.name}(${item.inputs
+            .map((param) => this.cannonicalType(param))
+            .join(',')})`;
     }
     getPropName(item) {
         if (this.getOverloads(item) == 1) {
             return item.name;
         }
         else {
-            return `'${item.format('sighash')}'`;
+            return `"${this.sighash(item)}"`;
+        }
+    }
+    getPropNameGetter(item) {
+        if (this.getOverloads(item) == 1) {
+            return '.' + item.name;
+        }
+        else {
+            return `["${this.sighash(item)}"]`;
         }
     }
     getOverloads(item) {
-        if (item instanceof ethers.EventFragment) {
+        if (item.type === 'event') {
             return this.eventOverloads()[item.name];
         }
         else {
             return this.functionOverloads()[item.name];
         }
     }
+    capitalize(s) {
+        return s.charAt(0).toUpperCase() + s.slice(1);
+    }
+    getOverloadIndex(item) {
+        const abi = [...this.getEvents(), ...this.getFunctions()];
+        const overloads = abi.filter((x) => x.name === item.name);
+        return overloads.findIndex((x) => areItemEqual(x, item));
+    }
+    toEventType(e) {
+        if (this.getOverloads(e) === 1) {
+            return `${this.capitalize(e.name)}EventArgs`;
+        }
+        const index = this.getOverloadIndex(e);
+        return `${this.capitalize(e.name)}EventArgs_${index}`;
+    }
+    generateEventTypes() {
+        const events = this.getEvents();
+        if (events.length == 0) {
+            return;
+        }
+        this.out.line();
+        this.out.line(`/// Event types`);
+        for (let e of events) {
+            const propName = this.getPropNameGetter(e);
+            this.out.line(`export type ${this.toEventType(e)} = EParams<typeof events${propName}>`);
+        }
+    }
+    toFunctionTypes(f) {
+        if (this.getOverloads(f) === 1) {
+            return [`${this.capitalize(f.name)}Params`, `${this.capitalize(f.name)}Return`];
+        }
+        const index = this.getOverloadIndex(f);
+        return [`${this.capitalize(f.name)}Params_${index}`, `${this.capitalize(f.name)}Return_${index}`];
+    }
+    generateFunctionTypes() {
+        let functions = this.getFunctions();
+        if (functions.length == 0) {
+            return;
+        }
+        this.out.line();
+        this.out.line(`/// Function types`);
+        for (let f of functions) {
+            const propName = this.getPropNameGetter(f);
+            const [args, ret] = this.toFunctionTypes(f);
+            this.out.line(`export type ${args} = FunctionArguments<typeof functions${propName}>`);
+            this.out.line(`export type ${ret} = FunctionReturn<typeof functions${propName}>`);
+            this.out.line();
+        }
+    }
     functionOverloads() {
         let overloads = {};
         for (let item of this.getFunctions()) {
@@ -153,10 +202,10 @@ class Typegen {
         return overloads;
     }
     getFunctions() {
-        return this.abi.fragments.filter(f => f.type === 'function');
+        return this.abi.filter((f) => f.type === 'function');
     }
     getEvents() {
-        return this.abi.fragments.filter(f => f.type === 'event');
+        return this.abi.filter((f) => f.type === 'event');
     }
 }
 exports.Typegen = Typegen;