Update abiParser.ts to work with foundry / forge output + Tests (#624)

Co-authored-by: Kris Kaczor <[email protected]>
dethcrypto · Mar 6, 2022 · 7e7bbed · 7e7bbed
1 parent db551b5
commit 7e7bbed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/.changeset/four-carrots-collect.md b/.changeset/four-carrots-collect.md
@@ -0,0 +1,5 @@
+---
+"typechain": patch
+---
+
+Add support for foundry / forge style artifacts
diff --git a/packages/typechain/src/parser/abiParser.ts b/packages/typechain/src/parser/abiParser.ts
@@ -396,6 +396,11 @@ export function extractBytecode(rawContents: string): BytecodeWithLinkReferences
     )
   }
 
+  // handle json schema of @foundry/forge
+  if (json.bytecode?.object?.match(bytecodeRegex)) {
+    return extractLinkReferences(json.bytecode.object, json.bytecode.linkReferences)
+  }
+
   if (json.bytecode?.match(bytecodeRegex)) {
     return extractLinkReferences(json.bytecode, json.linkReferences)
   }

diff --git a/packages/typechain/test/parser/abiParser.test.ts b/packages/typechain/test/parser/abiParser.test.ts
@@ -140,6 +140,10 @@ describe('extractBytecode', () => {
     ).toEqual(resultBytecode)
   })
 
+  it('should return bytecode from nested abi (@foundry/forge style)', () => {
+    expect(extractBytecode(`{ "bytecode": { "object": "${sampleBytecode}" } }`)).toEqual(resultBytecode)
+  })
+
   it('should return undefined when nested abi bytecode is malformed', () => {
     expect(extractBytecode(`{ "bytecode": "surely-not-bytecode" }`)).toEqual(undefined)
   })