Просмотр исходного кода

consensus/validator: Add placeholder for DAO contract deployment.

parazyd 3 лет назад
Родитель
Сommit
b57b11042f
2 измененных файлов с 17 добавлено и 13 удалено
  1. 17 6
      src/consensus/validator.rs
  2. 0 7
      src/zk/proof.rs

+ 17 - 6
src/consensus/validator.rs

@@ -144,16 +144,27 @@ impl ValidatorState {
         // in the money contract.
         let money_contract_deploy_payload = serialize(&faucet_pubkeys);
 
+        //let dao_contract_id = ContractId::from(pallas::Base::from(u64::MAX - 421));
+        //let dao_contract_deploy_payload = vec![];
+
         // In this hashmap, we keep references to ZK proof verifying keys needed
         // for the circuits our native contracts provide.
         let mut verifying_keys = HashMap::new();
 
-        let native_contracts = vec![(
-            "Money Contract",
-            money_contract_id,
-            include_bytes!("../contract/money/money_contract.wasm"),
-            money_contract_deploy_payload,
-        )];
+        let native_contracts = vec![
+            (
+                "Money Contract",
+                money_contract_id,
+                include_bytes!("../contract/money/money_contract.wasm").to_vec(),
+                money_contract_deploy_payload,
+            ),
+            //(
+            //    "DAO Contract",
+            //    dao_contract_id,
+            //    include_bytes!("../contract/dao/dao_contract.wasm").to_vec(),
+            //    dao_contract_deploy_payload,
+            //),
+        ];
 
         info!("Deploying native wasm contracts");
         for nc in native_contracts {

+ 0 - 7
src/zk/proof.rs

@@ -26,13 +26,6 @@ use halo2_proofs::{
 use pasta_curves::{pallas, vesta};
 use rand::RngCore;
 
-// TODO: this API needs rework. It's not very good.
-// keygen_pk() takes a VerifyingKey by value,
-// yet ProvingKey also provides get_vk() -> &VerifyingKey
-//
-// Maybe we should just use the native halo2 types instead of wrapping them.
-// We can avoid double creating the vk when we call VerifyingKey::build(), ProvingKey::build()
-
 #[derive(Clone, Debug)]
 pub struct VerifyingKey {
     pub params: Params<vesta::Affine>,