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

crypto: change Mint/BurnRevealedValues::make_ouputs to return Vec<DrkCircuitField>

lunar-mining 4 лет назад
Родитель
Сommit
a1ff7e8f44
2 измененных файлов с 7 добавлено и 4 удалено
  1. 1 1
      src/crypto/burn_proof.rs
  2. 6 3
      src/crypto/mint_proof.rs

+ 1 - 1
src/crypto/burn_proof.rs

@@ -87,7 +87,7 @@ impl BurnRevealedValues {
         }
         }
     }
     }
 
 
-    pub fn make_outputs(&self) -> [DrkCircuitField; 8] {
+    pub fn make_outputs(&self) -> Vec<DrkCircuitField> {
         let value_coords = self.value_commit.to_affine().coordinates().unwrap();
         let value_coords = self.value_commit.to_affine().coordinates().unwrap();
         let token_coords = self.token_commit.to_affine().coordinates().unwrap();
         let token_coords = self.token_commit.to_affine().coordinates().unwrap();
         let merkle_root = self.merkle_root.0;
         let merkle_root = self.merkle_root.0;

+ 6 - 3
src/crypto/mint_proof.rs

@@ -3,7 +3,7 @@ use std::time::Instant;
 use halo2_gadgets::poseidon::primitives as poseidon;
 use halo2_gadgets::poseidon::primitives as poseidon;
 use halo2_proofs::circuit::Value;
 use halo2_proofs::circuit::Value;
 use log::debug;
 use log::debug;
-use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
+use pasta_curves::{arithmetic::CurveAffine, group::Curve};
 use rand::rngs::OsRng;
 use rand::rngs::OsRng;
 
 
 use crate::{
 use crate::{
@@ -11,7 +11,10 @@ use crate::{
         coin::Coin,
         coin::Coin,
         keypair::PublicKey,
         keypair::PublicKey,
         proof::{Proof, ProvingKey, VerifyingKey},
         proof::{Proof, ProvingKey, VerifyingKey},
-        types::{DrkCoinBlind, DrkSerial, DrkTokenId, DrkValue, DrkValueBlind, DrkValueCommit},
+        types::{
+            DrkCircuitField, DrkCoinBlind, DrkSerial, DrkTokenId, DrkValue, DrkValueBlind,
+            DrkValueCommit,
+        },
         util::{pedersen_commitment_base, pedersen_commitment_u64},
         util::{pedersen_commitment_base, pedersen_commitment_u64},
     },
     },
     util::serial::{SerialDecodable, SerialEncodable},
     util::serial::{SerialDecodable, SerialEncodable},
@@ -50,7 +53,7 @@ impl MintRevealedValues {
         MintRevealedValues { value_commit, token_commit, coin: Coin(coin) }
         MintRevealedValues { value_commit, token_commit, coin: Coin(coin) }
     }
     }
 
 
-    pub fn make_outputs(&self) -> [pallas::Base; 5] {
+    pub fn make_outputs(&self) -> Vec<DrkCircuitField> {
         let value_coords = self.value_commit.to_affine().coordinates().unwrap();
         let value_coords = self.value_commit.to_affine().coordinates().unwrap();
         let token_coords = self.token_commit.to_affine().coordinates().unwrap();
         let token_coords = self.token_commit.to_affine().coordinates().unwrap();