Merge pull request #342 from lu-bann/dev

bump version merge main

Author: zsluedem

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_call:
   push:
     branches:
       - dev
@@ -25,6 +26,8 @@ jobs:
           tool: cargo-sort,cargo-machete
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Rust cache
         uses: Swatinem/rust-cache@v2
         with:

.github/workflows/e2e-tests.yml

@@ -1,6 +1,7 @@
 name: e2e tests
 
 on:
+  workflow_call:
   push:
     branches:
       - dev
@@ -20,6 +21,12 @@ jobs:
         with:
           cache-on-failure: true
       - uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
       - name: Install kurtosis
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list

.github/workflows/release.yml

@@ -5,23 +5,18 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+
 env:
-  FOUNDRY_PROFILE: ci
-  API_KEY_INFURA: ${{ secrets.API_KEY_INFURA }}
   CARGO_TERM_COLOR: always
 
 jobs:
   unit-tests:
-    name: Run All Tests
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/workflows/ci.yml@main
+    uses: lu-bann/taiyi/.github/workflows/ci.yml@dev
 
   e2e-tests:
-    name: Run E2E Tests
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/workflows/e2e-tests.yml@main
+    uses: lu-bann/taiyi/.github/workflows/e2e-tests.yml@dev
 
   docker:
     name: Build and Push Docker Image
@@ -56,7 +51,7 @@ jobs:
   release:
     name: Build and Release Binaries
     needs: [unit-tests, e2e-tests]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
@@ -66,16 +61,16 @@ jobs:
             os: macos-latest
           - target: aarch64-apple-darwin
             os: macos-latest
-          - target: x86_64-pc-windows-msvc
-            os: windows-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@1.83.0
         with:
           targets: ${{ matrix.target }}
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build binary
         run: cargo build --release --target ${{ matrix.target }}
       - name: Prepare assets
@@ -94,7 +89,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: taiyi-${{ matrix.target }}
+          name: taiyi-${{ github.sha }}
           path: release/*
 
   github-release:
@@ -107,10 +102,11 @@ jobs:
       - name: Download all artifacts
         uses: actions/download-artifact@v3
         with:
+          name: taiyi-${{ github.sha }}
           path: artifacts
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           files: artifacts/**/*
           generate_release_notes: true
-          prerelease: ${{ contains(github.ref, 'alpha') }}
+          prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') }}

.gitmodules

@@ -10,15 +10,19 @@
 [submodule "contracts/lib/axiom-v2-periphery"]
 	path = contracts/lib/axiom-v2-periphery
 	url = https://github.com/axiom-crypto/axiom-v2-periphery
-[submodule "contracts/lib/eigenlayer-contracts"]
-	path = contracts/lib/eigenlayer-contracts
-	url = https://github.com/Layr-Labs/eigenlayer-contracts
-[submodule "contracts/lib/eigenlayer-middleware"]
-	path = contracts/lib/eigenlayer-middleware
-	url = https://github.com/Layr-Labs/eigenlayer-middleware
 [submodule "contracts/lib/openzeppelin-contracts"]
 	path = contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
 	path = contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "contracts/lib/eigenlayer-contracts"]
+	path = contracts/lib/eigenlayer-contracts
+	url = https://github.com/Layr-Labs/eigenlayer-contracts
+[submodule "lib/eigenlayer-middleware"]
+	path = lib/eigenlayer-middleware
+	url = https://github.com/Layr-Labs/eigenlayer-middleware
+	branch = mainnet
+[submodule "contracts/lib/eigenlayer-middleware"]
+	path = contracts/lib/eigenlayer-middleware
+	url = https://github.com/Layr-Labs/eigenlayer-middleware

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -83,6 +83,7 @@ thiserror = { version = "2.0.7" }
 parking_lot = "0.12.3"
 futures = "0.3.31"
 tracing = "0.1.41"
+tracing-core = "0.1.33"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 blst = "0.3.13"
 lru = "0.12.5"
@@ -116,3 +117,4 @@ ssz_types = "0.8"
 lighthouse-types = { package = "types", git = "https://github.com/sigp/lighthouse", tag = "v6.0.1" }
 http-body-util = "0.1.2"
 tower = "0.5.2"
+sha2 = "0.10.8"

Cargo.toml

@@ -18,6 +18,9 @@ e2e-setup:
 e2e-test:
 	bash scripts/devnet/start-e2e-tests.sh
 
+e2e-clean:
+	bash scripts/devnet/clean.sh
+
 make e2e:
 	make e2e-network
 	make e2e-setup

