removes kzg setup configurability, adjusts dependencies

Signed-off-by: Justin Florentine <justin+github@florentine.us>

besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EvmOptions.java

@@ -18,10 +18,8 @@
 import org.hyperledger.besu.cli.options.CLIOptions;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 
 import picocli.CommandLine;
 
@@ -31,8 +29,6 @@ public class EvmOptions implements CLIOptions<EvmConfiguration> {
   /** The constant JUMPDEST_CACHE_WEIGHT. */
   public static final String JUMPDEST_CACHE_WEIGHT = "--Xevm-jumpdest-cache-weight-kb";
 
-  public static final String KZG_TRUSTED_SETUP_FILE_PATH = "--evm-kzg-trusted-setup-path";
-
   /**
    * Create evm options.
    *
@@ -55,21 +51,9 @@ public static EvmOptions create() {
   private Long jumpDestCacheWeightKilobytes =
       32_000L; // 10k contracts, (25k max contract size / 8 bit) + 32byte hash
 
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
-  @CommandLine.Option(
-      names = {KZG_TRUSTED_SETUP_FILE_PATH},
-      description =
-          "absolute file path on the host system which points to the trusted KZG setup file to use",
-      arity = "1")
-  private String kzgTrustedSetupFilePath = null;
-
   @Override
   public EvmConfiguration toDomainObject() {
-    return new EvmConfiguration(
-        jumpDestCacheWeightKilobytes,
-        kzgTrustedSetupFilePath != null
-            ? Optional.ofNullable(Path.of(kzgTrustedSetupFilePath))
-            : Optional.empty());
+    return new EvmConfiguration(jumpDestCacheWeightKilobytes);
   }
 
   @Override

besu/src/test/resources/everything_config.toml

@@ -214,4 +214,3 @@ Xp2p-tls-crl-file="none.file"
 
 #contracts
 Xevm-jumpdest-cache-weight-kb=32000
-evm-kzg-trusted-setup-path="/tmp/trusted_setup.txt"

build.gradle

@@ -109,7 +109,7 @@ allprojects {
     }
     maven {
       url 'https://artifacts.consensys.net/public/maven/maven/'
-      content { includeGroupByRegex('tech\\.pegasys.*') }
+      content { includeGroupByRegex('tech\\.pegasys(\\..*)?') }
     }
     maven {
       url 'https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/'

ethereum/core/build.gradle

@@ -15,10 +15,6 @@
 
 apply plugin: 'java-library'
 
-repositories {
-  maven { url "https://artifacts.consensys.net/public/maven/maven/" }
-}
-
 jar {
   archiveBaseName = 'besu-core'
   manifest {
@@ -58,7 +54,6 @@ dependencies {
   implementation 'org.apache.tuweni:tuweni-concurrent'
   implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.apache.tuweni:tuweni-rlp'
-  implementation 'tech.pegasys:jc-kzg-4844:0.1.0'
   implementation 'org.hyperledger.besu:bls12-381'
   implementation 'org.immutables:value-annotations'
 

evm/build.gradle

@@ -30,9 +30,6 @@ jar {
   }
 }
 
-repositories {
-  maven { url "https://artifacts.consensys.net/public/maven/maven/" }
-}
 dependencies {
   api 'org.slf4j:slf4j-api'
 
@@ -46,10 +43,9 @@ dependencies {
   implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.hyperledger.besu:arithmetic'
   implementation 'org.hyperledger.besu:bls12-381'
-  implementation 'tech.pegasys:jc-kzg-4844:0.1.0'
   implementation 'net.java.dev.jna:jna'
   implementation 'com.github.ben-manes.caffeine:caffeine'
-
+  implementation 'tech.pegasys:jc-kzg-4844'
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'info.picocli:picocli'
   testImplementation 'junit:junit'

evm/src/main/java/org/hyperledger/besu/evm/internal/EvmConfiguration.java

@@ -15,19 +15,12 @@
 
 package org.hyperledger.besu.evm.internal;
 
-import java.nio.file.Path;
-import java.util.Optional;
-
 public class EvmConfiguration {
-  public static final EvmConfiguration DEFAULT = new EvmConfiguration(32_000L, Optional.empty());
+  public static final EvmConfiguration DEFAULT = new EvmConfiguration(32_000L);
   private final long jumpDestCacheWeightKB;
 
-  private final Optional<Path> kzgTrustedSetupPath;
-
-  public EvmConfiguration(
-      final long jumpDestCacheWeightKB, final Optional<Path> pathToKZGTrustedSetup) {
+  public EvmConfiguration(final long jumpDestCacheWeightKB) {
     this.jumpDestCacheWeightKB = jumpDestCacheWeightKB;
-    this.kzgTrustedSetupPath = pathToKZGTrustedSetup;
   }
 
   /**
@@ -38,8 +31,4 @@ public EvmConfiguration(
   public long getJumpDestCacheWeightBytes() {
     return jumpDestCacheWeightKB * 1024L;
   }
-
-  public Optional<Path> getKzgTrustedSetupPath() {
-    return this.kzgTrustedSetupPath;
-  }
 }