Skip to content

Commit 168d391

Browse files
feat(aggregation mode): move sdk from crates dir to aggregation mode dir (#2223)
Co-authored-by: JuArce <52429267+JuArce@users.noreply.github.com>
1 parent fa3cbe9 commit 168d391

33 files changed

Lines changed: 689 additions & 1781 deletions

File tree

.github/workflows/build-and-test-rust.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,16 @@ jobs:
8989
- name: Checkout code
9090
uses: actions/checkout@v4
9191

92+
- name: Set up Rust
93+
uses: actions-rs/toolchain@v1
94+
with:
95+
toolchain: 1.88.0
96+
components: rustfmt, clippy
97+
override: true
98+
9299
- name: foundry-toolchain
93100
uses: foundry-rs/foundry-toolchain@v1.2.0
94-
101+
95102
# Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
96103
- name: Install sp1 toolchain
97104
run: |

Makefile

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -277,27 +277,15 @@ proof_aggregator_start_gpu_ethereum_package: is_aggregator_set reset_last_aggreg
277277

278278
verify_aggregated_proof_sp1:
279279
@echo "Verifying SP1 in aggregated proofs on $(NETWORK)..."
280-
@cd crates/cli/ && \
281-
cargo run verify-agg-proof \
280+
@cd aggregation_mode/cli/ && \
281+
cargo run verify-on-chain \
282282
--network $(NETWORK) \
283+
--beacon-url $(BEACON_URL) \
284+
--rpc-url $(RPC_URL) \
283285
--from-block $(FROM_BLOCK) \
284-
--proving_system SP1 \
285-
--public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
286-
--program-id-file ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
287-
--beacon_url $(BEACON_URL) \
288-
--rpc_url $(RPC_URL)
289-
290-
verify_aggregated_proof_risc0:
291-
@echo "Verifying RISC0 in aggregated proofs on $(NETWORK)..."
292-
@cd crates/cli/ && \
293-
cargo run verify-agg-proof \
294-
--network $(NETWORK) \
295-
--from-block $(FROM_BLOCK) \
296-
--proving_system Risc0 \
297-
--program-id-file ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_3_0_3.bin \
298-
--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_3_0_3.pub \
299-
--beacon_url $(BEACON_URL) \
300-
--rpc_url $(RPC_URL)
286+
--proving-system SP1 \
287+
--vk-hash ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
288+
--public-inputs ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub
301289

302290
proof_aggregator_install: ## Install the aggregation mode with proving enabled
303291
cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator_gpu --locked
@@ -331,9 +319,11 @@ agg_mode_payments_poller_start_ethereum_package: agg_mode_run_migrations
331319

332320
AGG_MODE_SENDER ?= 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
333321
agg_mode_gateway_send_payment:
334-
@cast send --value 1ether \
335-
0x922D6956C99E12DFeB3224DEA977D0939758A1Fe \
336-
--private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
322+
@cd aggregation_mode/cli && \
323+
cargo run --release -- deposit \
324+
--private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d \
325+
--network devnet \
326+
--rpc-url http://localhost:8545
337327

338328
agg_mode_gateway_send_sp1_proof:
339329
@cargo run --manifest-path aggregation_mode/cli/Cargo.toml -- submit sp1 \

0 commit comments

Comments
 (0)