fix:cleancode

Signed-off-by: Chen Kai <[email protected]>

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
           add: '*.svg'
 
       - name: Upload JaCoCo coverage report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
           path: build/reports/jacoco/

.github/workflows/pull_request.yml

@@ -32,7 +32,7 @@ jobs:
           echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
 
       - name: Upload JaCoCo coverage report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
           path: build/reports/jacoco/

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
           ./gradlew buildJarForDocker
 
       - name: 📤 Upload ${{ matrix.os }} native image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: hildr-jar
           path: |

src/main/java/io/optimism/cli/Cli.java

@@ -7,8 +7,8 @@
 import io.optimism.exceptions.HildrServiceExecutionException;
 import io.optimism.runner.Runner;
 import io.optimism.telemetry.InnerMetrics;
-import io.optimism.telemetry.Logging;
 import io.optimism.telemetry.TracerTaskWrapper;
+import io.optimism.types.enums.Logging;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

src/main/java/io/optimism/derive/Pipeline.java

@@ -6,7 +6,7 @@
 import io.optimism.derive.stages.BatcherTransactions.BatcherTransactionMessage;
 import io.optimism.derive.stages.Batches;
 import io.optimism.derive.stages.Channels;
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;

src/main/java/io/optimism/derive/State.java

@@ -3,9 +3,9 @@
 import io.optimism.config.Config;
 import io.optimism.driver.HeadInfo;
 import io.optimism.driver.L1AttributesDepositedTxNotFoundException;
-import io.optimism.l1.L1Info;
 import io.optimism.types.BlockInfo;
 import io.optimism.types.Epoch;
+import io.optimism.types.L1Info;
 import java.math.BigInteger;
 import java.util.Map.Entry;
 import java.util.TreeMap;

src/main/java/io/optimism/derive/stages/Attributes.java

@@ -5,13 +5,13 @@
 import io.optimism.derive.ForkUpgradeTransactions;
 import io.optimism.derive.PurgeableIterator;
 import io.optimism.derive.State;
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
 import io.optimism.exceptions.BlockNotIncludedException;
 import io.optimism.exceptions.L1InfoNotFoundException;
-import io.optimism.l1.L1Info;
 import io.optimism.types.Batch;
 import io.optimism.types.BlockInfo;
 import io.optimism.types.Epoch;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
+import io.optimism.types.L1Info;
 import io.optimism.types.SingularBatch;
 import io.optimism.utilities.gas.GasCalculator;
 import java.math.BigInteger;

src/main/java/io/optimism/derive/stages/Batches.java

@@ -6,11 +6,11 @@
 import io.optimism.derive.State;
 import io.optimism.derive.stages.Channels.Channel;
 import io.optimism.exceptions.DecompressException;
-import io.optimism.l1.L1Info;
 import io.optimism.types.Batch;
 import io.optimism.types.BlockInfo;
 import io.optimism.types.Epoch;
 import io.optimism.types.IBatch;
+import io.optimism.types.L1Info;
 import io.optimism.types.SingularBatch;
 import io.optimism.types.SpanBatch;
 import io.optimism.types.SpanBatchElement;

src/main/java/io/optimism/driver/Driver.java

@@ -11,10 +11,7 @@
 import io.optimism.derive.Pipeline;
 import io.optimism.engine.Engine;
 import io.optimism.engine.EngineApi;
-import io.optimism.engine.ExecutionPayload;
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
 import io.optimism.exceptions.HildrServiceExecutionException;
-import io.optimism.l1.BlockUpdate;
 import io.optimism.l1.ChainWatcher;
 import io.optimism.network.OpStackNetwork;
 import io.optimism.rpc.RpcMethod;
@@ -25,8 +22,11 @@
 import io.optimism.telemetry.TracerTaskWrapper;
 import io.optimism.types.BlockId;
 import io.optimism.types.BlockInfo;
+import io.optimism.types.BlockUpdate;
 import io.optimism.types.DepositTransaction;
 import io.optimism.types.Epoch;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
 import io.optimism.types.Genesis;
 import io.optimism.types.L1BlockInfo;
 import io.optimism.types.L2BlockRef;

src/main/java/io/optimism/driver/EngineDriver.java

@@ -3,19 +3,19 @@
 import io.optimism.config.Config;
 import io.optimism.engine.Engine;
 import io.optimism.engine.EngineApi;
