build: use the 'org.web3j.solidity' Gradle plugin to compile contracts

Signed-off-by: Jendrik Johannes <[email protected]>

gradle.properties

@@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
 
 # Enable Gradle caching
 org.gradle.configuration-cache=true
-org.gradle.caching=true
+# org.gradle.caching=true -- TODO disable until 'org.web3j.solidity' is compatible
 
 # Enable parallel workers
 org.gradle.parallel=true

gradle/plugins/build.gradle.kts

@@ -38,4 +38,5 @@ dependencies {
     implementation("org.gradlex:extra-java-module-info:1.8")
     implementation("org.gradlex:jvm-dependency-conflict-resolution:2.0")
     implementation("org.gradlex:java-module-dependencies:1.6.5")
+    implementation("org.web3j.solidity:solidity-gradle-plugin:0.5.0")
 }

gradle/plugins/src/main/kotlin/com/hedera/gradle/tasks/GitClone.kt

@@ -56,12 +56,7 @@ abstract class GitClone : DefaultTask() {
             exec.exec {
                 if (!localClone.dir(".git").asFile.exists()) {
                     workingDir = localClone.asFile.parentFile
-                    commandLine(
-                        "git",
-                        "clone",
-                        "https://github.com/hashgraph/hedera-protobufs.git",
-                        "-q"
-                    )
+                    commandLine("git", "clone", url.get(), "-q")
                 } else {
                     workingDir = localClone.asFile
                     commandLine("git", "fetch", "-q")

hedera-node/test-clients/build.gradle.kts

@@ -15,10 +15,17 @@
  */
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.hedera.gradle.tasks.GitClone
+import org.web3j.solidity.gradle.plugin.EVMVersion
+import org.web3j.solidity.gradle.plugin.OutputComponent
+import org.web3j.solidity.gradle.plugin.SolidityCompile
+import org.web3j.solidity.gradle.plugin.SolidityResolve
+import org.web3j.solidity.gradle.plugin.SoliditySourceSet
 
 plugins {
     id("com.hedera.gradle.services")
     id("com.hedera.gradle.shadow-jar")
+    id("org.web3j.solidity")
 }
 
 description = "Hedera Services Test Clients for End to End Tests (EET)"
@@ -34,6 +41,61 @@ mainModuleInfo {
     runtimeOnly("org.junit.platform.launcher")
 }
 
+// Clone 'hedera-smart-contracts' to obtain system contracts
+val cloneSmartContracts =
+    tasks.register<GitClone>("cloneSmartContracts") {
+        offline = gradle.startParameter.isOffline
+        url = "https://github.com/hashgraph/hedera-smart-contracts.git"
+        localCloneDirectory = layout.buildDirectory.dir("hedera-smart-contracts")
+        tag = "v0.9.0"
+    }
+
+// General solidity configuration
+solidity {
+    setCombinedOutputComponents()
+    setOutputComponents(OutputComponent.BIN, OutputComponent.ABI)
+    // evmVersion = EVMVersion.CANCUN
+    // prettyJson = true --- does not work due to bug in plugin
+    optimize = false
+    allowPaths.add(layout.projectDirectory.dir("src/main/solidity").asFile.absolutePath)
+    allowPaths.add(
+        layout.buildDirectory
+            .dir("hedera-smart-contracts/contracts/system-contracts")
+            .get()
+            .asFile
+            .absolutePath
+    )
+}
+
+sourceSets.main {
+    withConvention(SoliditySourceSet::class) {
+        solidity {
+            destinationDirectory = layout.buildDirectory.dir("generated/solidity")
+            // TODO remove this filtering and make all 'sol' files compile
+            include("AbandoningParent/*")
+            include("AddressValueRet/*")
+            include("AutoCreationModes/*")
+            include("Child/*")
+            include("Placeholder/*")
+            include("Returner/*")
+            include("AssociateTryCatch/*")
+        }
+    }
+}
+
+tasks.withType<SolidityResolve>().configureEach {
+    inputs.dir(cloneSmartContracts.flatMap { it.localCloneDirectory })
+}
+
+tasks.withType<SolidityCompile>().configureEach {
+    inputs.dir(cloneSmartContracts.flatMap { it.localCloneDirectory })
+}
+
+tasks.processResources { from(tasks.named("compileSolidity")) { into("contract/contracts") } }
+
+// TODO register separate SolidityCompile - complete configuration of task
+tasks.register<SolidityCompile>("compileSolidityParis") { evmVersion = EVMVersion.PARIS }
+
 sourceSets {
     // Needed because "resource" directory is misnamed. See
     // https://github.com/hashgraph/hedera-services/issues/3361

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/Utils.java

@@ -79,11 +79,11 @@
 import org.json.JSONTokener;
 
 public class Utils {
-    public static final String RESOURCE_PATH = "src/main/resource/contract/contracts/%1$s/%1$s%2$s";
+    public static final String RESOURCE_PATH = "src/main/resource/contract/contracts/%1$s%2$s";
 
-    public static final String UNIQUE_CLASSPATH_RESOURCE_TPL = "contract/contracts/%s/%s";
+    public static final String UNIQUE_CLASSPATH_RESOURCE_TPL = "contract/contracts/%s";
     private static final Logger log = LogManager.getLogger(Utils.class);
-    private static final String JSON_EXTENSION = ".json";
+    private static final String JSON_EXTENSION = ".abi";
 
     public static ByteString eventSignatureOf(String event) {
         return ByteString.copyFrom(Hash.keccak256(Bytes.wrap(event.getBytes())).toArray());
@@ -192,8 +192,7 @@ public static String getABIFor(final FunctionType type, final String functionNam
 
     public static String getResourceABIFor(
             final FunctionType type, final String functionName, final String contractName) {
-        final var resourcePath =
-                String.format(UNIQUE_CLASSPATH_RESOURCE_TPL, contractName, contractName + JSON_EXTENSION);
+        final var resourcePath = String.format(UNIQUE_CLASSPATH_RESOURCE_TPL, contractName + JSON_EXTENSION);
         try (final var input = Utils.class.getClassLoader().getResourceAsStream(resourcePath)) {
             return getFunctionAbiFrom(input, functionName, type);
         } catch (final IOException e) {