Merge branch 'main' into optimize-chaos-docker-build

.dockerignore

@@ -12,3 +12,4 @@
 !static/
 !.sqlx/
 !build.rs
+!proto

.github/workflows/_setup-e2e.yml

@@ -42,6 +42,9 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 
@@ -68,4 +71,4 @@ jobs:
         env:
           CARGO_PROFILE_RELEASE_DEBUG: 0
           RUST_LOG: off
-          RELEASE: 1
+          RELEASE: 1

.github/workflows/comment-tag-report.yml

@@ -20,6 +20,9 @@ jobs:
             - name: Set up Rust
               run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+            - name: Install protoc
+              run: sudo apt-get install -y protobuf-compiler
+
             - name: Setup Ruby
               uses: ruby/setup-ruby@v1
               with:
@@ -39,4 +42,3 @@ jobs:
               run: ruby utils/slack-notifiers/comments.rb
               env:
                   SLACK_WEBHOOK_URL: ${{ secrets.STRATUS_SLACK_WEBHOOK_URL }}
-

.github/workflows/doc-test.yml

@@ -47,8 +47,11 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 
       - name: Test docs
-        run: just test-doc
+        run: just test-doc

.github/workflows/e2e-contracts-postgres.yml

@@ -59,6 +59,9 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 

.github/workflows/e2e-contracts-rocks.yml

@@ -59,6 +59,9 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 

.github/workflows/e2e-contracts.yml

@@ -59,6 +59,9 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 

.github/workflows/int-test.yml

@@ -55,6 +55,9 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 

.github/workflows/lint-check.yml

@@ -53,8 +53,11 @@ jobs:
       - name: Set up Rust Nightly
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2024-01-01
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 
       - name: Just lint-check
-        run: just lint-check -2024-01-01
+        run: just lint-check -2024-01-01

.github/workflows/outdated.yml

@@ -18,8 +18,11 @@ jobs:
               uses: actions/checkout@v2
 
             - name: Set up Rust
-              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y    
-
+              run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+            - name: Install protoc
+              run: sudo apt-get install -y protobuf-compiler
+
             - name: Set up Just
               uses: extractions/setup-just@v1
 
@@ -36,4 +39,3 @@ jobs:
               env:
                   SLACK_WEBHOOK_URL: ${{ secrets.STRATUS_SLACK_WEBHOOK_URL }}
                   OUTDATED_TABLE_FILE_NAME: outdated.txt
-

.github/workflows/unit-test.yml

@@ -54,8 +54,11 @@ jobs:
         if: ${{ steps.cache-cargo.outputs.cache-hit != 'true' }}
         run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
+      - name: Install protoc
+        run: sudo apt-get install -y protobuf-compiler
+
       - name: Set up Just
         uses: extractions/setup-just@v1
 
       - name: Unit tests
-        run: just test-unit
+        run: just test-unit

Cargo.toml

@@ -69,6 +69,8 @@ triehash = "=0.8.4"
 jsonrpsee = { version = "=0.22.4", features = ["server", "client"] }
 reqwest = { version = "=0.12.4", features = ["json"] }
 tower = "=0.4.13"
+tonic = "=0.11.0"
+prost = "=0.12.6"
 
 # observability
 console-subscriber = "=0.2.0"
@@ -112,6 +114,7 @@ const-hex = "=1.10.0"
 glob = "=0.3.1"
 nom = "=7.1.3"
 phf_codegen = "=0.11.2"
+tonic-build = "=0.11.0"
 
 # ------------------------------------------------------------------------------
 # Binaries

build.rs

@@ -11,6 +11,7 @@ use nom::sequence::separated_pair;
 use nom::IResult;
 
 fn main() {
+    tonic_build::compile_protos("proto/raft.proto").unwrap();
     // any code change
     println!("cargo:rerun-if-changed=src/");
     // used in signatures codegen

docker/Dockerfile.run_with_importer

@@ -10,9 +10,10 @@ COPY Cargo.toml /app/Cargo.toml
 COPY Cargo.lock /app/Cargo.lock
 COPY .cargo .cargo
 COPY config /app/config
+COPY proto /app/proto
 
 RUN apt update
-RUN apt-get install -y libclang-dev cmake
+RUN apt-get install -y libclang-dev cmake protobuf-compiler
 
 ENV CARGO_PROFILE_RELEASE_DEBUG=1
 ENV JSON_LOGS=1

e2e/test/automine/e2e-json-rpc.test.ts

@@ -16,6 +16,7 @@ import {
     sendReset,
     subscribeAndGetEvent,
     subscribeAndGetEventWithContract,
+    ONE,
 } from "../helpers/rpc";
 
 describe("JSON-RPC", () => {
@@ -66,7 +67,7 @@ describe("JSON-RPC", () => {
             let gas = await send("eth_estimateGas", [tx]);
             expect(gas).match(HEX_PATTERN, "format");
 
-            const gasDec = parseInt(gas, 16); 
+            const gasDec = parseInt(gas, 16);
             expect(gasDec).to.be.greaterThan(0).and.lessThan(1_000_000);
         });
     });
@@ -85,6 +86,9 @@ describe("JSON-RPC", () => {
     describe("Block", () => {
         it("eth_blockNumber", async function () {
             (await sendExpect("eth_blockNumber")).eq(ZERO);
+            await sendEvmMine();
+            (await sendExpect("eth_blockNumber")).eq(ONE);
+            await sendReset();
         });
         it("eth_getBlockByNumber", async function () {
             let block: Block = await send("eth_getBlockByNumber", [ZERO, true]);

proto/raft.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package raft;
+
+message Entry {
+    uint64 index = 1;
+    string data = 2;
+}
+
+message AppendEntriesRequest {
+    repeated Entry entries = 1;
+}
+
+message AppendEntriesResponse {
+    bool success = 1;
+}
+
+service RaftService {
+    rpc AppendEntries(AppendEntriesRequest) returns (AppendEntriesResponse);
+}