remove MockSignedPod (#339)
- breaking change: Removal of MockSignedPod. Use SignedPod instead. - breaking change: Redefinition of numerical id for values of PodType.
This commit is contained in:
GitHub
parent
06b84e8dca
commit
b5e0d97cb6
14 changed files with 79 additions and 358 deletions
|
|
@ -1477,7 +1477,7 @@ pub(crate) mod tests {
|
|||
let params = Params::default();
|
||||
let config = CircuitConfig::standard_recursion_config();
|
||||
|
||||
let custom_predicate_batch = eth_dos_batch(¶ms, false)?;
|
||||
let custom_predicate_batch = eth_dos_batch(¶ms)?;
|
||||
|
||||
for (i, cp) in custom_predicate_batch.predicates().iter().enumerate() {
|
||||
let mut builder = CircuitBuilder::<F, D>::new(config.clone());
|
||||
|
|
@ -1540,7 +1540,7 @@ pub(crate) mod tests {
|
|||
helper_custom_predicate_batch_target_id(¶ms, &custom_predicate_batch).unwrap();
|
||||
|
||||
// Some cases from the examples
|
||||
let custom_predicate_batch = eth_dos_batch(¶ms, false)?;
|
||||
let custom_predicate_batch = eth_dos_batch(¶ms)?;
|
||||
helper_custom_predicate_batch_target_id(¶ms, &custom_predicate_batch).unwrap();
|
||||
|
||||
let custom_predicate_batch =
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ use crate::{
|
|||
deserialize_proof,
|
||||
emptypod::EmptyPod,
|
||||
error::{Error, Result},
|
||||
mock::{emptypod::MockEmptyPod, signedpod::MockSignedPod},
|
||||
mock::emptypod::MockEmptyPod,
|
||||
primitives::merkletree::MerkleClaimAndProof,
|
||||
recursion::{hash_verifier_data, RecursiveCircuit, RecursiveParams},
|
||||
serialize_proof,
|
||||
|
|
@ -267,12 +267,7 @@ pub(crate) fn layout_statements(
|
|||
statements.push(middleware::Statement::None.into());
|
||||
|
||||
// Input signed pods region
|
||||
let dummy_signed_pod_box: Box<dyn Pod> =
|
||||
if mock || inputs.signed_pods.len() == params.max_input_signed_pods {
|
||||
Box::new(MockSignedPod::dummy())
|
||||
} else {
|
||||
Box::new(SignedPod::dummy())
|
||||
};
|
||||
let dummy_signed_pod_box: Box<dyn Pod> = Box::new(SignedPod::dummy());
|
||||
let dummy_signed_pod = dummy_signed_pod_box.as_ref();
|
||||
assert!(inputs.signed_pods.len() <= params.max_input_signed_pods);
|
||||
for i in 0..params.max_input_signed_pods {
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@ use crate::{
|
|||
process_private_statements_operations, process_public_statements_operations, Operation,
|
||||
Statement,
|
||||
},
|
||||
mock::{emptypod::MockEmptyPod, signedpod::MockSignedPod},
|
||||
mock::emptypod::MockEmptyPod,
|
||||
primitives::merkletree::MerkleClaimAndProof,
|
||||
recursion::hash_verifier_data,
|
||||
signedpod::SignedPod,
|
||||
},
|
||||
middleware::{
|
||||
self, deserialize_pod, deserialize_signed_pod, hash_str, AnchoredKey, Hash, MainPodInputs,
|
||||
|
|
@ -187,7 +188,7 @@ impl MockMainPod {
|
|||
// get the id out of the public statements
|
||||
let id: PodId = PodId(calculate_id(&public_statements, params));
|
||||
|
||||
let pad_signed_pod: Box<dyn Pod> = Box::new(MockSignedPod::dummy());
|
||||
let pad_signed_pod: Box<dyn Pod> = Box::new(SignedPod::dummy());
|
||||
let input_signed_pods: Vec<Box<dyn Pod>> = inputs
|
||||
.signed_pods
|
||||
.iter()
|
||||
|
|
@ -425,7 +426,7 @@ pub mod tests {
|
|||
|
||||
use super::*;
|
||||
use crate::{
|
||||
backends::plonky2::mock::signedpod::MockSigner,
|
||||
backends::plonky2::{primitives::ec::schnorr::SecretKey, signedpod::Signer},
|
||||
examples::{
|
||||
great_boy_pod_full_flow, tickets_pod_full_flow, zu_kyc_pod_builder,
|
||||
zu_kyc_sign_pod_builders, MOCK_VD_SET,
|
||||
|
|
@ -440,17 +441,11 @@ pub mod tests {
|
|||
let vd_set = &*MOCK_VD_SET;
|
||||
let (gov_id_builder, pay_stub_builder, sanction_list_builder) =
|
||||
zu_kyc_sign_pod_builders(¶ms);
|
||||
let mut signer = MockSigner {
|
||||
pk: "ZooGov".into(),
|
||||
};
|
||||
let mut signer = Signer(SecretKey(1u32.into()));
|
||||
let gov_id_pod = gov_id_builder.sign(&mut signer)?;
|
||||
let mut signer = MockSigner {
|
||||
pk: "ZooDeel".into(),
|
||||
};
|
||||
let mut signer = Signer(SecretKey(2u32.into()));
|
||||
let pay_stub_pod = pay_stub_builder.sign(&mut signer)?;
|
||||
let mut signer = MockSigner {
|
||||
pk: "ZooOFAC".into(),
|
||||
};
|
||||
let mut signer = Signer(SecretKey(3u32.into()));
|
||||
let sanction_list_pod = sanction_list_builder.sign(&mut signer)?;
|
||||
let kyc_builder = zu_kyc_pod_builder(
|
||||
¶ms,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
pub mod emptypod;
|
||||
pub mod mainpod;
|
||||
pub mod signedpod;
|
||||
|
|
|
|||
|
|
@ -1,233 +0,0 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use itertools::Itertools;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
backends::plonky2::{
|
||||
error::{Error, Result},
|
||||
primitives::merkletree::MerkleTree,
|
||||
},
|
||||
middleware::{
|
||||
containers::Dictionary, hash_str, serialization::ordered_map, AnchoredKey, Key, Params,
|
||||
Pod, PodId, PodSigner, PodType, RawValue, Statement, Value, KEY_SIGNER, KEY_TYPE, SELF,
|
||||
},
|
||||
};
|
||||
|
||||
pub struct MockSigner {
|
||||
pub pk: String,
|
||||
}
|
||||
|
||||
impl MockSigner {
|
||||
pub fn public_key(&self) -> Value {
|
||||
Value::from(hash_str(&self.pk))
|
||||
}
|
||||
}
|
||||
|
||||
impl MockSigner {
|
||||
fn _sign(&mut self, params: &Params, kvs: &HashMap<Key, Value>) -> Result<MockSignedPod> {
|
||||
let mut kvs = kvs.clone();
|
||||
let pubkey = self.public_key();
|
||||
kvs.insert(Key::from(KEY_SIGNER), pubkey.clone());
|
||||
kvs.insert(Key::from(KEY_TYPE), Value::from(PodType::MockSigned));
|
||||
|
||||
let dict = Dictionary::new(params.max_depth_mt_containers, kvs.clone())?;
|
||||
let id = PodId(dict.commitment());
|
||||
let signature = format!("{}_signed_by_{}", id, pubkey);
|
||||
Ok(MockSignedPod {
|
||||
mt_max_depth: params.max_depth_mt_containers,
|
||||
id,
|
||||
signature,
|
||||
kvs,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl PodSigner for MockSigner {
|
||||
fn sign(&mut self, params: &Params, kvs: &HashMap<Key, Value>) -> Result<Box<dyn Pod>> {
|
||||
Ok(self._sign(params, kvs).map(Box::new)?)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct MockSignedPod {
|
||||
mt_max_depth: usize,
|
||||
id: PodId,
|
||||
signature: String,
|
||||
kvs: HashMap<Key, Value>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Data {
|
||||
mt_max_depth: usize,
|
||||
signature: String,
|
||||
#[serde(serialize_with = "ordered_map")]
|
||||
kvs: HashMap<Key, Value>,
|
||||
}
|
||||
|
||||
impl MockSignedPod {
|
||||
pub fn signature(&self) -> String {
|
||||
self.signature.clone()
|
||||
}
|
||||
|
||||
pub(crate) fn deserialize(id: PodId, data: serde_json::Value) -> Result<Box<dyn Pod>> {
|
||||
let data: Data = serde_json::from_value(data)?;
|
||||
Ok(Box::new(Self {
|
||||
mt_max_depth: data.mt_max_depth,
|
||||
id,
|
||||
signature: data.signature,
|
||||
kvs: data.kvs,
|
||||
}))
|
||||
}
|
||||
/// Generate a valid MockSignedPod with a public deterministic public key and no other
|
||||
/// key-values than the default ones. This is used for padding.
|
||||
pub fn dummy() -> MockSignedPod {
|
||||
MockSigner {
|
||||
pk: "dummy".to_string(),
|
||||
}
|
||||
._sign(&Params::default(), &HashMap::new())
|
||||
.expect("valid")
|
||||
}
|
||||
}
|
||||
|
||||
impl Pod for MockSignedPod {
|
||||
fn params(&self) -> &Params {
|
||||
panic!("MockSignedPod doesn't have params");
|
||||
}
|
||||
fn verify(&self) -> Result<()> {
|
||||
// 1. Verify id
|
||||
let mt = MerkleTree::new(
|
||||
self.mt_max_depth,
|
||||
&self
|
||||
.kvs
|
||||
.iter()
|
||||
.map(|(k, v)| (k.raw(), v.raw()))
|
||||
.collect::<HashMap<RawValue, RawValue>>(),
|
||||
)?;
|
||||
let id = PodId(mt.root());
|
||||
if id != self.id {
|
||||
return Err(Error::id_not_equal(self.id, id));
|
||||
}
|
||||
|
||||
// 2. Verify type
|
||||
let value_at_type = self
|
||||
.kvs
|
||||
.get(&Key::from(KEY_TYPE))
|
||||
.ok_or(Error::key_not_found())?;
|
||||
if &Value::from(PodType::MockSigned) != value_at_type {
|
||||
return Err(Error::type_not_equal(
|
||||
PodType::MockSigned,
|
||||
value_at_type.clone(),
|
||||
));
|
||||
}
|
||||
|
||||
// 3. Verify signature
|
||||
let pk_hash = self
|
||||
.kvs
|
||||
.get(&Key::from(KEY_SIGNER))
|
||||
.ok_or(Error::key_not_found())?;
|
||||
let signature = format!("{}_signed_by_{}", id, pk_hash);
|
||||
if signature != self.signature {
|
||||
return Err(Error::custom(format!(
|
||||
"signature does not match, expected {}, computed {}",
|
||||
self.id, id
|
||||
)));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn id(&self) -> PodId {
|
||||
self.id
|
||||
}
|
||||
fn pod_type(&self) -> (usize, &'static str) {
|
||||
(PodType::MockSigned as usize, "MockSigned")
|
||||
}
|
||||
|
||||
fn pub_self_statements(&self) -> Vec<Statement> {
|
||||
// By convention we put the KEY_TYPE first and KEY_SIGNER second
|
||||
let mut kvs = self.kvs.clone();
|
||||
let key_type = Key::from(KEY_TYPE);
|
||||
let value_type = kvs.remove(&key_type).expect("KEY_TYPE");
|
||||
let key_signer = Key::from(KEY_SIGNER);
|
||||
let value_signer = kvs.remove(&key_signer).expect("KEY_SIGNER");
|
||||
[(key_type, value_type), (key_signer, value_signer)]
|
||||
.into_iter()
|
||||
.chain(kvs.into_iter().sorted_by_key(|kv| kv.0.hash()))
|
||||
.map(|(k, v)| Statement::equal(AnchoredKey::from((SELF, k)), v))
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn serialize_data(&self) -> serde_json::Value {
|
||||
serde_json::to_value(Data {
|
||||
mt_max_depth: self.mt_max_depth,
|
||||
signature: self.signature.clone(),
|
||||
kvs: self.kvs.clone(),
|
||||
})
|
||||
.expect("serialization to json")
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use std::{any::Any, iter};
|
||||
|
||||
use plonky2::field::types::Field;
|
||||
|
||||
use super::*;
|
||||
use crate::{
|
||||
frontend,
|
||||
middleware::{self, EMPTY_VALUE, F},
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn test_mock_signed_0() -> Result<()> {
|
||||
let params = middleware::Params::default();
|
||||
let mut pod = frontend::SignedPodBuilder::new(¶ms);
|
||||
pod.insert("idNumber", "4242424242");
|
||||
pod.insert("dateOfBirth", 1169909384);
|
||||
pod.insert("socialSecurityNumber", "G2121210");
|
||||
|
||||
let mut signer = MockSigner { pk: "Molly".into() };
|
||||
let pod = pod.sign(&mut signer).unwrap();
|
||||
let pod = (pod.pod as Box<dyn Any>)
|
||||
.downcast::<MockSignedPod>()
|
||||
.unwrap();
|
||||
|
||||
pod.verify()?;
|
||||
println!("id: {}", pod.id());
|
||||
println!("kvs: {:?}", pod.kvs());
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
bad_pod.signature = "".into();
|
||||
assert!(bad_pod.verify().is_err());
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
bad_pod.id.0 .0[0] = F::ZERO;
|
||||
assert!(bad_pod.verify().is_err());
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
let bad_kv = (Key::from(KEY_SIGNER), Value::from(EMPTY_VALUE));
|
||||
let bad_kvs = bad_pod
|
||||
.kvs
|
||||
.clone()
|
||||
.into_iter()
|
||||
.chain(iter::once(bad_kv))
|
||||
.collect::<HashMap<Key, Value>>();
|
||||
bad_pod.kvs = bad_kvs;
|
||||
assert!(bad_pod.verify().is_err());
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
let bad_kv = (Key::from(KEY_TYPE), Value::from(0));
|
||||
let bad_kvs = bad_pod
|
||||
.kvs
|
||||
.clone()
|
||||
.into_iter()
|
||||
.chain(iter::once(bad_kv))
|
||||
.collect::<HashMap<Key, Value>>();
|
||||
bad_pod.kvs = bad_kvs;
|
||||
assert!(bad_pod.verify().is_err());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
|
@ -53,8 +53,8 @@ impl Signer {
|
|||
self.sign_with_nonce(params, nonce, kvs)
|
||||
}
|
||||
|
||||
pub fn public_key(&self) -> Point {
|
||||
self.0.public_key()
|
||||
pub fn public_key(&self) -> Value {
|
||||
Value::from(self.0.public_key())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue