Merge branch 'l2/integrate_cache_db' into l2/standalone_zkvm_test

.github/workflows/assertoor.yaml

@@ -0,0 +1,43 @@
+name: Assertoor
+on:
+  merge_group:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ '*' ]
+    paths-ignore:
+      - "crates/l2/**"
+      - 'README.md'
+      - 'LICENSE'
+      - "**/README.md"
+      - "**/docs/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  RUST_VERSION: 1.80.1
+
+jobs:
+  test-run:
+    name: Stability Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          load: true # Important for building without pushing
+          tags: ethereum_rust
+      - name: Setup kurtosis testnet and run assertoor tests
+        uses: ethpandaops/kurtosis-assertoor-github-action@v1
+        with:
+          kurtosis_version: '1.3.1'
+          ethereum_package_url: 'github.com/lambdaclass/ethereum-package'
+          ethereum_package_branch: 'ethereum-rust-integration'
+          ethereum_package_args: './test_data/network_params.yaml'

.github/workflows/ci.yaml

@@ -4,7 +4,12 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: ["*"]
+    branches: ["**"]
+    paths-ignore:
+      - "README.md"
+      - "LICENSE"
+      - "**/README.md"
+      - "**/docs/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -19,14 +24,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Rustup toolchain install
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ env.RUST_VERSION }}
           components: rustfmt, clippy
 
+      - name: Add Rust Cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Run cargo check
         run: cargo check
 
@@ -47,13 +55,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Rustup toolchain install
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ env.RUST_VERSION }}
 
+      - name: Caching
+        uses: Swatinem/rust-cache@v2
+
       - name: Download test vectors
         run: |
           make download-test-vectors

.github/workflows/ci_skipped.yaml

@@ -0,0 +1,33 @@
+name: CI Skipped
+on:
+  pull_request:
+    branches: ["**"]
+    paths:
+      - 'README.md'
+      - 'LICENSE'
+      - "**/README.md"
+      - "**/docs/**"
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    if: false
+    steps: [run: true]
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    if: false
+    steps: [run: true]
+
+  docker-build:
+    name: Build Docker image
+    runs-on: ubuntu-latest
+    if: false
+    steps: [run: true]
+
+  prover:
+    name: Build RISC-V zkVM program
+    runs-on: ubuntu-latest
+    if: false
+    steps: [run: true]

.github/workflows/hive.yaml

@@ -4,10 +4,14 @@ on:
   merge_group:
   push:
     branches: [main]
-    paths-ignore: ["crates/l2/**"]
   pull_request:
     branches: ["*"]
-    paths-ignore: ["crates/l2/**"]
+    paths-ignore: 
+      - "crates/l2/**"
+      - 'README.md'
+      - 'LICENSE'
+      - "**/README.md"
+      - "**/docs/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

Cargo.toml

@@ -14,10 +14,17 @@ members = [
     "cmd/ethereum_rust_l2",
     "crates/vm/levm",
     "crates/vm/levm/bench/revm_comparison",
+    "crates/l2/",
     "crates/l2/prover",
+    "crates/l2/contracts",
 ]
 resolver = "2"
-default-members = ["cmd/ethereum_rust", "cmd/ethereum_rust_l2", "crates/l2/prover"]
+
+default-members = [
+    "cmd/ethereum_rust",
+    "cmd/ethereum_rust_l2",
+    "crates/l2/prover",
+]
 
 [workspace.package]
 version = "0.1.0"

Makefile

@@ -71,19 +71,21 @@ stop-localnet-silent:
 	@kurtosis enclave stop lambdanet >/dev/null 2>&1 || true
 	@kurtosis enclave rm lambdanet --force >/dev/null 2>&1 || true
 
-HIVE_REVISION := 3be4465a45c421651d765f4a28702962567b40e6
+HIVE_REVISION := ccf28e5c3e940b2bc4b4f387317ee6a46f5d15c8
 # Shallow clones can't specify a single revision, but at least we avoid working
 # the whole history by making it shallow since a given date (one day before our
 # target revision).
 HIVE_SHALLOW_SINCE := 2024-09-02
 hive:
 	git clone --single-branch --branch master --shallow-since=$(HIVE_SHALLOW_SINCE) https://github.com/lambdaclass/hive
+	cd hive && git checkout --detach $(HIVE_REVISION) && go build .
 
 setup-hive: hive ## 🐝 Set up Hive testing framework
 	if [ "$$(cd hive && git rev-parse HEAD)" != "$(HIVE_REVISION)" ]; then \
 		cd hive && \
+		git checkout master && \
 		git fetch --shallow-since=$(HIVE_SHALLOW_SINCE) && \
-		git checkout $(HIVE_REVISION) && go build . ;\
+		git checkout --detach $(HIVE_REVISION) && go build . ;\
 	fi
 
 TEST_PATTERN ?= /