Skip to content

Commit 73021cd

Browse files
committed
refactor: remove agg mode function from fast mode
1 parent ba219fb commit 73021cd

20 files changed

Lines changed: 145 additions & 2039 deletions

File tree

aggregation_mode/Cargo.lock

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

aggregation_mode/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ serde_yaml = "0.9"
1313
alloy = { version = "1.1.1", features = ["default", "signer-keystore", "kzg"] }
1414
lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "5f8f2cfcc8a1a22f77e8dff2d581f1166eefb80b", features = ["serde"]}
1515
bincode = "1.3.3"
16-
aligned-sdk = { path = "../crates/sdk/" }
17-
db = { path = "./db" }
1816
sp1-sdk = "5.0.0"
1917
risc0-zkvm = { version = "3.0.3" }
2018

19+
agg_mode_sdk = { path = "./sdk"}
20+
db = { path = "./db" }
21+
2122
[profile.release]
2223
opt-level = 3

aggregation_mode/gateway/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ edition = "2021"
77
serde = { workspace = true }
88
serde_json = { workspace = true }
99
serde_yaml = { workspace = true }
10-
agg_mode_sdk = { path = "../sdk"}
11-
aligned-sdk = { workspace = true }
10+
agg_mode_sdk = { workspace = true }
1211
sp1-sdk = { workspace = true }
1312
tracing = { version = "0.1", features = ["log"] }
1413
tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

aggregation_mode/gateway/src/http.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ use actix_web::{
88
web::{self, Data},
99
App, HttpRequest, HttpResponse, HttpServer, Responder,
1010
};
11-
use agg_mode_sdk::types::Network;
12-
use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
11+
use agg_mode_sdk::{blockchain::AggregationModeProvingSystem, types::Network};
1312
use alloy::signers::Signature;
1413
use sp1_sdk::{SP1ProofWithPublicValues, SP1VerifyingKey};
1514
use sqlx::types::BigDecimal;

aggregation_mode/payments_poller/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77
serde = { workspace = true }
88
serde_json = { workspace = true }
99
serde_yaml = { workspace = true }
10-
aligned-sdk = { workspace = true }
1110
tracing = { version = "0.1", features = ["log"] }
1211
tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
1312
actix-web = "4"

aggregation_mode/proof_aggregator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ serde_json = { workspace = true }
99
serde_yaml = { workspace = true }
1010
alloy = { workspace = true }
1111
bincode = { workspace = true }
12-
aligned-sdk = { workspace = true }
1312
db = { workspace = true }
13+
agg_mode_sdk = { workspace = true }
1414

1515
tracing = { version = "0.1", features = ["log"] }
1616
tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }

aggregation_mode/proof_aggregator/src/aggregators/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pub mod sp1_aggregator;
33

44
use std::fmt::Display;
55

6-
use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
6+
use agg_mode_sdk::blockchain::AggregationModeProvingSystem;
77
use lambdaworks_crypto::merkle_tree::traits::IsMerkleTreeBackend;
88
use risc0_aggregator::{Risc0AggregationError, Risc0ProofReceiptAndImageId};
99
use sha3::{Digest, Keccak256};

aggregation_mode/proof_aggregator/src/aggregators/risc0_aggregator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include!(concat!(env!("OUT_DIR"), "/methods.rs"));
22

3-
use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
3+
use agg_mode_sdk::blockchain::AggregationModeProvingSystem;
44
use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, Receipt};
55
use sha3::{Digest, Keccak256};
66

aggregation_mode/proof_aggregator/src/aggregators/sp1_aggregator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::sync::LazyLock;
22

3-
use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
3+
use agg_mode_sdk::blockchain::AggregationModeProvingSystem;
44
use alloy::primitives::Keccak256;
55
use sp1_aggregation_program::SP1VkAndPubInputs;
66
#[cfg(feature = "prove")]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// AggregationModePaymentService contract address for each chain
2+
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_MAINNET: &str = "0x0";
3+
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_MAINNET_STAGE: &str = "0x0";
4+
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_SEPOLIA: &str = "0x0";
5+
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOODI: &str = "0x0";
6+
pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_DEVNET: &str =
7+
"0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc";
8+
9+
// AggregationModePaymentService contract address for each chain
10+
pub const ALIGNED_AGG_PAYMENT_SERVICE_ADDRESS_MAINNET: &str = "0x0";
11+
pub const ALIGNED_AGG_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE: &str = "0x0";
12+
pub const ALIGNED_AGG_PAYMENT_SERVICE_ADDRESS_SEPOLIA: &str = "0x0";
13+
pub const ALIGNED_AGG_PAYMENT_SERVICE_ADDRESS_HOODI: &str = "0x0";
14+
pub const ALIGNED_AGG_PAYMENT_SERVICE_ADDRESS_DEVNET: &str =
15+
"0x922D6956C99E12DFeB3224DEA977D0939758A1Fe";
16+
17+
// AggregationMode Gateway urls for chain
18+
pub const ALIGNED_AGG_MODE_GATEWAY_URL_MAINNET: &str = "";
19+
pub const ALIGNED_AGG_MODE_GATEWAY_URL_MAINNET_STAGE: &str = "";
20+
pub const ALIGNED_AGG_MODE_GATEWAY_URL_SEPOLIA: &str = "";
21+
pub const ALIGNED_AGG_MODE_GATEWAY_URL_HOODI: &str = "";
22+
pub const ALIGNED_AGG_MODE_GATEWAY_URL_DEVNET: &str = "http://127.0.0.1:8089";

0 commit comments

Comments
 (0)