Skip to content

Commit 897caae

Browse files
JuArceJuArce
committed
Merge branch 'refs/heads/feat/aggregation-mode' into integrate-sp1-into-aggregation-mode
2 parents 37b327c + 96ed926 commit 897caae

32 files changed

+171
-171
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ anvil_start_with_block_time_with_more_prefunded_accounts:
156156

157157
__AGGREGATION_MODE__:
158158
start_proof_aggregator_local:
159-
cargo run --manifest-path ./aggregation-mode/Cargo.toml --release -- config-files/config-proof-aggregator.yaml
159+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator.yaml
160160

161161
start_proof_aggregator_local_with_proving:
162-
cargo run --manifest-path ./aggregation-mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
162+
cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
163163

164164
_AGGREGATOR_:
165165

‎aggregation-mode/build.rs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎aggregation-mode/src/lib.rs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎aggregation-mode/src/zk/backends/mod.rs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎aggregation-mode/src/zk/mod.rs‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎aggregation-mode/zkvm/Cargo.toml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

aggregation-mode/Cargo.lock renamed to aggregation_mode/Cargo.lock

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

aggregation-mode/Cargo.toml renamed to aggregation_mode/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66

77
[dependencies]
88
sp1-sdk = "4.1.3"
9-
sp1_aggregator = { path = "./zkvm/sp1/" }
9+
sp1_aggregation_program = { path = "./aggregation_programs/sp1/" }
1010
serde = { version = "1.0.203", features = ["derive"] }
1111
serde_json = "1.0.117"
1212
serde_yaml = "0.9"

aggregation-mode/abi/AlignedLayerServiceManager.json renamed to aggregation_mode/abi/AlignedLayerServiceManager.json

File renamed without changes.

aggregation-mode/abi/AlignedProofAggregationService.json renamed to aggregation_mode/abi/AlignedProofAggregationService.json

File renamed without changes.

0 commit comments

Comments
 (0)