fix: handle tuples in events 1 level deep for now

Author: joshstevens19

abi-types-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-abi-types-generator",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Generate types from an ethereum ABI json file.",
   "main": "dist/index.js",
   "scripts": {

abi-types-generator/src/converters/typescript/abi-generator.ts

@@ -318,10 +318,20 @@ export default class AbiGenerator {
             for (let e = 0; e < eventInputs.length; e++) {
               const eventTsType = TypeScriptHelpers.getSolidityInputTsType(
                 eventInputs[e],
-                this._context.provider
+                this._context.provider,
+                'EventEmittedResponse'
               );
 
               eventTypeProperties += `${eventInputs[e].name}: ${eventTsType};`;
+
+              if (eventInputs[e].type === SolidityType.tuple) {
+                this.buildTupleParametersInterface(
+                  // remove due to prefix of components
+                  eventTsType.replace('EventEmittedResponse', ''),
+                  eventInputs[e],
+                  'EventEmittedResponse'
+                );
+              }
             }
 
             this.addReturnTypeInterface(
@@ -367,7 +377,7 @@ export default class AbiGenerator {
    */
   private getAbiFileLocationRawName(): string {
     const basename = path.basename(this._context.abiFileLocation);
-    return basename.substr(0, basename.lastIndexOf('.')); 
+    return basename.substr(0, basename.lastIndexOf('.'));
   }
 
   /**
@@ -516,9 +526,10 @@ export default class AbiGenerator {
    */
   private buildTupleParametersInterface(
     name: string,
-    abiInput: AbiInput
+    abiInput: AbiInput,
+    prefix: 'Request' | 'Response' | 'EventEmittedResponse' = 'Request'
   ): string {
-    const interfaceName = `${Helpers.capitalize(name)}Request`;
+    const interfaceName = `${Helpers.capitalize(name)}${prefix}`;
 
     let properties = '';
 
@@ -534,7 +545,7 @@ export default class AbiGenerator {
       if (abiInput.components![i].components) {
         const deepInterfaceName = TypeScriptHelpers.buildInterfaceName(
           abiInput.components![i],
-          'Request'
+          prefix
         );
         let deepProperties = '';
         for (

abi-types-generator/src/converters/typescript/common/helpers.ts

@@ -19,7 +19,8 @@ export default class TypeScriptHelpers {
    */
   public static getSolidityInputTsType(
     abiInput: AbiInput,
-    provider: Provider
+    provider: Provider,
+    prefix: 'Request' | 'EventEmittedResponse' = 'Request'
   ): string {
     switch (provider) {
       case Provider.ethers:
@@ -128,7 +129,7 @@ export default class TypeScriptHelpers {
     }
 
     if (abiInput.type.includes(SolidityType.tuple)) {
-      const interfaceName = this.buildInterfaceName(abiInput, 'Request');
+      const interfaceName = this.buildInterfaceName(abiInput, prefix);
       if (abiInput.type.includes('[')) {
         return `${interfaceName}[]`;
       }
@@ -233,7 +234,10 @@ export default class TypeScriptHelpers {
    */
   public static buildInterfaceName(
     inputOrOutput: AbiOutput | AbiInput,
-    requestInterfaceType: 'Request' | 'Response' = 'Response'
+    requestInterfaceType:
+      | 'Request'
+      | 'Response'
+      | 'EventEmittedResponse' = 'Response'
   ): string {
     if (inputOrOutput.name.length > 0) {
       return `${Helpers.capitalize(inputOrOutput.name)}${requestInterfaceType}`;