Fix for unstructured storage abis (codegen) (#1976)

* add test for fix * update changelog * add lower case * add test
subquery · Aug 30, 2023 · 681c1d1 · 681c1d1
1 parent 504137b
commit 681c1d1
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix incorrect codegen on unstructured storage proxy contract abis (#1976)
 
 ## [3.6.1] - 2023-08-29
 ### Fixed

diff --git a/packages/cli/src/controller/codegen-controller.spec.ts b/packages/cli/src/controller/codegen-controller.spec.ts
@@ -4,7 +4,7 @@
 import fs from 'fs';
 import path from 'path';
 import rimraf from 'rimraf';
-import {abiInterface, codegen, processAbis, validateEntityName} from './codegen-controller';
+import {abiInterface, codegen, joinInputAbiName, processAbis, validateEntityName} from './codegen-controller';
 
 jest.mock('fs', () => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -123,4 +123,44 @@ describe('Codegen can generate schema (mocked)', () => {
       'Provided ABI is not a valid ABI or Artifact'
     );
   });
+
+  it('should replace [] in input abi name', () => {
+    const mockAbiInterface = {
+      type: 'function',
+      name: 'initialize',
+      inputs: [
+        {
+          name: '__name',
+          type: 'string',
+        },
+        {
+          name: '__symbol',
+          type: 'string',
+        },
+        {
+          name: '__baseURI',
+          type: 'string',
+        },
+        {
+          name: 'admins',
+          type: 'address[]',
+        },
+      ],
+    } as abiInterface;
+
+    expect(joinInputAbiName(mockAbiInterface)).toMatch('initialize_string_string_string_address_arr_');
+  });
+  it('ensure correct output when input does not contain []', () => {
+    const mockAbiInterface = {
+      type: 'function',
+      name: 'initialize',
+      inputs: [
+        {
+          name: '__name',
+          type: 'STRING',
+        },
+      ],
+    } as abiInterface;
+    expect(joinInputAbiName(mockAbiInterface)).toMatch('initialize_string_');
+  });
 });
diff --git a/packages/cli/src/controller/codegen-controller.ts b/packages/cli/src/controller/codegen-controller.ts
@@ -306,9 +306,9 @@ export function processAbis(
   return renderInterfaceJobs;
 }
 
-function joinInputAbiName(abiObject: abiInterface) {
+export function joinInputAbiName(abiObject: abiInterface): string {
   // example: "TextChanged_bytes32_string_string_string_Event", Event name/Function type name will be joined in ejs
-  const inputToSnake: string = abiObject.inputs.map((obj) => obj.type.toLowerCase()).join('_');
+  const inputToSnake = abiObject.inputs.map((obj) => obj.type.replace(/\[\]/g, '_arr').toLowerCase()).join('_');
   return `${abiObject.name}_${inputToSnake}_`;
 }