separate array type handling

Signed-off-by: tonykwok1992 <[email protected]>
hyperledger-web3j · Jun 16, 2024 · 5c49ed3 · 5c49ed3
1 parent 3d0a0b2
commit 5c49ed3
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java b/codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java
@@ -641,20 +641,34 @@ private List<AbiDefinition.NamedType> extractStructs(
                         })
                 .forEach(
                         namedType -> {
-                            structMap.put(
-                                    namedType.flattenNamedType().structIdentifier(), namedType);
+                            if (namedType.getType().startsWith("tuple[")) {
+                                structMap.putIfAbsent(
+                                        namedType.flattenNamedType().structIdentifier(), namedType);
+                            } else {
+                                structMap.put(namedType.structIdentifier(), namedType);
+                            }
+
                             extractNested(namedType).stream()
                                     .map(this::normalizeNamedType)
                                     .filter(
                                             nestedNamedStruct ->
                                                     nestedNamedStruct.getType().startsWith("tuple"))
                                     .forEach(
-                                            nestedNamedType ->
-                                                    structMap.put(
+                                            nestedNamedType -> {
+                                                if (nestedNamedType
+                                                        .getType()
+                                                        .startsWith("tuple[")) {
+                                                    structMap.putIfAbsent(
                                                             nestedNamedType
                                                                     .flattenNamedType()
                                                                     .structIdentifier(),
-                                                            nestedNamedType));
+                                                            nestedNamedType);
+                                                } else {
+                                                    structMap.put(
+                                                            nestedNamedType.structIdentifier(),
+                                                            nestedNamedType);
+                                                }
+                                            });
                         });
 
         return structMap.values().stream()