tracing

Cargo.toml

@@ -8,17 +8,21 @@ members  = [ "bin/*", "crates/*", "nearx" ]
 resolver = "2"
 
 [workspace.dependencies]
-anyhow            = "1.0"
-async-trait       = "0.1"
-config            = "0.13"
-derive_more       = "0.99"
-either            = { version = "1.9", features = [ "serde" ] }
-itertools         = "0.12"
-log               = "0.4"
-pretty_assertions = "1.4"
-pretty_env_logger = "0.5"
-sled              = "0.34" # TODO: maybe heavy, use heed instead
-thiserror         = "1.0"
+anyhow             = "1.0"
+async-trait        = "0.1"
+config             = "0.13"
+derive_more        = "0.99"
+dotenv             = "0.15"
+either             = { version = "1.9", features = [ "serde" ] }
+figment            = { version = "0.10", features = [ "toml", "env" ] }
+itertools          = "0.12"
+log                = "0.4"
+pretty_assertions  = "1.4"
+pretty_env_logger  = "0.5"
+sled               = "0.34" # TODO: maybe heavy, use heed instead
+thiserror          = "1.0"
+tracing            = "0.1"
+tracing-subscriber = "0.3"
 
 # Async
 axum    = "*"

Dockerfile.operator

@@ -32,8 +32,9 @@ RUN cp target/release/nearx-operator /near/near-light-client
 FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y openssl libssl-dev pkg-config ca-certificates && rm -rf /var/lib/apt/lists/*
 COPY --from=build /near/target/release/nearx-operator /usr/local/bin
-COPY --from=build /near/default.toml /var/near-light-client/default.toml
+COPY --from=build /near/config.toml /var/near-light-client/config.toml
 
-ENV NEAR_LIGHT_CLIENT_DIR=/var/near-light-client/
+ENV NEAR_LIGHT_CLIENT_DIR=/var/near-light-client
+ENV NEAR_LIGHT_CLIENT_CONFIG_FILE=/var/near-light-client/config.toml
 
 ENTRYPOINT ["/usr/local/bin/nearx-operator"]

Makefile

@@ -1,11 +1,12 @@
 .EXPORT_ALL_VARIABLES:
 -include .env
 
-TAG_PREFIX?=near
-IMAGE_TAG?=0.0.3
+TAG_PREFIX?=us-docker.pkg.dev/pagoda-solutions-dev/rollup-data-availability/
+IMAGE_TAG?=dev
 
 docker:
-	DOCKER_BUILDKIT=1 docker build --progress=plain -t $(TAG_PREFIX)/light-client:$(IMAGE_TAG) .
+	DOCKER_BUILDKIT=1 docker build --progress=plain -t $(TAG_PREFIX)/light-client:$(IMAGE_TAG) -f Dockerfile.offchain .
+	docker build -t $(TAG_PREFIX)/nearx-operator:$(IMAGE_TAG) -f Dockerfile.operator .
 
 test:
 	cargo test --workspace

bin/operator/Cargo.toml

@@ -7,26 +7,26 @@ version.workspace = true
 [lib]
 
 [dependencies]
-actix                       = { version = "*", features = [ "macros" ] }
-anyhow.workspace            = true
-config.workspace            = true
-futures.workspace           = true
-hashbrown                   = { version = "*", features = [ "serde" ] }
-hex.workspace               = true
-http-cache-reqwest          = "0.13.0"
-jsonrpsee                   = { version = "0.22.1", features = [ "server", "macros" ] }
-jsonrpsee-core              = "0.22.1"
-log.workspace               = true
-pretty_env_logger.workspace = true
-priority-queue              = "*"
-reqwest-middleware          = "*"
-reqwest-retry               = "*"
-reqwest.workspace           = true
-serde.workspace             = true
-serde_json.workspace        = true
-thiserror.workspace         = true
-tokio.workspace             = true
-uuid                        = { version = "1.4.1", features = [ "serde", "v4" ] }
+actix                        = { version = "*", features = [ "macros" ] }
+anyhow.workspace             = true
+figment.workspace            = true
+futures.workspace            = true
+hashbrown                    = { version = "*", features = [ "serde" ] }
+hex.workspace                = true
+http-cache-reqwest           = "0.13.0"
+jsonrpsee                    = { version = "0.22.1", features = [ "server", "macros" ] }
+jsonrpsee-core               = "0.22.1"
+priority-queue               = "*"
+reqwest-middleware           = "*"
+reqwest-retry                = "*"
+reqwest.workspace            = true
+serde.workspace              = true
+serde_json.workspace         = true
+thiserror.workspace          = true
+tokio.workspace              = true
+tracing-subscriber.workspace = true
+tracing.workspace            = true
+uuid                         = { version = "1.4.1", features = [ "serde", "v4" ] }
 
 alloy = { git = "https://github.com/alloy-rs/alloy.git", features = [ "contract", "provider-http" ] }