Skip to content

Commit c7b1d6d

Browse files
evanmarshallevanmarshall
committed
snarkVM
1 parent 91d6b18 commit c7b1d6d

11 files changed

Lines changed: 55 additions & 15 deletions

File tree

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎algorithms/src/snark/marlin/data_structures/circuit_proving_key.rs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,23 @@ impl<E: PairingEngine, MM: MarlinMode> ToBytes for CircuitProvingKey<E, MM> {
5454
impl<E: PairingEngine, MM: MarlinMode> FromBytes for CircuitProvingKey<E, MM> {
5555
#[inline]
5656
fn read_le<R: Read>(mut reader: R) -> io::Result<Self> {
57-
//use web_sys::console;
57+
use web_sys::console;
5858

59-
//console::log_1(&"Read Le 1".into());
59+
// let mut buff = Vec::<u8>::new();
60+
// let size = reader.read_to_end(&mut buff);
61+
62+
// let formatted_string = format!("Reader size: {:?} {:?}", size, buff.iter().take(1000).cloned().collect::<Vec<u8>>());
63+
println!("Read Le 1");
64+
console::log_1(&"Read Le 1".into());
65+
// console::log_1(&formatted_string.into());
6066
let circuit_verifying_key = CanonicalDeserialize::deserialize_compressed(&mut reader)?;
61-
//console::log_1(&"Read Le 2".into());
67+
console::log_1(&"Read Le 2".into());
6268
let circuit_commitment_randomness = CanonicalDeserialize::deserialize_compressed(&mut reader)?;
63-
//console::log_1(&"Read Le 3".into());
69+
// console::log_1(&"Read Le 3".into());
6470
let circuit = CanonicalDeserialize::deserialize_compressed(&mut reader)?;
65-
//console::log_1(&"Read Le 4".into());
71+
// console::log_1(&"Read Le 4".into());
6672
let committer_key = Arc::new(FromBytes::read_le(&mut reader)?);
67-
//console::log_1(&"Read Le 5".into());
73+
// console::log_1(&"Read Le 5".into());
6874

6975
Ok(Self { circuit_verifying_key, circuit_commitment_randomness, circuit, committer_key })
7076
}

‎algorithms/src/snark/marlin/data_structures/circuit_verifying_key.rs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ impl<E: PairingEngine, MM: MarlinMode> ToMinimalBits for CircuitVerifyingKey<E,
155155

156156
impl<E: PairingEngine, MM: MarlinMode> FromBytes for CircuitVerifyingKey<E, MM> {
157157
fn read_le<R: Read>(r: R) -> io::Result<Self> {
158+
use web_sys::console;
159+
console::log_1(&"Deserialize CVK".into());
158160
Self::deserialize_compressed(r).map_err(|_| error("could not deserialize CircuitVerifyingKey"))
159161
}
160162
}
@@ -174,6 +176,8 @@ impl<E: PairingEngine, MM: MarlinMode> CircuitVerifyingKey<E, MM> {
174176

175177
impl<E: PairingEngine, MM: MarlinMode> ToConstraintField<E::Fq> for CircuitVerifyingKey<E, MM> {
176178
fn to_field_elements(&self) -> Result<Vec<E::Fq>, ConstraintFieldError> {
179+
use web_sys::console;
180+
console::log_1(&"CVK to field elements".into());
177181
let constraint_domain_size =
178182
EvaluationDomain::<E::Fr>::compute_size_of_domain(self.circuit_info.num_constraints).unwrap() as u128;
179183
let non_zero_a_domain_size =
@@ -183,6 +187,10 @@ impl<E: PairingEngine, MM: MarlinMode> ToConstraintField<E::Fq> for CircuitVerif
183187
let non_zero_c_domain_size =
184188
EvaluationDomain::<E::Fr>::compute_size_of_domain(self.circuit_info.num_non_zero_c).unwrap() as u128;
185189

190+
let formatted_string = format!("Domain sizes: {} , {}, {}, {}", constraint_domain_size, non_zero_a_domain_size, non_zero_b_domain_size, non_zero_c_domain_size);
191+
console::log_1(&formatted_string.into());
192+
193+
186194
let mut res = Vec::new();
187195
res.append(&mut E::Fq::from(constraint_domain_size).to_field_elements()?);
188196
res.append(&mut E::Fq::from(non_zero_a_domain_size).to_field_elements()?);
@@ -228,6 +236,8 @@ impl<E: PairingEngine, MM: MarlinMode> Serialize for CircuitVerifyingKey<E, MM>
228236
impl<'de, E: PairingEngine, MM: MarlinMode> Deserialize<'de> for CircuitVerifyingKey<E, MM> {
229237
#[inline]
230238
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
239+
use web_sys::console;
240+
console::log_1(&"Deserialize cvk 1".into());
231241
match deserializer.is_human_readable() {
232242
true => {
233243
let s: String = Deserialize::deserialize(deserializer)?;

‎curves/Cargo.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ version = "1.0.152"
5353
default-features = false
5454
features = [ "derive" ]
5555

56+
[dependencies.web-sys]
57+
version = "0.3"
58+
features = ["console"]
59+
5660
[dependencies.thiserror]
5761
version = "1.0"
5862

‎curves/src/templates/macros.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ macro_rules! impl_sw_curve_serializer {
124124
validate: Validate,
125125
) -> Result<Self, snarkvm_utilities::serialize::SerializationError> {
126126
use snarkvm_utilities::serialize::SWFlags;
127+
use web_sys::console;
128+
console::log_1(&"deserialize here affine".into());
127129
let point = if let Compress::Yes = compress {
128130
let (x, flags) = P::BaseField::deserialize_with_flags::<_, SWFlags>(&mut reader)?;
129131
if flags.is_infinity() {

‎fields/src/fp12_2over3over2.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,10 @@ impl<P: Fp12Parameters> CanonicalSerialize for Fp12<P> {
536536
impl<P: Fp12Parameters> CanonicalDeserializeWithFlags for Fp12<P> {
537537
#[inline]
538538
fn deserialize_with_flags<R: Read, F: Flags>(mut reader: R) -> Result<(Self, F), SerializationError> {
539+
use web_sys::console;
540+
console::log_1(&"deserialize here fp12".into());
541+
println!("deserialize here fp12");
542+
539543
let c0 = CanonicalDeserialize::deserialize_uncompressed(&mut reader)?;
540544
let (c1, flags) = Fp6::deserialize_with_flags(&mut reader)?;
541545
Ok((Self::new(c0, c1), flags))

‎fields/src/fp2.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,9 @@ impl<P: Fp2Parameters> CanonicalSerialize for Fp2<P> {
457457
impl<P: Fp2Parameters> CanonicalDeserializeWithFlags for Fp2<P> {
458458
#[inline]
459459
fn deserialize_with_flags<R: Read, F: Flags>(mut reader: R) -> Result<(Self, F), SerializationError> {
460+
use web_sys::console;
461+
console::log_1(&"deserialize here fp2".into());
462+
460463
let c0: P::Fp = CanonicalDeserialize::deserialize_uncompressed(&mut reader)?;
461464
let (c1, flags): (P::Fp, _) = CanonicalDeserializeWithFlags::deserialize_with_flags(&mut reader)?;
462465
Ok((Fp2::new(c0, c1), flags))

‎fields/src/fp6_3over2.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,9 @@ impl<P: Fp6Parameters> Valid for Fp6<P> {
555555
impl<P: Fp6Parameters> CanonicalDeserializeWithFlags for Fp6<P> {
556556
#[inline]
557557
fn deserialize_with_flags<R: Read, F: Flags>(mut reader: R) -> Result<(Self, F), SerializationError> {
558+
use web_sys::console;
559+
console::log_1(&"deserialize here fp6".into());
560+
558561
let c0 = CanonicalDeserialize::deserialize_uncompressed(&mut reader)?;
559562
let c1 = CanonicalDeserialize::deserialize_uncompressed(&mut reader)?;
560563
let (c2, flags): (_, _) = CanonicalDeserializeWithFlags::deserialize_with_flags(&mut reader)?;

‎fields/src/macros.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@ macro_rules! impl_primefield_serializer {
282282
let flags = F::from_u8_remove_flags(&mut masked_bytes[output_byte_size - 1])
283283
.ok_or(SerializationError::UnexpectedFlags)?;
284284

285+
let formatted_string = format!("Flags found: {:?}", flags.u8_bitmask());
286+
// println!("Flags found: {}", )
287+
console::log_1(&formatted_string.into());
288+
285289
Ok((Self::read_le(&masked_bytes[..])?, flags))
286290
}
287291
}
@@ -309,6 +313,8 @@ macro_rules! impl_primefield_serializer {
309313
_validate: snarkvm_utilities::serialize::Validate,
310314
) -> Result<Self, snarkvm_utilities::SerializationError> {
311315
use snarkvm_utilities::serialize::EmptyFlags;
316+
use web_sys::console;
317+
console::log_1(&"deserialize here".into());
312318
Self::deserialize_with_flags::<R, EmptyFlags>(reader).map(|(r, _)| r)
313319
}
314320
}

‎parameters/src/testnet3/mod.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,16 @@ macro_rules! impl_web {
154154
let provider_lock = PARAMETER_PROVIDER.lock();
155155
match provider_lock {
156156
Ok(provider) => {
157-
//use web_sys::console;
157+
use web_sys::console;
158158

159159
let formatted_string = format!("{}: Loading Bytes", stringify!($name));
160-
// println!("{}: Loading Bytes", stringify!($name));
161-
//console::log_1(&formatted_string.into());
160+
println!("{}: Loading Bytes", stringify!($name));
161+
console::log_1(&formatted_string.into());
162162
let bytes = provider.get(stringify!($name));
163163
assert!(bytes.is_some(), "{} should be defined in the Parameter Provider", stringify!($name));
164164
let unwrapped_bytes = bytes.unwrap().clone();
165165
let formatted_string2 = format!("{}: Loaded Bytes Sucessfully", stringify!($name));
166-
//console::log_1(&formatted_string2.into());
166+
console::log_1(&formatted_string2.into());
167167
Ok(unwrapped_bytes)
168168
}
169169
Err(_) => {
@@ -260,22 +260,22 @@ macro_rules! insert_key {
260260
($map:ident, $string:tt, $type:ident<$network:ident>, ($name:tt, $circuit_key:expr)) => {{
261261
// Load the circuit key bytes.
262262
let formatted_string = format!("{}: Loading Circuit Keys", stringify!($string));
263-
//web_sys:://console::log_1(&formatted_string.into());
263+
web_sys::console::log_1(&formatted_string.into());
264264
let key_bytes: Vec<u8> = $circuit_key.expect(&format!("Failed to load {} bytes", $string));
265265
let formatted_string2 = format!("{}: Loaded Circuit Keys: {} Bytes", stringify!($string), key_bytes.len());
266-
//web_sys:://console::log_1(&formatted_string2.into());
266+
web_sys::console::log_1(&formatted_string2.into());
267267
// Recover the circuit key.
268268
let key = $type::<$network>::from_bytes_le(&key_bytes[2..]).expect(&format!("Failed to recover {}", $string));
269269
let formatted_string3 = format!("{}: Recovered Circuit Keys", stringify!($string));
270-
//web_sys:://console::log_1(&formatted_string3.into());
270+
web_sys::console::log_1(&formatted_string3.into());
271271
// Insert the circuit key.
272272
let thing = std::sync::Arc::new(key);
273273
let formatted_string10 = format!("{}: ARC Made", stringify!($string));
274-
//web_sys:://console::log_1(&formatted_string10.into());
274+
web_sys::console::log_1(&formatted_string10.into());
275275

276276
$map.insert($name.to_string(), thing);
277277
let formatted_string4 = format!("{}: Inserted Circuit Key", stringify!($string));
278-
//web_sys:://console::log_1(&formatted_string4.into());
278+
web_sys::console::log_1(&formatted_string4.into());
279279
}};
280280
}
281281

0 commit comments

Comments
 (0)