Implement feature to use pre-built docker ELF

.dockerignore

@@ -3,5 +3,7 @@ target/
 .env
 
 contracts/cache
-contracts/out
 dockerfiles
+
+# Docker build ignored, to allow overriding the dockerized service with the deterministic build.
+!target/riscv-guest/riscv32im-risc0-zkvm-elf/docker/light_client_guest/light-client-guest

cli/Cargo.toml

@@ -24,3 +24,6 @@ reqwest = "0.12.4"
 serde = { workspace = true }
 serde_json = "1.0"
 serde_with = { version = "3.8", features = ["base64"] }
+
+[features]
+prebuilt-docker = ["blobstream0-core/prebuilt-docker"]

contracts/src/ImageID.sol

@@ -20,5 +20,5 @@ pragma solidity ^0.8.20;
 
 library ImageID {
     bytes32 public constant LIGHT_CLIENT_GUEST_ID =
-        bytes32(0x4383189e399cb4bb64bc8b77fbaefcfe4c3c6472867bdd61de5eb1d4334a34c6);
+        bytes32(0x3229c3708db83fd93c3f28275361870e40d75740c5c09498196474da8fc65f8e);
 }

core/Cargo.toml

@@ -18,3 +18,6 @@ tendermint-proto = { workspace = true }
 tendermint-rpc = { workspace = true, features = ["http-client"] }
 tokio = { version = "1.38.0", features = ["rt", "macros", "fs"] }
 tracing = "0.1.40"
+
+[features]
+prebuilt-docker = ["light-client-guest/prebuilt-docker"]

core/src/lib.rs

@@ -20,7 +20,7 @@ use blobstream0_primitives::{
     IBlobstream::IBlobstreamInstance,
     LightBlockProveData, RangeCommitment,
 };
-use light_client_guest::LIGHT_CLIENT_GUEST_ELF;
+// use light_client_guest::LIGHT_CLIENT_GUEST_ELF;
 use risc0_ethereum_contracts::groth16;
 use risc0_zkvm::{default_prover, is_dev_mode, sha::Digestible, ExecutorEnv, ProverOpts, Receipt};
 use std::{ops::Range, sync::Arc, time::Duration};
@@ -34,6 +34,15 @@ use tracing::{instrument, Level};
 mod range_iterator;
 use range_iterator::LightBlockRangeIterator;
 
+// This is configured to use the default docker build path. The reason for the feature flag is
+// because we want a consistent docker image to build the program, which should not be run within
+// the dockerized service container.
+#[cfg(feature = "prebuilt-docker")]
+const LIGHT_CLIENT_GUEST_ELF: &[u8] = 
+    include_bytes!("../../target/riscv-guest/riscv32im-risc0-zkvm-elf/docker/light_client_guest/light-client-guest");
+#[cfg(not(feature = "prebuilt-docker"))]
+use light_client_guest::LIGHT_CLIENT_GUEST_ELF;
+
 /// Currently set to the max allowed by tendermint RPC
 const HEADER_REQ_COUNT: u64 = 20;
 

dockerfiles/blobstream0.Dockerfile

@@ -28,7 +28,7 @@ WORKDIR /app
 COPY . .
 
 # Build the project
-RUN cargo build -p blobstream0 --release
+RUN cargo build -p blobstream0 --release --features prebuilt-docker
 
 # Create a new stage for a smaller final image
 FROM debian:bullseye-slim as final

light-client-guest/Cargo.toml

@@ -10,5 +10,8 @@ risc0-build-ethereum = { git = "https://github.com/risc0/risc0-ethereum", tag =
 # Currently just used to format built artifact
 serde_json = "1.0"
 
+[features]
+prebuilt-docker = []
+
 [package.metadata.risc0]
-methods = ["guest"]
+methods = ["guest"]

light-client-guest/build.rs

@@ -29,6 +29,12 @@ const SOLIDITY_IMAGE_ID_PATH: &str = "../contracts/src/ImageID.sol";
 const SOLIDITY_ELF_PATH: &str = "../contracts/test/Elf.sol";
 
 fn main() {
+    // If this feature is enabled, skip build and just use pre-built guest and EVM artifacts.
+    if cfg!(feature = "prebuilt-docker") {
+        println!("cargo:rerun-if-env-changed=CARGO_FEATURE_PREBUILT_DOCKER");
+        return;
+    }
+
     // Builds can be made deterministic, and thereby reproducible, by using Docker to build the
     // guest. Check the RISC0_USE_DOCKER variable and use Docker to build the guest if set.
     let use_docker = env::var("RISC0_USE_DOCKER").ok().map(|_| DockerOptions {

light-client-guest/src/lib.rs

@@ -12,4 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(not(feature = "prebuilt-docker"))]
 include!(concat!(env!("OUT_DIR"), "/methods.rs"));