feat(compiler): add generateAci, generateAciBySourceCode

docker-compose.yml

@@ -9,6 +9,6 @@ services:
       - ./docker/accounts_test.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
 
   compiler:
-    image: aeternity/aesophia_http:v7.2.0
+    build: https://github.com/aeternity/aesophia_http.git#add-no-code-to-aci
     hostname: compiler
     ports: ["3080:3080"]

src/contract/compiler/Base.ts

@@ -55,6 +55,32 @@ export default abstract class CompilerBase {
     aci: Aci;
   }>;
 
+  /**
+   * Generate contract's ACI by contract's path
+   * Available only in Node.js
+   * @param path - Path to contract source code
+   * @returns ACI
+   */
+  abstract generateAci(path: string): Promise<Aci>;
+
+  /**
+   * Generate contract's ACI by contract's source code
+   * @param sourceCode - Contract source code as string
+   * @param fileSystem - A map of contract filename to the corresponding contract source code to
+   * include into the main contract
+   * @example
+   * ```js
+   * {
+   *   'library.aes': 'namespace TestLib =\n  function sum(x: int, y: int) : int = x + y'
+   * }
+   * ```
+   * @returns ACI
+   */
+  abstract generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci>;
+
   /**
    * Verify that a contract bytecode is the result of compiling the given source code
    * Available only in Node.js

src/contract/compiler/Cli.ts

@@ -79,7 +79,7 @@ export default class CompilerCli extends CompilerBase {
       ]);
       return {
         bytecode: bytecode.trimEnd() as Encoded.ContractBytearray,
-        aci: aci as Aci,
+        aci,
       };
     } catch (error) {
       ensureError(error);
@@ -99,6 +99,28 @@ export default class CompilerCli extends CompilerBase {
     }
   }
 
+  async generateAci(path: string): Promise<Aci> {
+    await this.#ensureCompatibleVersion;
+    try {
+      return JSON.parse(await this.#run('--no_code', '--create_json_aci', path));
+    } catch (error) {
+      ensureError(error);
+      throw new CompilerError(error.message);
+    }
+  }
+
+  async generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci> {
+    const tmp = await CompilerCli.#saveContractToTmpDir(sourceCode, fileSystem);
+    try {
+      return await this.generateAci(tmp);
+    } finally {
+      await rm(dirname(tmp), { recursive: true });
+    }
+  }
+
   async validate(bytecode: Encoded.ContractBytearray, path: string): Promise<boolean> {
     await this.#ensureCompatibleVersion;
     try {

src/contract/compiler/Http.ts

@@ -81,6 +81,25 @@ export default class CompilerHttp extends CompilerBase {
     throw new NotImplementedError('File system access, use CompilerHttpNode instead');
   }
 
+  async generateAciBySourceCode(
+    sourceCode: string,
+    fileSystem?: Record<string, string>,
+  ): Promise<Aci> {
+    try {
+      return await this.api.generateACI({ code: sourceCode, options: { fileSystem } });
+    } catch (error) {
+      if (error instanceof RestError && error.statusCode === 400) {
+        throw new CompilerError(error.message);
+      }
+      throw error;
+    }
+  }
+
+  // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
+  async generateAci(path: string): Promise<Aci> {
+    throw new NotImplementedError('File system access, use CompilerHttpNode instead');
+  }
+
   async validateBySourceCode(
     bytecode: Encoded.ContractBytearray,
     sourceCode: string,

src/contract/compiler/HttpNode.ts

@@ -18,6 +18,12 @@ export default class CompilerHttpNode extends HttpBrowser {
     return this.compileBySourceCode(sourceCode, fileSystem);
   }
 
+  override async generateAci(path: string): Promise<Aci> {
+    const fileSystem = await getFileSystem(path);
+    const sourceCode = await readFile(path, 'utf8');
+    return this.generateAciBySourceCode(sourceCode, fileSystem);
+  }
+
   override async validate(bytecode: Encoded.ContractBytearray, path: string): Promise<boolean> {
     const fileSystem = await getFileSystem(path);
     const sourceCode = await readFile(path, 'utf8');

test/integration/Middleware.ts

@@ -17,7 +17,7 @@ describe('MiddlewareSubscriber', () => {
       },
       mdwGensPerMinute: res.mdwGensPerMinute,
       mdwHeight: res.mdwHeight,
-      mdwLastMigration: 20230519120000,
+      mdwLastMigration: res.mdwLastMigration,
       mdwRevision: res.mdwRevision,
       mdwSynced: true,
       mdwSyncing: true,

test/integration/compiler.ts

@@ -14,9 +14,50 @@ function testCompiler(compiler: CompilerBase): void {
   const inclBytecode = 'cb_+QEGRgOg7BH1sCv+p2IrS0Pn3/i6AfE8lOGUuC71lLPn6mbUm9PAuNm4cv4AWolkAjcCBwcHFBQAAgD+RNZEHwA3ADcAGg6CPwEDP/5Nt4A5AjcCBwcHDAECDAEABAMRAFqJZP6SiyA2ADcBBwcMAwgMAQAEAxFNt4A5/pSgnxIANwF3BwwBAAQDEarAwob+qsDChgI3AXcHPgQAALhgLwYRAFqJZD0uU3VibGlicmFyeS5zdW0RRNZEHxFpbml0EU23gDkxLkxpYnJhcnkuc3VtEZKLIDYRdGVzdBGUoJ8SJWdldExlbmd0aBGqwMKGOS5TdHJpbmcubGVuZ3Rogi8AhTcuMS4wAGHgFTw=';
   const testBytecode = 'cb_+GhGA6BgYgXqYB9ctBcQ8mJ0+we5OXhb9PpsSQWP2DhPx9obn8C4O57+RNZEHwA3ADcAGg6CPwEDP/6AeCCSADcBd3cBAQCYLwIRRNZEHxFpbml0EYB4IJIZZ2V0QXJngi8AhTcuMC4xAMXqWXc=';
 
+  const interfaceSourceCodePath = './test/integration/contracts/Interface.aes';
+  let interfaceSourceCode: string;
+  let interfaceFileSystem: Record<string, string>;
+  const interfaceAci = [
+    { namespace: { name: 'ListInternal', typedefs: [] } },
+    { namespace: { name: 'List', typedefs: [] } },
+    { namespace: { name: 'String', typedefs: [] } },
+    {
+      contract: {
+        functions: [{
+          arguments: [{ name: '_1', type: 'int' }],
+          name: 'decrement',
+          payable: false,
+          returns: 'int',
+          stateful: false,
+        }],
+        kind: 'contract_child',
+        name: 'Decrement',
+        payable: false,
+        typedefs: [],
+      },
+    },
+    {
+      contract: {
+        functions: [{
+          arguments: [{ name: '_1', type: 'int' }],
+          name: 'increment',
+          payable: false,
+          returns: 'int',
+          stateful: false,
+        }],
+        kind: 'contract_main',
+        name: 'Increment',
+        payable: false,
+        typedefs: [],
+      },
+    },
+  ];
+
   before(async () => {
     inclSourceCode = await readFile(inclSourceCodePath, 'utf8');
     inclFileSystem = await getFileSystem(inclSourceCodePath);
+    interfaceSourceCode = await readFile(interfaceSourceCodePath, 'utf8');
+    interfaceFileSystem = await getFileSystem(interfaceSourceCodePath);
   });
 
   it('returns version', async () => {
@@ -54,6 +95,16 @@ function testCompiler(compiler: CompilerBase): void {
     );
   });
 
+  it('generates aci by path', async () => {
+    const aci = await compiler.generateAci(interfaceSourceCodePath);
+    expect(aci).to.eql(interfaceAci);
+  });
+
+  it('generates aci by source code', async () => {
+    const aci = await compiler.generateAciBySourceCode(interfaceSourceCode, interfaceFileSystem);
+    expect(aci).to.eql(interfaceAci);
+  });
+
   it('validates bytecode by path', async () => {
     expect(await compiler.validate(inclBytecode, inclSourceCodePath)).to.be.equal(true);
     expect(await compiler.validate(testBytecode, inclSourceCodePath)).to.be.equal(false);

test/integration/contracts/Interface.aes

@@ -0,0 +1,5 @@
+include "String.aes"
+include "./lib/DecrementInterface.aes"
+
+main contract Increment =
+  entrypoint increment: (int) => int

test/integration/contracts/lib/DecrementInterface.aes

@@ -0,0 +1,2 @@
+contract Decrement =
+  entrypoint decrement: (int) => int

tooling/autorest/compiler-prepare.mjs

@@ -1,6 +1,6 @@
 import fs from 'fs';
 
-const swaggerUrl = 'https://raw.githubusercontent.com/aeternity/aesophia_http/v7.1.1/config/swagger.yaml';
+const swaggerUrl = 'https://raw.githubusercontent.com/aeternity/aesophia_http/add-no-code-to-aci/config/swagger.yaml';
 
 const response = await fetch(swaggerUrl);
 console.assert(response.status === 200, 'Invalid response code', response.status);