Ver código fonte

changed asset_id type to jubjub::Fr on mint/spend contracts

lunar-mining 4 anos atrás
pai
commit
2cc8d30f19
2 arquivos alterados com 4 adições e 4 exclusões
  1. 2 2
      src/circuit/mint_contract.rs
  2. 2 2
      src/circuit/spend_contract.rs

+ 2 - 2
src/circuit/mint_contract.rs

@@ -15,7 +15,7 @@ use zcash_proofs::circuit::{ecc, pedersen_hash};
 
 
 pub struct MintContract {
 pub struct MintContract {
     pub value: Option<u64>,
     pub value: Option<u64>,
-    pub asset_id: Option<u64>,
+    pub asset_id: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
     pub randomness_asset: Option<jubjub::Fr>,
     pub randomness_asset: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
@@ -34,7 +34,7 @@ impl Circuit<bls12_381::Scalar> for MintContract {
         )?;
         )?;
 
 
         // Line 19: u64_as_binary_le asset_id param:asset_id
         // Line 19: u64_as_binary_le asset_id param:asset_id
-        let asset_id = boolean::u64_into_boolean_vec_le(
+        let asset_id = boolean::field_into_boolean_vec_le(
             cs.namespace(|| "Line 19: u64_as_binary_le asset_id param:asset_id"),
             cs.namespace(|| "Line 19: u64_as_binary_le asset_id param:asset_id"),
             self.asset_id,
             self.asset_id,
         )?;
         )?;

+ 2 - 2
src/circuit/spend_contract.rs

@@ -17,7 +17,7 @@ use crate::crypto::merkle_node::SAPLING_COMMITMENT_TREE_DEPTH;
 
 
 pub struct SpendContract {
 pub struct SpendContract {
     pub value: Option<u64>,
     pub value: Option<u64>,
-    pub asset_id: Option<u64>,
+    pub asset_id: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
     pub randomness_value: Option<jubjub::Fr>,
     pub randomness_asset: Option<jubjub::Fr>,
     pub randomness_asset: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
     pub serial: Option<jubjub::Fr>,
@@ -39,7 +39,7 @@ impl Circuit<bls12_381::Scalar> for SpendContract {
         )?;
         )?;
 
 
         // Line 41: u64_as_binary_le asset_id param:asset_id
         // Line 41: u64_as_binary_le asset_id param:asset_id
-        let asset_id = boolean::u64_into_boolean_vec_le(
+        let asset_id = boolean::field_into_boolean_vec_le(
             cs.namespace(|| "Line 41: u64_as_binary_le value param:value"),
             cs.namespace(|| "Line 41: u64_as_binary_le value param:value"),
             self.asset_id,
             self.asset_id,
         )?;
         )?;