-import io.optimism.engine.ExecutionPayload;
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
-import io.optimism.engine.ExecutionPayload.PayloadStatus;
-import io.optimism.engine.ExecutionPayload.Status;
-import io.optimism.engine.ForkChoiceUpdate;
-import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
 import io.optimism.engine.OpEthExecutionPayload;
 import io.optimism.engine.OpEthForkChoiceUpdate;
 import io.optimism.engine.OpEthPayloadStatus;
-import io.optimism.network.ExecutionPayloadEnvelop;
 import io.optimism.telemetry.TracerTaskWrapper;
 import io.optimism.types.BlockInfo;
 import io.optimism.types.Epoch;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
+import io.optimism.types.ExecutionPayload.PayloadStatus;
+import io.optimism.types.ExecutionPayload.Status;
+import io.optimism.types.ExecutionPayloadEnvelop;
+import io.optimism.types.ForkChoiceUpdate;
+import io.optimism.types.ForkChoiceUpdate.ForkchoiceState;
 import io.optimism.types.L2BlockRef;
 import io.optimism.types.PayloadInfo;
 import io.optimism.types.enums.BlockInsertion;

src/main/java/io/optimism/driver/ISequencer.java

@@ -1,6 +1,6 @@
 package io.optimism.driver;
 
-import io.optimism.network.ExecutionPayloadEnvelop;
+import io.optimism.types.ExecutionPayloadEnvelop;
 import io.optimism.types.L2BlockRef;
 
 /**

src/main/java/io/optimism/driver/Sequencer.java

@@ -5,7 +5,7 @@
 import io.optimism.exceptions.ResetException;
 import io.optimism.exceptions.SequencerException;
 import io.optimism.exceptions.TemporaryException;
-import io.optimism.network.ExecutionPayloadEnvelop;
+import io.optimism.types.ExecutionPayloadEnvelop;
 import io.optimism.types.L2BlockRef;
 import io.optimism.types.enums.BlockInsertion;
 import java.time.Duration;

src/main/java/io/optimism/engine/Engine.java

@@ -1,7 +1,8 @@
 package io.optimism.engine;
 
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
-import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
+import io.optimism.types.ForkChoiceUpdate.ForkchoiceState;
 import java.io.IOException;
 import java.math.BigInteger;
 

src/main/java/io/optimism/engine/EngineApi.java

@@ -4,9 +4,10 @@
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 import io.optimism.config.Config;
-import io.optimism.engine.ExecutionPayload.PayloadAttributes;
-import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
 import io.optimism.rpc.Web3jProvider;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.ExecutionPayload.PayloadAttributes;
+import io.optimism.types.ForkChoiceUpdate.ForkchoiceState;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.security.Key;

src/main/java/io/optimism/engine/OpEthExecutionPayload.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.optimism.types.ExecutionPayload;
 import java.io.IOException;
 import java.util.Objects;
 import org.web3j.protocol.ObjectMapperFactory;

src/main/java/io/optimism/engine/OpEthForkChoiceUpdate.java

@@ -1,6 +1,7 @@
 package io.optimism.engine;
 
-import io.optimism.engine.ForkChoiceUpdate.ForkChoiceUpdateRes;
+import io.optimism.types.ForkChoiceUpdate;
+import io.optimism.types.ForkChoiceUpdate.ForkChoiceUpdateRes;
 import org.web3j.protocol.core.Response;
 
 /** The type Op eth fork choice update. */

src/main/java/io/optimism/engine/OpEthPayloadStatus.java

@@ -1,6 +1,6 @@
 package io.optimism.engine;
 
-import io.optimism.engine.ExecutionPayload.PayloadStatus;
+import io.optimism.types.ExecutionPayload.PayloadStatus;
 import org.web3j.protocol.core.Response;
 
 /** The type OpEthPayloadStatus. */

src/main/java/io/optimism/l1/BlockIsPreLondonException.java → src/main/java/io/optimism/exceptions/BlockIsPreLondonException.java