Makefile

@@ -1,4 +1,5 @@
 # Taiyi(太一) - an Ethereum L1 Preconfirmation Protocol
+
 <p align="center">
   <img src="https://github.com/user-attachments/assets/a34f1523-517e-4bbe-90e8-4516f61cdab7" alt="image_resized">
 </p>
@@ -7,13 +8,13 @@
 
 ### Requirements
 
-* Compiled [commit-boost](https://github.com/Commit-Boost/commit-boost-client) for `signer_module` integration 
-* Consensus layer (CL) client
-* Execution layer (EL) client
+- Compiled [commit-boost](https://github.com/Commit-Boost/commit-boost-client) for `signer_module` integration
+- Consensus layer (CL) client
+- Execution layer (EL) client
 
-### Running Commit-Boost 
+### Running Commit-Boost
 
-*Note: Due to the frequent updates of Commit-Boost, we currently pin the Commit-Boost version to e6ad292ee43063c16e397e58a9a152482306d16f for compatibility reasons.*
+_Note: Due to the frequent updates of Commit-Boost, we currently pin the Commit-Boost version to e6ad292ee43063c16e397e58a9a152482306d16f for compatibility reasons._
 
 ```bash
 git clone https://github.com/Commit-Boost/commit-boost-client.git
@@ -33,16 +34,43 @@ SIGNER_SERVER=8000  \
     ./target/debug/signer-module
 ```
 
-
 ## Usage
-Once you have your signer-module , cl and el ready, to start running the preconfer: 
+
+Once you have your signer-module , cl and el ready, to start running the preconfer:
+
 ```
 cargo run -- preconfer --rpc_url EL_RPC_URL \
     --beacon_rpc_url CL_RPC_URL \
     --taiyi_escrow_contract_addr 0xad4Ce1d2CdBdb84222D519a1FBc8cc181ba28e07 # helder contract \
-    --taiyi_core_contract_addr 0xb01F002F3b21E1e0E81c3023C85aCd02035abCE8 # helder contract \ 
-    --taiyi_proposer_registry_contract_addr 0x7B7f8371f8bC3e0f148BCeD3a54F89432a0Da5AE # helder contract \ 
+    --taiyi_core_contract_addr 0xb01F002F3b21E1e0E81c3023C85aCd02035abCE8 # helder contract \
+    --taiyi_proposer_registry_contract_addr 0x7B7f8371f8bC3e0f148BCeD3a54F89432a0Da5AE # helder contract \
     --commit-boost-url http://127.0.0.1:8000 \
     --commit-boost-id taiyi \
     --commit-boost-jwt 8d1b71df48ff1971e714156b2aafcac8fc5ea02c6770adc3954557d978ba3439
 ```
+
+```mermaid
+sequenceDiagram
+    participant User as user
+    participant Gateway as taiyi gateway
+    participant PBS Relay as pbs relay
+
+    User->>Gateway: gateway/commitments/v0/epoch_info
+    Note over User, Gateway: Fetch available slots in the next 2 epochs
+
+    User->>Gateway: gateway/commitments/v0/estimate_fee
+    Note over User, Gateway: Quotes a fee to the user for a slot
+
+    User->>Gateway: gateway/commitments/v0/reserve_blockspace
+    Note over User, Gateway: returns a UUID used to send a transaction later
+
+    alt User sends a transaction for the blockspace reserved which satisfies the limit
+        User->>Gateway: gateway/commitments/vo/send_transaction
+        Note over User, Gateway: gateway appends a tranaction which calls `get_tip()` on TaiyiCore
+    else User doesn't sends a valid transaction for the blockspace reserved which satisfies the limit
+        Note over User, Gateway: gateway appends a tranaction which calsl `exhaust()` on TaiyiCore
+    end
+
+    Gateway->>PBS Relay: /submit_constraints
+
+```

README.md

@@ -2,10 +2,6 @@
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 
-[submodule "lib/axiom-std"]
-	path = lib/axiom-std
-	url = https://github.com/axiom-crypto/axiom-std
-
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
@@ -14,10 +10,6 @@
 	path = lib/eigenlayer-middleware
 	url = https://github.com/Layr-Labs/eigenlayer-middleware
 
-[submodule "lib/axiom-v2-periphery"]
-	path = lib/axiom-v2-periphery
-	url = https://github.com/axiom-crypto/axiom-v2-periphery
-
 [submodule "lib/eigenlayer-contracts"]
 	path = lib/eigenlayer-contracts
 	url = https://github.com/Layr-Labs/eigenlayer-contracts