diff --git a/core/src/interfaces.rs b/core/src/interfaces.rs index e4848f6c..03382f9a 100644 --- a/core/src/interfaces.rs +++ b/core/src/interfaces.rs @@ -449,8 +449,8 @@ pub struct AggregationOnlyRequest { impl Display for AggregationOnlyRequest { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.write_str(&format!( - "AggregationOnlyRequest {{ {:?}, {:?} }}", - self.proof_type, self.prover_args + "AggregationOnlyRequest {{{:?}, {:?}}}", + self.aggregation_ids, self.proof_type )) } } diff --git a/provers/risc0/driver/src/lib.rs b/provers/risc0/driver/src/lib.rs index 18a34bdd..9dad1551 100644 --- a/provers/risc0/driver/src/lib.rs +++ b/provers/risc0/driver/src/lib.rs @@ -168,8 +168,8 @@ impl Prover for Risc0Prover { .receipt; info!( - "Generate aggregatino receipt journal: {:?}", - receipt.journal + "Generate aggregation receipt journal: {:?}", + alloy_primitives::hex::encode_prefixed(receipt.journal.bytes.clone()) ); let block_proof_image_id = compute_image_id(RISC0_GUEST_ELF).unwrap(); let aggregation_image_id = compute_image_id(RISC0_AGGREGATION_ELF).unwrap(); diff --git a/provers/risc0/driver/src/methods/risc0_aggregation.rs b/provers/risc0/driver/src/methods/risc0_aggregation.rs index 4aa9b8e2..f2180fc8 100644 --- a/provers/risc0/driver/src/methods/risc0_aggregation.rs +++ b/provers/risc0/driver/src/methods/risc0_aggregation.rs @@ -1,5 +1,5 @@ pub const RISC0_AGGREGATION_ELF: &[u8] = include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation"); pub const RISC0_AGGREGATION_ID: [u32; 8] = [ - 2333673138, 1389402087, 4157868707, 3509779465, 4233333805, 3247956400, 2845161127, 4015834081, + 1011950429, 2998663226, 1723944064, 1742472798, 1225419420, 1333504266, 3595009277, 3228775676, ]; diff --git a/provers/risc0/driver/src/methods/risc0_guest.rs b/provers/risc0/driver/src/methods/risc0_guest.rs index 75c913e2..6c4ff92a 100644 --- a/provers/risc0/driver/src/methods/risc0_guest.rs +++ b/provers/risc0/driver/src/methods/risc0_guest.rs @@ -1,5 +1,5 @@ pub const RISC0_GUEST_ELF: &[u8] = include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest"); pub const RISC0_GUEST_ID: [u32; 8] = [ - 643196937, 1246728629, 1886769928, 130762256, 177277998, 252070675, 1250330519, 622696287, + 1848002361, 3447634449, 2932177819, 2827220601, 4284138344, 2572487667, 1602600202, 3769687346, ]; diff --git a/provers/sp1/guest/Cargo.lock b/provers/sp1/guest/Cargo.lock index c49872c2..986a261e 100644 --- a/provers/sp1/guest/Cargo.lock +++ b/provers/sp1/guest/Cargo.lock @@ -1117,7 +1117,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" version = "0.16.9" -source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#475daa8834035cc170a567e7656329ab8de8cc44" +source = "git+https://github.com/sp1-patches/signatures?tag=ecdsa-v0.16.9-patch-v3.3.0#5de03653f713e2b314d9d7aeaa3d6755d77b7e44" dependencies = [ "anyhow", "cfg-if", @@ -1131,6 +1131,21 @@ dependencies = [ "spki", ] +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#475daa8834035cc170a567e7656329ab8de8cc44" +dependencies = [ + "anyhow", + "cfg-if", + "digest 0.10.7", + "elliptic-curve", + "hex-literal", + "signature", + "sp1-lib 3.3.0", + "spki", +] + [[package]] name = "either" version = "1.13.0" @@ -1594,7 +1609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", - "ecdsa", + "ecdsa 0.16.9 (git+https://github.com/sp1-patches/signatures?tag=ecdsa-v0.16.9-patch-v3.3.0)", "elliptic-curve", "once_cell", "sha2", @@ -2973,7 +2988,7 @@ dependencies = [ [[package]] name = "rfc6979" version = "0.4.0" -source = "git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9#475daa8834035cc170a567e7656329ab8de8cc44" +source = "git+https://github.com/sp1-patches/signatures?tag=ecdsa-v0.16.9-patch-v3.3.0#5de03653f713e2b314d9d7aeaa3d6755d77b7e44" dependencies = [ "hmac", "subtle", @@ -3181,7 +3196,7 @@ version = "0.29.0" source = "git+https://github.com/sp1-patches/rust-secp256k1?branch=patch-secp256k1-v0.29.0#13910d476dbdaf436312a9f096ee312593028557" dependencies = [ "cfg-if", - "ecdsa", + "ecdsa 0.16.9 (git+https://github.com/sp1-patches/signatures?branch=patch-ecdsa-v0.16.9)", "elliptic-curve", "k256", "rand", diff --git a/provers/sp1/guest/elf/sp1-aggregation b/provers/sp1/guest/elf/sp1-aggregation index 34a89663..c9c63885 100755 Binary files a/provers/sp1/guest/elf/sp1-aggregation and b/provers/sp1/guest/elf/sp1-aggregation differ diff --git a/provers/sp1/guest/elf/sp1-guest b/provers/sp1/guest/elf/sp1-guest index 246aa446..c6cb3973 100755 Binary files a/provers/sp1/guest/elf/sp1-guest and b/provers/sp1/guest/elf/sp1-guest differ diff --git a/taskdb/src/redis_db.rs b/taskdb/src/redis_db.rs index 506e414d..4df792b7 100644 --- a/taskdb/src/redis_db.rs +++ b/taskdb/src/redis_db.rs @@ -415,7 +415,7 @@ impl RedisTaskDb { ); } // do nothing None => { - info!("Enqueue new aggregatino task: {request}"); + info!("Enqueue new aggregation task: {request}"); self.insert_aggregation_task( &agg_task_descriptor, &TaskProvingStatusRecords(vec![task_status]),