@@ -1,4 +1,4 @@
-package io.optimism.l1;
+package io.optimism.exceptions;
 
 /**
  * The type BlockIsPreLondonException.

src/main/java/io/optimism/network/DecodingException.java → src/main/java/io/optimism/exceptions/DecodingException.java

@@ -1,4 +1,4 @@
-package io.optimism.network;
+package io.optimism.exceptions;
 
 /**
  * The type DecodingException.

src/main/java/io/optimism/l1/DepositsNotFoundException.java → src/main/java/io/optimism/exceptions/DepositsNotFoundException.java

@@ -1,4 +1,4 @@
-package io.optimism.l1;
+package io.optimism.exceptions;
 
 /**
  * The type DepositsNotFoundException.

src/main/java/io/optimism/l1/InvalidSystemConfigUpdateException.java → src/main/java/io/optimism/exceptions/InvalidSystemConfigUpdateException.java

@@ -1,4 +1,4 @@
-package io.optimism.l1;
+package io.optimism.exceptions;
 
 /**
  * The type InvalidSystemConfigUpdateException.

src/main/java/io/optimism/telemetry/MetricsServerException.java → src/main/java/io/optimism/exceptions/MetricsServerException.java

@@ -1,4 +1,4 @@
-package io.optimism.telemetry;
+package io.optimism.exceptions;
 
 /**
  * MetricsServerException class.

src/main/java/io/optimism/rpc/execution/Web3jCallException.java → src/main/java/io/optimism/exceptions/Web3jCallException.java

@@ -1,4 +1,4 @@
-package io.optimism.rpc.execution;
+package io.optimism.exceptions;
 
 /**
  * Web3jCallException class. Throws it when the call of web3j request task failed.

src/main/java/io/optimism/l1/ChainWatcher.java

@@ -2,6 +2,7 @@
 
 import io.optimism.config.Config;
 import io.optimism.types.BlockInfo;
+import io.optimism.types.BlockUpdate;
 import java.math.BigInteger;
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.MpscGrowableArrayQueue;

src/main/java/io/optimism/l1/InnerWatcher.java

@@ -9,14 +9,18 @@
 import io.optimism.derive.stages.Attributes.UserDeposited;
 import io.optimism.driver.L1AttributesDepositedTxNotFoundException;
 import io.optimism.exceptions.BlockNotIncludedException;
+import io.optimism.exceptions.DepositsNotFoundException;
 import io.optimism.exceptions.HildrServiceExecutionException;
-import io.optimism.l1.BlockUpdate.FinalityUpdate;
 import io.optimism.rpc.Web3jProvider;
-import io.optimism.telemetry.Logging;
 import io.optimism.telemetry.TracerTaskWrapper;
 import io.optimism.types.BeaconSignedBlockHeader;
 import io.optimism.types.BlobSidecar;
 import io.optimism.types.BlockInfo;
+import io.optimism.types.BlockUpdate;
+import io.optimism.types.BlockUpdate.FinalityUpdate;
+import io.optimism.types.L1Info;
+import io.optimism.types.SystemConfigUpdate;
+import io.optimism.types.enums.Logging;
 import io.optimism.utilities.blob.BlobCodec;
 import io.reactivex.disposables.Disposable;
 import java.math.BigInteger;

src/main/java/io/optimism/network/AbstractTopicHandler.java

@@ -6,7 +6,11 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import io.libp2p.core.pubsub.ValidationResult;
-import io.optimism.engine.ExecutionPayload;
+import io.optimism.exceptions.DecodingException;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.ExecutionPayloadEnvelop;
+import io.optimism.types.ExecutionPayloadSSZ;
+import io.optimism.types.enums.BlockVersion;
 import java.math.BigInteger;
 import java.security.SignatureException;
 import java.time.Instant;

src/main/java/io/optimism/network/BlockV1TopicHandler.java

@@ -1,6 +1,7 @@
 package io.optimism.network;
 
-import io.optimism.engine.ExecutionPayload;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.enums.BlockVersion;
 import org.apache.tuweni.units.bigints.UInt64;
 import org.jctools.queues.MessagePassingQueue;
 import tech.pegasys.teku.infrastructure.async.AsyncRunner;

src/main/java/io/optimism/network/BlockV2TopicHandler.java

@@ -1,6 +1,7 @@
 package io.optimism.network;
 
-import io.optimism.engine.ExecutionPayload;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.enums.BlockVersion;
 import org.apache.tuweni.units.bigints.UInt64;
 import org.jctools.queues.MessagePassingQueue;
 import tech.pegasys.teku.infrastructure.async.AsyncRunner;

src/main/java/io/optimism/network/BlockV3TopicHandler.java

@@ -1,6 +1,7 @@
 package io.optimism.network;
 
-import io.optimism.engine.ExecutionPayload;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.enums.BlockVersion;
 import org.apache.tuweni.units.bigints.UInt64;
 import org.jctools.queues.MessagePassingQueue;
 import tech.pegasys.teku.infrastructure.async.AsyncRunner;

src/main/java/io/optimism/network/OpStackNetwork.java

@@ -2,7 +2,8 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.optimism.config.Config;
-import io.optimism.engine.ExecutionPayload;
+import io.optimism.types.ExecutionPayload;
+import io.optimism.types.enums.HildrNodeMetricsCategory;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;

src/main/java/io/optimism/rpc/RpcServer.java

@@ -11,7 +11,7 @@
 import io.optimism.rpc.methods.JsonRpcMethod;
 import io.optimism.rpc.methods.JsonRpcMethodAdapter;
 import io.optimism.rpc.methods.JsonRpcMethodsFactory;
-import io.optimism.telemetry.Logging;
+import io.optimism.types.enums.Logging;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;

src/main/java/io/optimism/rpc/Web3jUtil.java

@@ -1,6 +1,6 @@
 package io.optimism.rpc;
 
-import io.optimism.rpc.execution.Web3jCallException;
+import io.optimism.exceptions.Web3jCallException;
 import io.optimism.telemetry.TracerTaskWrapper;
 import java.math.BigInteger;
 import java.util.List;

src/main/java/io/optimism/rpc/execution/BaseJsonRpcProcessor.java

@@ -1,10 +1,10 @@
 package io.optimism.rpc.execution;
 
 import io.optimism.rpc.internal.JsonRpcRequestContext;
-import io.optimism.rpc.internal.response.JsonRpcError;
 import io.optimism.rpc.internal.response.JsonRpcErrorResponse;
 import io.optimism.rpc.internal.response.JsonRpcResponse;
 import io.optimism.rpc.methods.JsonRpcMethod;
+import io.optimism.types.enums.JsonRpcError;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import org.slf4j.Logger;

src/main/java/io/optimism/rpc/execution/JsonRpcExecutor.java

@@ -1,16 +1,16 @@
 package io.optimism.rpc.execution;
 
-import static io.optimism.rpc.internal.response.JsonRpcError.INVALID_REQUEST;
+import static io.optimism.types.enums.JsonRpcError.INVALID_REQUEST;
 
 import io.optimism.rpc.RpcMethod;
 import io.optimism.rpc.internal.JsonRpcRequest;
 import io.optimism.rpc.internal.JsonRpcRequestContext;
 import io.optimism.rpc.internal.JsonRpcRequestId;
-import io.optimism.rpc.internal.response.JsonRpcError;
 import io.optimism.rpc.internal.response.JsonRpcErrorResponse;
 import io.optimism.rpc.internal.response.JsonRpcNoResponse;
 import io.optimism.rpc.internal.response.JsonRpcResponse;
 import io.optimism.rpc.methods.JsonRpcMethod;
+import io.optimism.types.enums.JsonRpcError;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import java.util.Map;

src/main/java/io/optimism/rpc/execution/LoggedJsonRpcProcessor.java

@@ -3,8 +3,8 @@
 import io.optimism.rpc.internal.JsonRpcRequestContext;
 import io.optimism.rpc.internal.response.JsonRpcErrorResponse;
 import io.optimism.rpc.internal.response.JsonRpcResponse;
-import io.optimism.rpc.internal.response.JsonRpcResponseType;
 import io.optimism.rpc.methods.JsonRpcMethod;
+import io.optimism.types.enums.JsonRpcResponseType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/optimism/rpc/handler/JsonRpcExecutorHandler.java

@@ -8,11 +8,11 @@
 import io.optimism.rpc.execution.JsonRpcProcessor;
 import io.optimism.rpc.internal.JsonRpcRequest;
 import io.optimism.rpc.internal.JsonRpcRequestContext;
-import io.optimism.rpc.internal.response.JsonRpcError;
 import io.optimism.rpc.internal.response.JsonRpcErrorResponse;
 import io.optimism.rpc.internal.response.JsonRpcResponse;
-import io.optimism.rpc.internal.response.JsonRpcResponseType;
 import io.optimism.rpc.methods.JsonRpcMethod;
+import io.optimism.types.enums.JsonRpcError;
+import io.optimism.types.enums.JsonRpcResponseType;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.core.json.Json;

src/main/java/io/optimism/rpc/handler/JsonRpcParseHandler.java

@@ -1,8 +1,8 @@
 package io.optimism.rpc.handler;
 
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.optimism.rpc.internal.response.JsonRpcError;
 import io.optimism.rpc.internal.response.JsonRpcErrorResponse;
+import io.optimism.types.enums.JsonRpcError;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.core.json.DecodeException;