Merge remote-tracking branch 'origin/main' into sm/js-asserts

js/e2e/web.test.js

@@ -111,3 +111,35 @@ test("should return not found error for missing imports in browser", async ({
     'Source "nonexistent/console.sol" not found',
   );
 });
+
+test('should successfully compile a valid Solidity contract that instantiates another contract in the browser', async ({ page }) => {
+  await loadTestPage(page);
+  const standardInput = loadFixture('instantiate.json')
+  const result = await runWorker(page, standardInput);
+  
+  expect(typeof result).toBe('string');
+  let output = JSON.parse(result);
+  expect(output).toHaveProperty('contracts');
+  expect(output.contracts['fixtures/instantiate.sol']).toHaveProperty('ChildContract');
+  expect(output.contracts['fixtures/instantiate.sol'].ChildContract).toHaveProperty('abi');
+  expect(output.contracts['fixtures/instantiate.sol'].ChildContract).toHaveProperty('evm');
+  expect(output.contracts['fixtures/instantiate.sol'].ChildContract.evm).toHaveProperty('bytecode');
+  expect(output.contracts['fixtures/instantiate.sol']).toHaveProperty('MainContract');
+  expect(output.contracts['fixtures/instantiate.sol'].MainContract).toHaveProperty('abi');
+  expect(output.contracts['fixtures/instantiate.sol'].MainContract).toHaveProperty('evm');
+  expect(output.contracts['fixtures/instantiate.sol'].MainContract.evm).toHaveProperty('bytecode');
+});
+
+test('should successfully compile a valid Solidity contract that instantiates the token contracts in the browser', async ({ page }) => {
+  await loadTestPage(page);
+  const standardInput = loadFixture('instantiate_tokens.json')
+  const result = await runWorker(page, standardInput);
+
+  expect(typeof result).toBe('string');
+  let output = JSON.parse(result);
+  expect(output).toHaveProperty('contracts');
+  expect(output.contracts['fixtures/instantiate_tokens.sol']).toHaveProperty('TokensFactory');
+  expect(output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory).toHaveProperty('abi');
+  expect(output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory).toHaveProperty('evm');
+  expect(output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory.evm).toHaveProperty('bytecode');
+});

js/fixtures/instantiate.json

@@ -0,0 +1,20 @@
+{
+    "language": "Solidity",
+    "sources": {
+      "fixtures/instantiate.sol": {
+        "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.8.2 <0.9.0;\ncontract ChildContract {\n    constructor() {\n    }\n}\ncontract MainContract {\n    constructor() {\n       ChildContract newContract = new ChildContract();\n    }\n}"
+      }
+    },
+    "settings": {
+      "optimizer": {
+        "enabled": true,
+        "runs": 200
+      },
+      "outputSelection": {
+        "*": {
+          "*": ["abi"]
+        }
+      }
+    }
+  }
+  

js/tests/node.test.mjs

@@ -57,6 +57,27 @@ describe("Compile Function Tests", function () {
         output.contracts["fixtures/token.sol"].MyToken.evm,
       ).to.have.property("bytecode");
     });
+
+    it("should successfully compile a valid Solidity contract that instantiates the token contracts", async function () {
+      const standardInput = loadFixture("instantiate_tokens.json");
+
+      const result = await compile(standardInput);
+      expect(result).to.be.a("string");
+      const output = JSON.parse(result);
+      expect(output).to.have.property("contracts");
+      expect(output.contracts["fixtures/instantiate_tokens.sol"]).to.have.property(
+        "TokensFactory",
+      );
+      expect(output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory).to.have.property(
+        "abi",
+      );
+      expect(output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory).to.have.property(
+        "evm",
+      );
+      expect(
+        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory.evm,
+      ).to.have.property("bytecode");
+    });
   }
 
   it("should throw an error for invalid Solidity code", async function () {
@@ -85,4 +106,38 @@ describe("Compile Function Tests", function () {
       'Source "nonexistent/console.sol" not found',
     );
   });
+
+  it("should successfully compile a valid Solidity contract that instantiates another contract", async function () {
+    const standardInput = loadFixture("instantiate.json");
+
+    const result = await compile(standardInput);
+    expect(result).to.be.a("string");
+    const output = JSON.parse(result);
+    expect(output).to.have.property("contracts");
+    expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
+      "ChildContract",
+    );
+    expect(output.contracts["fixtures/instantiate.sol"].ChildContract).to.have.property(
+      "abi",
+    );
+    expect(output.contracts["fixtures/instantiate.sol"].ChildContract).to.have.property(
+      "evm",
+    );
+    expect(
+      output.contracts["fixtures/instantiate.sol"].ChildContract.evm,
+    ).to.have.property("bytecode");
+    expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
+      "MainContract",
+    );
+    expect(output.contracts["fixtures/instantiate.sol"].MainContract).to.have.property(
+      "abi",
+    );
+    expect(output.contracts["fixtures/instantiate.sol"].MainContract).to.have.property(
+      "evm",
+    );
+    expect(
+      output.contracts["fixtures/instantiate.sol"].MainContract.evm,
+    ).to.have.property("bytecode");
+  });
+
 });