Merge pull request #2478 from Meelabs/1.0

AbiInput and AbiOutput interface update
web3 · Mar 18, 2019 · f66e080 · f66e080
2 parents 441135e + d29ab09
commit f66e080
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/packages/web3-utils/types/index.d.ts b/packages/web3-utils/types/index.d.ts
@@ -209,7 +209,7 @@ export interface AbiItem {
     constant?: boolean;
     inputs?: AbiInput[];
     name?: string;
-    outputs?: AbiOuput[];
+    outputs?: AbiOutput[];
     payable?: boolean;
     stateMutability?: StateMutabilityType;
     type: AbiType;
@@ -219,9 +219,11 @@ export interface AbiInput {
     name: string;
     type: string;
     indexed?: boolean;
+	components?: AbiInput[];
 }
 
-export interface AbiOuput {
+export interface AbiOutput {
     name: string;
     type: string;
+	components?: AbiOutput[];
 }
diff --git a/packages/web3-utils/types/tests/json-interface-method-to-string-test.ts b/packages/web3-utils/types/tests/json-interface-method-to-string-test.ts
@@ -23,18 +23,80 @@
 import {jsonInterfaceMethodToString, AbiItem} from 'web3-utils';
 
 const abiItem: AbiItem = {
+    anonymous: false,
     constant: true,
     inputs: [
         {
             name: 'testMe',
             type: 'uint256[3]'
+        },
+        {
+            name: 'inputA',
+            type: 'tuple',
+            components: [
+                {
+                    name: 'a',
+                    type: 'uint8'
+                },
+                {
+                    name: 'b',
+                    type: 'uint8'
+                }
+            ]
+        },
+        {
+            name: 'inputB',
+            type: 'tuple[]',
+            components: [
+                {
+                    name: 'a1',
+                    type: 'uint256'
+                },
+                {
+                    name: 'a2',
+                    type: 'uint256'
+                }
+            ]
+        },
+        {
+            name: 'inputC',
+            type: 'uint8',
+            indexed: false
         }
     ],
     name: "testName",
     outputs: [
         {
             name: "test",
             type: "uint256"
+        },
+        {
+            name: 'outputA',
+            type: 'tuple',
+            components: [
+                {
+                    name: 'a',
+                    type: 'uint8'
+                },
+                {
+                    name: 'b',
+                    type: 'uint8'
+                }
+            ]
+        },
+        {
+            name: 'outputB',
+            type: 'tuple[]',
+            components: [
+                {
+                    name: 'a1',
+                    type: 'uint256'
+                },
+                {
+                    name: 'a2',
+                    type: 'uint256'
+                }
+            ]
         }
     ],
     payable: false,