daod/ example: remove unnecessary Header from CallData + fix imports

bin/daod/src/example_contract/foo/validate.rs

@@ -1,7 +1,7 @@
 use pasta_curves::pallas;
 
 use darkfi::{
-    crypto::types::DrkCircuitField,
+    crypto::{keypair::PublicKey, types::DrkCircuitField},
     util::serial::{SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
@@ -31,12 +31,13 @@ impl From<DarkFiError> for Error {
 }
 
 pub struct CallData {
-    pub header: Header,
+    pub public_value: pallas::Base,
+    //pub signature_public: PublicKey,
 }
 
 impl CallDataBase for CallData {
     fn zk_public_values(&self) -> Vec<(String, Vec<DrkCircuitField>)> {
-        vec![("example-foo".to_string(), vec![self.header.public_c])]
+        vec![("example-foo".to_string(), vec![self.public_value])]
     }
 
     fn as_any(&self) -> &dyn Any {
@@ -44,11 +45,6 @@ impl CallDataBase for CallData {
     }
 }
 
-#[derive(Clone, SerialEncodable, SerialDecodable)]
-pub struct Header {
-    pub public_c: pallas::Base,
-}
-
 pub fn state_transition(
     states: &StateRegistry,
     func_call_index: usize,
@@ -65,11 +61,11 @@ pub fn state_transition(
 
     let example_state = states.lookup::<State>(&"Example".to_string()).unwrap();
 
-    if example_state.public_exists(&call_data.header.public_c) {
+    if example_state.public_exists(&call_data.public_value) {
         return Err(Error::ValueExists)
     }
 
-    Ok(Box::new(Update { public_value: call_data.header.public_c }))
+    Ok(Box::new(Update { public_value: call_data.public_value }))
 }
 
 #[derive(Clone)]

bin/daod/src/example_contract/foo/wallet.rs

@@ -5,13 +5,13 @@ use halo2_proofs::circuit::Value;
 use pasta_curves::pallas;
 
 use darkfi::{
-    crypto::Proof,
+    crypto::{keypair::SecretKey, Proof},
     zk::vm::{Witness, ZkCircuit},
 };
 
 use crate::{
     demo::{FuncCall, ZkContractInfo, ZkContractTable},
-    example_contract::foo::validate::{CallData, Header},
+    example_contract::foo::validate::CallData,
 };
 
 pub struct Foo {
@@ -21,6 +21,7 @@ pub struct Foo {
 
 pub struct Builder {
     pub foo: Foo,
+    pub signature_secret: SecretKey,
 }
 
 impl Builder {
@@ -56,9 +57,7 @@ impl Builder {
             .expect("Example::foo() proving error!)");
         proofs.push(input_proof);
 
-        let header = Header { public_c: c };
-
-        let call_data = CallData { header };
+        let call_data = CallData { public_value: c };
 
         FuncCall {
             contract_id: "Example".to_string(),