Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add a dependency of the hildr-utilities project to the hildr-node. #35

Merged
merged 1 commit into from
Aug 4, 2023
Merged

add a dependency of the hildr-utilities project to the hildr-node. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hildr-node/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ tasks.withType(JavaExec).configureEach {
}

dependencies {
implementation project(':hildr-utilities')
// This dependency is used by the application.
implementation 'com.google.guava:guava:31.1-jre'
implementation 'com.github.rholder:guava-retrying:2.0.0'
Expand Down Expand Up @@ -377,6 +378,7 @@ javadoc {
}

jar {
dependsOn(configurations.runtimeClasspath)
manifest {
attributes "Main-Class": "io.optimism.Hildr"
}
Expand Down
2 changes: 2 additions & 0 deletions hildr-node/src/main/java/io/optimism/cli/Cli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.optimism.runner.Runner;
import io.optimism.telemetry.InnerMetrics;
import io.optimism.telemetry.Logging;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.nio.file.Files;
import java.nio.file.Paths;
import org.slf4j.Logger;
Expand Down Expand Up @@ -95,6 +96,7 @@ public Cli() {}

@Override
public void run() {
TracerTaskWrapper.setTracerSupplier(Logging.INSTANCE::getTracer);
InnerMetrics.start(9200);
Signal.handle(new Signal("INT"), sig -> System.exit(0));
Signal.handle(new Signal("TERM"), sig -> System.exit(0));
Expand Down
2 changes: 1 addition & 1 deletion hildr-node/src/main/java/io/optimism/driver/Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import io.optimism.l1.ChainWatcher;
import io.optimism.rpc.RpcServer;
import io.optimism.telemetry.InnerMetrics;
import io.optimism.telemetry.TracerTaskWrapper;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.math.BigInteger;
import java.time.Duration;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion hildr-node/src/main/java/io/optimism/driver/EngineDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import io.optimism.engine.OpEthExecutionPayload;
import io.optimism.engine.OpEthForkChoiceUpdate;
import io.optimism.engine.OpEthPayloadStatus;
import io.optimism.telemetry.TracerTaskWrapper;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.math.BigInteger;
import java.util.List;
import java.util.concurrent.ExecutionException;
Expand Down
2 changes: 1 addition & 1 deletion hildr-node/src/main/java/io/optimism/l1/InnerWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import io.optimism.derive.stages.Attributes.UserDeposited;
import io.optimism.driver.L1AttributesDepositedTxNotFoundException;
import io.optimism.l1.BlockUpdate.FinalityUpdate;
import io.optimism.rpc.provider.Web3jProvider;
import io.optimism.telemetry.Logging;
import io.optimism.utilities.rpc.Web3jProvider;
import java.math.BigInteger;
import java.time.Duration;
import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions hildr-node/src/main/java/io/optimism/rpc/methods/OutputAtBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import io.optimism.rpc.internal.response.JsonRpcSuccessResponse;
import io.optimism.rpc.internal.result.EthGetProof;
import io.optimism.rpc.internal.result.OutputRootResult;
import io.optimism.rpc.provider.Web3jProvider;
import io.optimism.telemetry.TracerTaskWrapper;
import io.optimism.utilities.rpc.Web3jProvider;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Collections;
Expand Down
133 changes: 0 additions & 133 deletions hildr-node/src/main/java/io/optimism/rpc/provider/RetryRateLimitInterceptor.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions hildr-node/src/main/java/io/optimism/rpc/provider/Web3jProvider.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hildr-node/src/main/java/io/optimism/runner/Runner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import io.optimism.engine.ForkChoiceUpdate.ForkchoiceState;
import io.optimism.engine.OpEthForkChoiceUpdate;
import io.optimism.engine.OpEthPayloadStatus;
import io.optimism.telemetry.TracerTaskWrapper;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.math.BigInteger;
import java.time.Duration;
import java.util.Arrays;
Expand Down
52 changes: 0 additions & 52 deletions hildr-node/src/main/java/io/optimism/telemetry/TracerTaskWrapper.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hildr-node/src/test/java/io/optimism/rpc/RpcServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import io.optimism.rpc.internal.JsonRpcRequest;
import io.optimism.rpc.internal.JsonRpcRequestId;
import io.optimism.rpc.internal.result.OutputRootResult;
import io.optimism.telemetry.TracerTaskWrapper;
import io.optimism.utilities.telemetry.TracerTaskWrapper;
import java.time.Duration;
import java.util.Map;
import java.util.concurrent.Future;
Expand Down
Loading