Skip to content

Commit 7da205c

Browse files
yaziciahmetkppeyusufatik
authored
Light client starter (#1336)
Co-authored-by: Roman Proskuryakoff <r.proskuryakoff@gmail.com> Co-authored-by: eyusufatik <esadyusufatik@gmail.com>
1 parent 82ca586 commit 7da205c

File tree

95 files changed

+8892
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+8892
-627
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,18 +541,18 @@ jobs:
541541
name: citrea-build
542542
path: target/release
543543

544-
- name: Check BITCOIN_DA_ID
544+
- name: Check BATCH_PROVER_BITCOIN_ID
545545
id: check-id
546546
run: |
547-
RESULT=$(grep -R "BITCOIN_DA_ID" target/ || echo "Grep failed")
547+
RESULT=$(grep -R "BATCH_PROVER_BITCOIN_ID" target/ || echo "Grep failed")
548548
EXPECTED_BITCOIN_DA_ID=$(echo "${{ env.EXPECTED_BITCOIN_DA_ID }}" | tr -d '\n\r')
549549
if echo "$RESULT" | grep -q "$EXPECTED_BITCOIN_DA_ID"; then
550550
echo "Check passed successfully."
551-
echo "Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
551+
echo "Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
552552
echo "Actual: $RESULT"
553553
554554
else
555-
echo "Check failed. Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
555+
echo "Check failed. Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
556556
echo "Actual: $RESULT"
557557
exit 1
558558
fi

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,18 @@ jobs:
125125
run: |
126126
cargo build --release
127127
128-
- name: Check BITCOIN_DA_ID
128+
- name: Check BATCH_PROVER_BITCOIN_ID
129129
id: check-id
130130
run: |
131-
RESULT=$(grep -R "BITCOIN_DA_ID" target/ || echo "Grep failed")
131+
RESULT=$(grep -R "BATCH_PROVER_BITCOIN_ID" target/ || echo "Grep failed")
132132
EXPECTED_BITCOIN_DA_ID=$(echo "${{ env.EXPECTED_BITCOIN_DA_ID }}" | tr -d '\n\r')
133133
if echo "$RESULT" | grep -q "$EXPECTED_BITCOIN_DA_ID"; then
134134
echo "Check passed successfully."
135-
echo "Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
135+
echo "Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
136136
echo "Actual: $RESULT"
137137
138138
else
139-
echo "Check failed. Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
139+
echo "Check failed. Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
140140
echo "Actual: $RESULT"
141141
exit 1
142142
fi
@@ -178,18 +178,18 @@ jobs:
178178
source $HOME/.cargo/env
179179
cargo build --release
180180
181-
- name: Check BITCOIN_DA_ID
181+
- name: Check BATCH_PROVER_BITCOIN_ID
182182
id: check-id
183183
run: |
184-
RESULT=$(grep -R "BITCOIN_DA_ID" target/ || echo "Grep failed")
184+
RESULT=$(grep -R "BATCH_PROVER_BITCOIN_ID" target/ || echo "Grep failed")
185185
EXPECTED_BITCOIN_DA_ID=$(echo "${{ env.EXPECTED_BITCOIN_DA_ID }}" | tr -d '\n\r')
186186
if echo "$RESULT" | grep -q "$EXPECTED_BITCOIN_DA_ID"; then
187187
echo "Check passed successfully."
188-
echo "Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
188+
echo "Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
189189
echo "Actual: $RESULT"
190190
191191
else
192-
echo "Check failed. Expected: BITCOIN_DA_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
192+
echo "Check failed. Expected: BATCH_PROVER_BITCOIN_ID ${{ env.EXPECTED_BITCOIN_DA_ID }} "
193193
echo "Actual: $RESULT"
194194
exit 1
195195
fi

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ demo_data/
1414
resources/dbs/da-db/
1515
resources/dbs/sequencer-db/
1616
resources/dbs/full-node-db/
17-
resources/dbs/prover-db/
17+
resources/dbs/batch-prover-db/
18+
resources/dbs/light-client-prover-db/
1819
resources/bitcoin/inscription_txs/
1920
/.vscode/*
2021

‎Cargo.lock‎

Lines changed: 92 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ resolver = "2"
33
members = [
44
# Citrea
55
"bin/citrea",
6-
"crates/common",
7-
"crates/primitives",
8-
"crates/pruning",
6+
"crates/batch-prover",
97
"crates/bitcoin-da",
10-
"crates/evm",
8+
"crates/citrea-stf",
9+
"crates/common",
1110
"crates/ethereum-rpc",
11+
"crates/evm",
1212
"crates/fullnode",
13+
"crates/light-client-prover",
14+
"crates/primitives",
15+
"crates/prover-services",
16+
"crates/pruning",
1317
"crates/risc0-bonsai",
1418
"crates/sequencer",
1519
"crates/sequencer-client",
@@ -102,7 +106,7 @@ rayon = "1.8.0"
102106
rlimit = "0.10.2"
103107
rustc_version_runtime = { version = "0.3.0", default-features = false }
104108
reqwest = { version = "0.12.5", features = ["rustls-tls", "json", "http2"], default-features = false }
105-
rocksdb = { version = "0.22.0", features = ["lz4"] }
109+
rocksdb = { version = "0.22.0", features = ["lz4"], default-features = false }
106110
serde = { version = "1.0.192", default-features = false, features = ["alloc", "derive"] }
107111
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
108112
sha2 = { version = "0.10.8", default-features = false }

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ clean: ## Cleans compiled
1919

2020
clean-node: ## Cleans local dbs needed for sequencer and nodes
2121
rm -rf resources/dbs/sequencer-db
22-
rm -rf resources/dbs/prover-db
22+
rm -rf resources/dbs/batch-prover-db
23+
rm -rf resources/dbs/light-client-prover-db
2324
rm -rf resources/dbs/full-node-db
2425

2526
clean-txs:

‎bin/citrea/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@ resolver = "2"
1414
[dependencies]
1515
# Citrea deps
1616
bitcoin-da = { path = "../../crates/bitcoin-da", features = ["native"] }
17+
citrea-batch-prover = { path = "../../crates/batch-prover" }
1718
citrea-common = { path = "../../crates/common" }
1819
citrea-fullnode = { path = "../../crates/fullnode" }
20+
citrea-light-client-prover = { path = "../../crates/light-client-prover", features = ["native"] }
1921
citrea-primitives = { path = "../../crates/primitives" }
20-
citrea-prover = { path = "../../crates/prover" }
2122
citrea-risc0 = { package = "risc0", path = "./provers/risc0" }
2223
citrea-risc0-bonsai-adapter = { path = "../../crates/risc0-bonsai", features = ["native"] }
2324
citrea-sequencer = { path = "../../crates/sequencer" }
2425
citrea-stf = { path = "../../crates/citrea-stf", features = ["native"] }
2526
ethereum-rpc = { path = "../../crates/ethereum-rpc" }
27+
prover-services = { path = "../../crates/prover-services" }
2628
sequencer-client = { path = "../../crates/sequencer-client" }
2729

2830
# Sovereign-SDK deps
@@ -86,7 +88,7 @@ rustc_version_runtime = { workspace = true }
8688
# bitcoin-e2e dependencies
8789
bitcoin.workspace = true
8890
bitcoincore-rpc.workspace = true
89-
citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "fc12cb0" }
91+
citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "0a6492ebbb7" }
9092

9193
[features]
9294
default = [] # Deviate from convention by making the "native" feature active by default. This aligns with how this package is meant to be used (as a binary first, library second).

‎bin/citrea/provers/risc0/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resolver = "2"
1010
risc0-build = { workspace = true }
1111

1212
[package.metadata.risc0]
13-
methods = ["guest-mock", "guest-bitcoin"]
13+
methods = ["batch-prover-bitcoin", "batch-prover-mock", "light-client-prover-bitcoin", "light-client-prover-mock"]
1414

1515
[features]
1616
bench = []

0 commit comments

Comments
 (0)