Enforce use of capnp 1.1.0

Author: JonoPrest

.github/workflows/capnp-build.dockerfile

@@ -0,0 +1,33 @@
+# This Dockerfile is used for ci to have the latest version of Cap'n Proto (1.1.0) 
+# built from source. Since ubuntu package manager is not up to date.
+
+# Start with a base image
+FROM ubuntu:22.04
+
+# Set non-interactive mode to prevent prompts during installation
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install dependencies
+RUN apt update && apt install -y \
+    build-essential \
+    cmake \
+    curl \
+    git \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and install Cap'n Proto 1.1.0
+WORKDIR /opt
+RUN curl -O https://capnproto.org/capnproto-c++-1.1.0.tar.gz && \
+    tar zxf capnproto-c++-1.1.0.tar.gz && \
+    cd capnproto-c++-1.1.0 && \
+    ./configure && \
+    make -j$(nproc) check && \
+    sudo make install && \
+    cd .. && rm -rf capnproto-c++-1.1.0 capnproto-c++-1.1.0.tar.gz
+
+# Set environment variables
+ENV PATH="/usr/local/bin:$PATH"
+
+# Default shell
+CMD ["/bin/bash"]

.github/workflows/ci.yaml

@@ -18,6 +18,8 @@ env:
 jobs:
   test_dev:
     runs-on: ubuntu-latest
+    # see capnp-build.dockerfile
+    container: ghcr.io/jonoprest/capnp-runner:latest
     steps:
       - uses: actions/checkout@v3
       # selecting a toolchain either by action or manual `rustup` calls should happen
@@ -31,8 +33,6 @@ jobs:
       - name: Check capnp schema should match the generated code
         working-directory: ./hypersync-net-types
         run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get install -y capnproto libcapnp-dev
           make capnp-build
           git diff --exit-code
 

hypersync-net-types/makefile

@@ -1,6 +1,8 @@
 .PHONY: capnp-build
 
 capnp-build:
+	# Ensure we are building with the same capnp (1.1.0) in all environments
+	capnp --version | grep -q "1.1.0"
 	cargo install capnpc
 	capnpc -orust:src hypersync_net_types.capnp
 	rustfmt -- src/hypersync_net_types_capnp.rs

hypersync-net-types/src/hypersync_net_types_capnp.rs

@@ -323,14 +323,13 @@ pub mod query_response_data {
     }
     impl Pipeline {}
     mod _private {
-        pub static ENCODED_NODE: [::capnp::Word; 82] = [
-            ::capnp::word(0, 0, 0, 0, 6, 0, 6, 0),
+        pub static ENCODED_NODE: [::capnp::Word; 81] = [
+            ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
             ::capnp::word(49, 157, 62, 151, 169, 39, 204, 137),
             ::capnp::word(26, 0, 0, 0, 1, 0, 0, 0),
             ::capnp::word(197, 128, 248, 24, 106, 165, 137, 146),
             ::capnp::word(4, 0, 7, 0, 0, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-            ::capnp::word(22, 0, 0, 0, 138, 0, 0, 0),
             ::capnp::word(21, 0, 0, 0, 98, 1, 0, 0),
             ::capnp::word(41, 0, 0, 0, 7, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
@@ -733,14 +732,13 @@ pub mod rollback_guard {
     }
     impl Pipeline {}
     mod _private {
-        pub static ENCODED_NODE: [::capnp::Word; 100] = [
-            ::capnp::word(0, 0, 0, 0, 6, 0, 6, 0),
+        pub static ENCODED_NODE: [::capnp::Word; 99] = [
+            ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
             ::capnp::word(75, 175, 253, 87, 239, 86, 125, 149),
             ::capnp::word(26, 0, 0, 0, 1, 0, 3, 0),
             ::capnp::word(197, 128, 248, 24, 106, 165, 137, 146),
             ::capnp::word(2, 0, 7, 0, 0, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-            ::capnp::word(140, 0, 0, 0, 43, 1, 0, 0),
             ::capnp::word(21, 0, 0, 0, 66, 1, 0, 0),
             ::capnp::word(37, 0, 0, 0, 7, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
@@ -1200,14 +1198,13 @@ pub mod query_response {
         }
     }
     mod _private {
-        pub static ENCODED_NODE: [::capnp::Word; 100] = [
-            ::capnp::word(0, 0, 0, 0, 6, 0, 6, 0),
+        pub static ENCODED_NODE: [::capnp::Word; 99] = [
+            ::capnp::word(0, 0, 0, 0, 5, 0, 6, 0),
             ::capnp::word(226, 9, 54, 243, 16, 76, 106, 205),
             ::capnp::word(26, 0, 0, 0, 1, 0, 3, 0),
             ::capnp::word(197, 128, 248, 24, 106, 165, 137, 146),
             ::capnp::word(2, 0, 7, 0, 0, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),
-            ::capnp::word(45, 1, 0, 0, 228, 1, 0, 0),
             ::capnp::word(21, 0, 0, 0, 66, 1, 0, 0),
             ::capnp::word(37, 0, 0, 0, 7, 0, 0, 0),
             ::capnp::word(0, 0, 0, 0, 0, 0, 0, 0),