Reintroduce engine get client version v1 with commit in manifest (#7548)

* Include Commit-Hash in manifests * Add commit method in BesuInfo * Use 8 character hash in EngineGetClientVersionV1 and revert calculateVersion back to original spec Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> Co-authored-by: garyschulte <garyschulte@gmail.com>
2026-01-08 23:17:54 -05:00 · 2024-08-31 04:13:53 +10:00
parent 1ea1d4cede
commit da98fa5541
60 changed files with 372 additions and 63 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add 'inbound' field to admin_peers JSON-RPC Call [#7461](https://github.com/hyperledger/besu/pull/7461)
 - Add pending block header to `TransactionEvaluationContext` plugin API [#7483](https://github.com/hyperledger/besu/pull/7483)
 - Add bootnode to holesky config [#7500](https://github.com/hyperledger/besu/pull/7500)
+- Implement engine_getClientVersionV1 [#7512](https://github.com/hyperledger/besu/pull/7512)
 - Performance optimzation for ECMUL (1 of 2) [#7509](https://github.com/hyperledger/besu/pull/7509)
 - Performance optimzation for ECMUL (2 of 2) [#7543](https://github.com/hyperledger/besu/pull/7543)

--- a/acceptance-tests/test-plugins/build.gradle
+++ b/acceptance-tests/test-plugins/build.gradle
@@ -25,7 +25,8 @@ task testPluginsJar(type: Jar) {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
  from sourceSets.main.output
--- a/besu/build.gradle
+++ b/besu/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/besu/src/main/java/org/hyperledger/besu/BesuInfo.java
+++ b/besu/src/main/java/org/hyperledger/besu/BesuInfo.java
@@ -16,7 +16,11 @@ package org.hyperledger.besu;

 import org.hyperledger.besu.util.platform.PlatformDetector;

+import java.net.JarURLConnection;
+import java.net.URL;
 import java.util.Optional;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;

 /**
 * Represent Besu information such as version, OS etc. Used with --version option and during Besu
@@ -27,6 +31,24 @@ public final class BesuInfo {
  private static final String VERSION = BesuInfo.class.getPackage().getImplementationVersion();
  private static final String OS = PlatformDetector.getOS();
  private static final String VM = PlatformDetector.getVM();
+  private static final String COMMIT;
+
+  static {
+    String className = BesuInfo.class.getSimpleName() + ".class";
+    String classPath = BesuInfo.class.getResource(className).toString();
+
+    String commit;
+    try {
+      URL url = new URL(classPath);
+      JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
+      Manifest manifest = jarConnection.getManifest();
+      Attributes attributes = manifest.getMainAttributes();
+      commit = attributes.getValue("Commit-Hash");
+    } catch (Exception e) {
+      commit = null;
+    }
+    COMMIT = commit;
+  }

  private BesuInfo() {}

@@ -60,4 +82,13 @@ public final class BesuInfo {
        .map(identity -> String.format("%s/%s/v%s/%s/%s", CLIENT, identity, VERSION, OS, VM))
        .orElse(version());
  }
+
+  /**
+   * Generate the commit hash for this besu version
+   *
+   * @return the commit hash for this besu version
+   */
+  public static String commit() {
+    return COMMIT;
+  }
 }
--- a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
@@ -1291,6 +1291,8 @@ public class RunnerBuilder {
        new JsonRpcMethodsFactory()
            .methods(
                BesuInfo.nodeName(identityString),
+                BesuInfo.shortVersion(),
+                BesuInfo.commit(),
                ethNetworkConfig.networkId(),
                besuController.getGenesisConfigOptions(),
                network,
--- a/build.gradle
+++ b/build.gradle
@@ -823,7 +823,7 @@ task distDocker {
        dockerPlatform = "--platform ${project.getProperty('docker-platform')}"
        println "Building for platform ${project.getProperty('docker-platform')}"
      }
-      def gitDetails = getGitCommitDetails(7)
+      def gitDetails = getGitCommitDetails()
      executable shell
      workingDir dockerBuildDir
      args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${gitDetails.hash} -t ${image} ."
--- a/config/build.gradle
+++ b/config/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/consensus/clique/build.gradle
+++ b/consensus/clique/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/consensus/common/build.gradle
+++ b/consensus/common/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/consensus/ibft/build.gradle
+++ b/consensus/ibft/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/consensus/merge/build.gradle
+++ b/consensus/merge/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/consensus/qbft/build.gradle
+++ b/consensus/qbft/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/crypto/algorithms/build.gradle
+++ b/crypto/algorithms/build.gradle
@@ -23,6 +23,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto'
      )
  }
--- a/crypto/services/build.gradle
+++ b/crypto/services/build.gradle
@@ -23,6 +23,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto'
      )
  }
--- a/datatypes/build.gradle
+++ b/datatypes/build.gradle
@@ -23,6 +23,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.datatypes'
      )
  }
--- a/ethereum/api/build.gradle
+++ b/ethereum/api/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
@@ -64,7 +64,9 @@ import io.vertx.core.VertxOptions;
 /** Provides a facade to construct the JSON-RPC component. */
 public class JsonRpcTestMethodsFactory {

-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger NETWORK_ID = BigInteger.valueOf(123);

  private final BlockchainImporter importer;
@@ -175,7 +177,9 @@ public class JsonRpcTestMethodsFactory {

    return new JsonRpcMethodsFactory()
        .methods(
+            CLIENT_NODE_NAME,
            CLIENT_VERSION,
+            CLIENT_COMMIT,
            NETWORK_ID,
            new StubGenesisConfigOptions(),
            peerDiscovery,
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
@@ -63,6 +63,7 @@ public enum RpcMethod {
  ENGINE_FORKCHOICE_UPDATED_V2("engine_forkchoiceUpdatedV2"),
  ENGINE_FORKCHOICE_UPDATED_V3("engine_forkchoiceUpdatedV3"),
  ENGINE_EXCHANGE_TRANSITION_CONFIGURATION("engine_exchangeTransitionConfigurationV1"),
+  ENGINE_GET_CLIENT_VERSION_V1("engine_getClientVersionV1"),
  ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1("engine_getPayloadBodiesByHashV1"),
  ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1("engine_getPayloadBodiesByRangeV1"),
  ENGINE_EXCHANGE_CAPABILITIES("engine_exchangeCapabilities"),
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetClientVersionResultV1;
+
+import io.vertx.core.Vertx;
+
+public class EngineGetClientVersionV1 extends ExecutionEngineJsonRpcMethod {
+  private static final String ENGINE_CLIENT_CODE = "BU";
+  private static final String ENGINE_CLIENT_NAME = "Besu";
+
+  private final String clientVersion;
+  private final String commit;
+
+  public EngineGetClientVersionV1(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final EngineCallListener engineCallListener,
+      final String clientVersion,
+      final String commit) {
+    super(vertx, protocolContext, engineCallListener);
+    this.clientVersion = clientVersion;
+    this.commit = commit;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_CLIENT_VERSION_V1.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
+    return new JsonRpcSuccessResponse(
+        request.getRequest().getId(),
+        new EngineGetClientVersionResultV1(
+            ENGINE_CLIENT_CODE, ENGINE_CLIENT_NAME, clientVersion, commit.substring(0, 8)));
+  }
+}
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetClientVersionResultV1.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetClientVersionResultV1.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+
+public class EngineGetClientVersionResultV1 {
+  private final String code;
+  private final String name;
+  private final String version;
+  private final String commit;
+
+  public EngineGetClientVersionResultV1(
+      final String code, final String name, final String version, final String commit) {
+    this.code = code;
+    this.name = name;
+    this.version = version;
+    this.commit = commit;
+  }
+
+  @JsonGetter(value = "code")
+  public String getCode() {
+    return code;
+  }
+
+  @JsonGetter(value = "name")
+  public String getName() {
+    return name;
+  }
+
+  @JsonGetter(value = "version")
+  public String getVersion() {
+    return version;
+  }
+
+  @JsonGetter(value = "commit")
+  public String getCommit() {
+    return commit;
+  }
+}
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java
@@ -23,6 +23,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineE
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineForkchoiceUpdatedV1;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineForkchoiceUpdatedV2;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineForkchoiceUpdatedV3;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetClientVersionV1;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadBodiesByHashV1;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadBodiesByRangeV1;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadV1;
@@ -57,13 +58,17 @@ public class ExecutionEngineJsonRpcMethods extends ApiGroupJsonRpcMethods {
  private final ProtocolContext protocolContext;
  private final EthPeers ethPeers;
  private final Vertx consensusEngineServer;
+  private final String clientVersion;
+  private final String commit;

  ExecutionEngineJsonRpcMethods(
      final MiningCoordinator miningCoordinator,
      final ProtocolSchedule protocolSchedule,
      final ProtocolContext protocolContext,
      final EthPeers ethPeers,
-      final Vertx consensusEngineServer) {
+      final Vertx consensusEngineServer,
+      final String clientVersion,
+      final String commit) {
    this.mergeCoordinator =
        Optional.ofNullable(miningCoordinator)
            .filter(mc -> mc.isCompatibleWithEngineApi())
@@ -72,6 +77,8 @@ public class ExecutionEngineJsonRpcMethods extends ApiGroupJsonRpcMethods {
    this.protocolContext = protocolContext;
    this.ethPeers = ethPeers;
    this.consensusEngineServer = consensusEngineServer;
+    this.clientVersion = clientVersion;
+    this.commit = commit;
  }

  @Override
@@ -147,7 +154,9 @@ public class ExecutionEngineJsonRpcMethods extends ApiGroupJsonRpcMethods {
              new EngineExchangeCapabilities(
                  consensusEngineServer, protocolContext, engineQosTimer),
              new EnginePreparePayloadDebug(
-                  consensusEngineServer, protocolContext, engineQosTimer, mergeCoordinator.get())));
+                  consensusEngineServer, protocolContext, engineQosTimer, mergeCoordinator.get()),
+              new EngineGetClientVersionV1(
+                  consensusEngineServer, protocolContext, engineQosTimer, clientVersion, commit)));

      if (protocolSchedule.anyMatch(p -> p.spec().getName().equalsIgnoreCase("cancun"))) {
        executionEngineApisSupported.add(
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
@@ -54,7 +54,9 @@ import io.vertx.core.Vertx;
 public class JsonRpcMethodsFactory {

  public Map<String, JsonRpcMethod> methods(
+      final String clientNodeName,
      final String clientVersion,
+      final String commit,
      final BigInteger networkId,
      final GenesisConfigOptions genesisConfigOptions,
      final P2PNetwork p2pNetwork,
@@ -89,7 +91,7 @@ public class JsonRpcMethodsFactory {
      final List<JsonRpcMethods> availableApiGroups =
          List.of(
              new AdminJsonRpcMethods(
-                  clientVersion,
+                  clientNodeName,
                  networkId,
                  genesisConfigOptions,
                  p2pNetwork,
@@ -115,7 +117,9 @@ public class JsonRpcMethodsFactory {
                  protocolSchedule,
                  protocolContext,
                  ethPeers,
-                  consensusEngineServer),
+                  consensusEngineServer,
+                  clientVersion,
+                  commit),
              new EthJsonRpcMethods(
                  blockchainQueries,
                  synchronizer,
@@ -141,7 +145,7 @@ public class JsonRpcMethodsFactory {
                  filterManager),
              new PrivxJsonRpcMethods(
                  blockchainQueries, protocolSchedule, transactionPool, privacyParameters),
-              new Web3JsonRpcMethods(clientVersion),
+              new Web3JsonRpcMethods(clientNodeName),
              new TraceJsonRpcMethods(
                  blockchainQueries, protocolSchedule, protocolContext, apiConfiguration),
              new TxPoolJsonRpcMethods(transactionPool),
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
@@ -75,7 +75,9 @@ public abstract class AbstractJsonRpcHttpServiceTest {

  protected BlockchainSetupUtil blockchainSetupUtil;

-  protected static String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_VERSION = "0.1.0";
+  protected static final String CLIENT_COMMIT = "12345678";
  protected static final BigInteger NETWORK_ID = BigInteger.valueOf(123);
  protected static final Collection<String> JSON_RPC_APIS =
      Arrays.asList(
@@ -168,7 +170,9 @@ public abstract class AbstractJsonRpcHttpServiceTest {

    return new JsonRpcMethodsFactory()
        .methods(
+            CLIENT_NODE_NAME,
            CLIENT_VERSION,
+            CLIENT_COMMIT,
            NETWORK_ID,
            new StubGenesisConfigOptions(),
            peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java
@@ -58,13 +58,13 @@ public class AdminJsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
    final List<EthPeer> peerList = new ArrayList<>();
    final PeerInfo info1 =
        new PeerInfo(
-            4, CLIENT_VERSION, caps, 30302, Bytes.fromHexString(String.format("%0128x", 1)));
+            4, CLIENT_NODE_NAME, caps, 30302, Bytes.fromHexString(String.format("%0128x", 1)));
    final PeerInfo info2 =
        new PeerInfo(
-            4, CLIENT_VERSION, caps, 60302, Bytes.fromHexString(String.format("%0128x", 2)));
+            4, CLIENT_NODE_NAME, caps, 60302, Bytes.fromHexString(String.format("%0128x", 2)));
    final PeerInfo info3 =
        new PeerInfo(
-            4, CLIENT_VERSION, caps, 60303, Bytes.fromHexString(String.format("%0128x", 3)));
+            4, CLIENT_NODE_NAME, caps, 60303, Bytes.fromHexString(String.format("%0128x", 3)));
    final InetSocketAddress addr30301 = new InetSocketAddress("localhost", 30301);
    final InetSocketAddress addr30302 = new InetSocketAddress("localhost", 30302);
    final InetSocketAddress addr60301 = new InetSocketAddress("localhost", 60301);
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
@@ -79,7 +79,9 @@ public class JsonRpcHttpServiceHostAllowlistTest {
  private static OkHttpClient client;
  private static String baseUrl;
  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);

  private final JsonRpcConfiguration jsonRpcConfig = createJsonRpcConfig();
@@ -100,7 +102,9 @@ public class JsonRpcHttpServiceHostAllowlistTest {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                new StubGenesisConfigOptions(),
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
@@ -100,7 +100,9 @@ public class JsonRpcHttpServiceLoginTest {
  protected static OkHttpClient client;
  protected static String baseUrl;
  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_VERSION = "0.1.0";
+  protected static final String CLIENT_COMMIT = "12345678";
  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
  protected static P2PNetwork peerDiscoveryMock;
  protected static BlockchainQueries blockchainQueries;
@@ -131,7 +133,9 @@ public class JsonRpcHttpServiceLoginTest {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                genesisConfigOptions,
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
@@ -94,7 +94,9 @@ public class JsonRpcHttpServiceRpcApisTest {
  private JsonRpcHttpService service;
  private static String baseUrl;
  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger NETWORK_ID = BigInteger.valueOf(123);
  private JsonRpcConfiguration configuration;
  private static final List<String> netServices =
@@ -202,7 +204,9 @@ public class JsonRpcHttpServiceRpcApisTest {
    final Map<String, JsonRpcMethod> rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                NETWORK_ID,
                new StubGenesisConfigOptions(),
                mock(P2PNetwork.class),
@@ -310,7 +314,9 @@ public class JsonRpcHttpServiceRpcApisTest {
    final Map<String, JsonRpcMethod> rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                NETWORK_ID,
                new StubGenesisConfigOptions(),
                p2pNetwork,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java
@@ -202,7 +202,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1127,7 +1127,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1143,7 +1143,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      final JsonObject json = new JsonObject(resp.body().string());
      testHelper.assertValidJsonRpcResult(json, id);
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1175,7 +1175,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, null);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1197,7 +1197,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1218,7 +1218,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1242,7 +1242,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1268,7 +1268,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1289,7 +1289,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      testHelper.assertValidJsonRpcResult(json, id);
      // Check result
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1353,7 +1353,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      final JsonObject json = new JsonObject(resp.body().string());
      testHelper.assertValidJsonRpcResult(json, id);
      final String result = json.getString("result");
-      assertThat(result).isEqualTo(CLIENT_VERSION);
+      assertThat(result).isEqualTo(CLIENT_NODE_NAME);
    }
  }

@@ -1485,7 +1485,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      // Check result web3_clientVersion
      final JsonObject jsonClientVersion = responses.get(clientVersionRequestId);
      testHelper.assertValidJsonRpcResult(jsonClientVersion, clientVersionRequestId);
-      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_VERSION);
+      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_NODE_NAME);

      // Check result unknown method
      final JsonObject jsonError = responses.get(brokenRequestId);
@@ -1540,7 +1540,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      // Check result web3_clientVersion
      final JsonObject jsonClientVersion = responses.get(clientVersionRequestId);
      testHelper.assertValidJsonRpcResult(jsonClientVersion, clientVersionRequestId);
-      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_VERSION);
+      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_NODE_NAME);

      // Check invalid request
      final JsonObject jsonError = responses.get(invalidId);
@@ -1605,7 +1605,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
      // Check result web3_clientVersion
      final JsonObject jsonClientVersion = responses.get(clientVersionRequestId);
      testHelper.assertValidJsonRpcResult(jsonClientVersion, clientVersionRequestId);
-      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_VERSION);
+      assertThat(jsonClientVersion.getString("result")).isEqualTo(CLIENT_NODE_NAME);

      // Check result net_version
      final JsonObject jsonNetVersion = responses.get(netVersionRequestId);
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
@@ -78,7 +78,9 @@ public class JsonRpcHttpServiceTestBase {
  protected static OkHttpClient client;
  protected static String baseUrl;
  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_VERSION = "0.1.0";
+  protected static final String CLIENT_COMMIT = "12345678";
  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
  protected static P2PNetwork peerDiscoveryMock;
  protected static EthPeers ethPeersMock;
@@ -108,7 +110,9 @@ public class JsonRpcHttpServiceTestBase {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                new StubGenesisConfigOptions(),
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
@@ -85,7 +85,9 @@ public class JsonRpcHttpServiceTlsClientAuthTest {
  protected static final Vertx vertx = Vertx.vertx();

  private static final String JSON_HEADER = "application/json; charset=utf-8";
-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);

  private static final NatService natService = new NatService(Optional.empty());
@@ -114,7 +116,9 @@ public class JsonRpcHttpServiceTlsClientAuthTest {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                new StubGenesisConfigOptions(),
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
@@ -75,7 +75,9 @@ class JsonRpcHttpServiceTlsMisconfigurationTest {

  protected static final Vertx vertx = Vertx.vertx();

-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
  private static final NatService natService = new NatService(Optional.empty());
  private final SelfSignedP12Certificate besuCertificate = SelfSignedP12Certificate.create();
@@ -102,7 +104,9 @@ class JsonRpcHttpServiceTlsMisconfigurationTest {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                new StubGenesisConfigOptions(),
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
@@ -81,7 +81,9 @@ public class JsonRpcHttpServiceTlsTest {
  protected static final Vertx vertx = Vertx.vertx();

  private static final String JSON_HEADER = "application/json; charset=utf-8";
-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  private static final String CLIENT_VERSION = "0.1.0";
+  private static final String CLIENT_COMMIT = "12345678";
  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
  private static final NatService natService = new NatService(Optional.empty());
  private JsonRpcHttpService service;
@@ -103,7 +105,9 @@ public class JsonRpcHttpServiceTlsTest {
    rpcMethods =
        new JsonRpcMethodsFactory()
            .methods(
+                CLIENT_NODE_NAME,
                CLIENT_VERSION,
+                CLIENT_COMMIT,
                CHAIN_ID,
                new StubGenesisConfigOptions(),
                peerDiscoveryMock,
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetClientVersionV1Test.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetClientVersionResultV1;
+
+import io.vertx.core.Vertx;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class EngineGetClientVersionV1Test {
+
+  private static final String ENGINE_CLIENT_CODE = "BU";
+  private static final String ENGINE_CLIENT_NAME = "Besu";
+
+  private static final String CLIENT_VERSION = "v25.6.7-dev-abcdef12";
+  private static final String COMMIT = "abcdef12";
+
+  private EngineGetClientVersionV1 getClientVersion;
+
+  @BeforeEach
+  void before() {
+    getClientVersion =
+        new EngineGetClientVersionV1(
+            Mockito.mock(Vertx.class),
+            Mockito.mock(ProtocolContext.class),
+            Mockito.mock(EngineCallListener.class),
+            CLIENT_VERSION,
+            COMMIT);
+  }
+
+  @Test
+  void testGetName() {
+    assertThat(getClientVersion.getName()).isEqualTo("engine_getClientVersionV1");
+  }
+
+  @Test
+  void testSyncResponse() {
+    JsonRpcRequestContext request = new JsonRpcRequestContext(new JsonRpcRequest("v", "m", null));
+    JsonRpcResponse actualResult = getClientVersion.syncResponse(request);
+
+    assertThat(actualResult).isInstanceOf(JsonRpcSuccessResponse.class);
+    JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) actualResult;
+    assertThat(successResponse.getResult()).isInstanceOf(EngineGetClientVersionResultV1.class);
+    EngineGetClientVersionResultV1 actualEngineGetClientVersionResultV1 =
+        (EngineGetClientVersionResultV1) successResponse.getResult();
+    assertThat(actualEngineGetClientVersionResultV1.getName()).isEqualTo(ENGINE_CLIENT_NAME);
+    assertThat(actualEngineGetClientVersionResultV1.getCode()).isEqualTo(ENGINE_CLIENT_CODE);
+    assertThat(actualEngineGetClientVersionResultV1.getVersion()).isEqualTo(CLIENT_VERSION);
+    assertThat(actualEngineGetClientVersionResultV1.getCommit()).isEqualTo(COMMIT);
+  }
+}
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
@@ -115,7 +115,9 @@ public class WebSocketServiceLoginTest {
  protected static OkHttpClient client;
  protected static String baseUrl;
  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_NODE_NAME = "TestClientVersion/0.1.0";
+  protected static final String CLIENT_VERSION = "0.1.0";
+  protected static final String CLIENT_COMMIT = "12345678";
  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
  protected static P2PNetwork peerDiscoveryMock;
  protected static BlockchainQueries blockchainQueries;
@@ -167,7 +169,9 @@ public class WebSocketServiceLoginTest {
        spy(
            new JsonRpcMethodsFactory()
                .methods(
+                    CLIENT_NODE_NAME,
                    CLIENT_VERSION,
+                    CLIENT_COMMIT,
                    CHAIN_ID,
                    genesisConfigOptions,
                    peerDiscoveryMock,
--- a/ethereum/blockcreation/build.gradle
+++ b/ethereum/blockcreation/build.gradle
@@ -7,7 +7,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/core/build.gradle
+++ b/ethereum/core/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/eth/build.gradle
+++ b/ethereum/eth/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/ethstats/build.gradle
+++ b/ethereum/ethstats/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/evmtool/build.gradle
+++ b/ethereum/evmtool/build.gradle
@@ -29,7 +29,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/mock-p2p/build.gradle
+++ b/ethereum/mock-p2p/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/p2p/build.gradle
+++ b/ethereum/p2p/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/permissioning/build.gradle
+++ b/ethereum/permissioning/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/retesteth/build.gradle
+++ b/ethereum/retesteth/build.gradle
@@ -20,7 +20,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/rlp/build.gradle
+++ b/ethereum/rlp/build.gradle
@@ -23,6 +23,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.internal.rlp'
      )
  }
--- a/ethereum/stratum/build.gradle
+++ b/ethereum/stratum/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/trie/build.gradle
+++ b/ethereum/trie/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/ethereum/verkletrie/build.gradle
+++ b/ethereum/verkletrie/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/evm/build.gradle
+++ b/evm/build.gradle
@@ -25,6 +25,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.evm'
      )
  }
--- a/metrics/core/build.gradle
+++ b/metrics/core/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/metrics/rocksdb/build.gradle
+++ b/metrics/rocksdb/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/nat/build.gradle
+++ b/nat/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/pki/build.gradle
+++ b/pki/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/plugin-api/build.gradle
+++ b/plugin-api/build.gradle
@@ -22,6 +22,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.plugin.api'
      )
  }
--- a/plugins/rocksdb/build.gradle
+++ b/plugins/rocksdb/build.gradle
@@ -20,7 +20,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/services/kvstore/build.gradle
+++ b/services/kvstore/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/services/pipeline/build.gradle
+++ b/services/pipeline/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/services/tasks/build.gradle
+++ b/services/tasks/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/testfuzz/build.gradle
+++ b/testfuzz/build.gradle
@@ -24,7 +24,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@@ -22,7 +22,8 @@ jar {
      'Specification-Title': archiveBaseName,
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash
      )
  }
 }
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -23,6 +23,7 @@ jar {
      'Specification-Version': project.version,
      'Implementation-Title': archiveBaseName,
      'Implementation-Version': calculateVersion(),
+      'Commit-Hash': getGitCommitDetails(40).hash,
      'Automatic-Module-Name': 'org.hyperledger.besu.internal.util'
      )
  }