-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* reenable serde, now as feature flag 'serdes' * consolidate blst types into blst.rs and make aliases * make KeyImage a newtype around G1Affine, usable in a BTreeMap * obtain AMT_SIZE and BF_SIZE constants from std::mem::size_of() * make Dbc::owner() public api return blsttc::PublicKey instead of a G1Affine * add private Dbc::owner_blst() convenience fn. * remove unused DbcHelper
- Loading branch information
Showing
12 changed files
with
322 additions
and
225 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // Copyright 2021 MaidSafe.net limited. | ||
| // | ||
| // This SAFE Network Software is licensed to you under The General Public License (GPL), version 3. | ||
| // Unless required by applicable law or agreed to in writing, the SAFE Network Software distributed | ||
| // under the GPL Licence is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. Please review the Licences for the specific language governing | ||
| // permissions and limitations relating to use of the SAFE Network Software. | ||
|
|
||
| // This module defines blstrs aliases, wrappers, and helpers. | ||
| // | ||
| // blstrs types Scalar and G1Affine are used to represent distinct concepts | ||
| // in ringct such as: | ||
| // Scalar: SecretKey, BlindingFactor | ||
| // G1Affine: Commitment, PublicKey, KeyImage | ||
| // | ||
| // We provide type aliases to make the usage in each context clearer and to make the | ||
| // the sn_dbc public API simpler so that the caller should not need to depend on blstrs | ||
| // and use its types directly. | ||
| // | ||
| // Even sn_dbc uses the type aliases rather than directly using the blstrs types. | ||
| // | ||
| // We could consider moving some or all of this lower into blst_ringct to make these | ||
| // crates consistent. | ||
|
|
||
| use blstrs::{G1Affine, Scalar}; | ||
| use std::cmp::Ordering; | ||
| use std::hash::{Hash, Hasher}; | ||
|
|
||
| use blsttc::{PublicKey, SecretKey}; | ||
|
|
||
| #[cfg(feature = "serde")] | ||
| use serde::{Deserialize, Serialize}; | ||
|
|
||
| pub type SecretKeyBlst = Scalar; | ||
| pub type PublicKeyBlst = G1Affine; | ||
| pub type Commitment = G1Affine; | ||
| pub type BlindingFactor = Scalar; | ||
|
|
||
| // We use a NewType wrapper for KeyImage because it needs to be used | ||
| // as a key in a BTreeMap. | ||
| #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] | ||
| #[derive(Debug, Clone, Default)] | ||
| pub struct KeyImage(G1Affine); | ||
|
|
||
| impl PartialEq for KeyImage { | ||
| fn eq(&self, other: &Self) -> bool { | ||
| self.0.to_compressed() == other.0.to_compressed() | ||
| } | ||
| } | ||
|
|
||
| impl AsRef<G1Affine> for KeyImage { | ||
| fn as_ref(&self) -> &G1Affine { | ||
| &self.0 | ||
| } | ||
| } | ||
|
|
||
| impl Eq for KeyImage {} | ||
|
|
||
| impl PartialOrd for KeyImage { | ||
| fn partial_cmp(&self, other: &Self) -> Option<Ordering> { | ||
| Some(self.cmp(other)) | ||
| } | ||
| } | ||
|
|
||
| impl Ord for KeyImage { | ||
| fn cmp(&self, other: &Self) -> Ordering { | ||
| self.0.to_compressed().cmp(&other.0.to_compressed()) | ||
| } | ||
| } | ||
|
|
||
| impl Hash for KeyImage { | ||
| fn hash<H: Hasher>(&self, state: &mut H) { | ||
| let bytes = self.0.to_compressed(); | ||
| bytes.hash(state); | ||
| } | ||
| } | ||
|
|
||
| impl From<G1Affine> for KeyImage { | ||
| fn from(k: G1Affine) -> Self { | ||
| Self(k) | ||
| } | ||
| } | ||
|
|
||
| // temporary: should go away once blsttc is integrated with with blstrs | ||
| pub struct BlsHelper {} | ||
|
|
||
| impl BlsHelper { | ||
| #[allow(dead_code)] | ||
| pub fn blsttc_to_blstrs_sk(sk: SecretKey) -> SecretKeyBlst { | ||
| let bytes = sk.to_bytes(); | ||
| SecretKeyBlst::from_bytes_be(&bytes).unwrap() | ||
| } | ||
|
|
||
| pub fn blsttc_to_blstrs_pubkey(pk: &PublicKey) -> PublicKeyBlst { | ||
| let bytes = pk.to_bytes(); | ||
| // fixme: unwrap | ||
| PublicKeyBlst::from_compressed(&bytes).unwrap() | ||
| } | ||
|
|
||
| pub fn blstrs_to_blsttc_pubkey(pk: &PublicKeyBlst) -> PublicKey { | ||
| let bytes = pk.to_compressed(); | ||
| // fixme: unwrap | ||
| PublicKey::from_bytes(bytes).unwrap() | ||
| } | ||
|
|
||
| pub fn blstrs_to_blsttc_sk(sk: SecretKeyBlst) -> SecretKey { | ||
| let bytes = sk.to_bytes_be(); | ||
| // fixme: unwrap | ||
| SecretKey::from_bytes(bytes).unwrap() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.