GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add proper creation of bandwidth attributes

Browse Source
This commit is contained in:
aniampio
2021-10-20 16:35:13 +01:00
parent 2e8a0e9a72
commit 9110a8eefd
7 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/native/src/client/mod.rs
+7 -6
View File
@@ -22,8 +22,8 @@ use client_core::client::topology_control::{
TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
};
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
use coconut_interface::{Credential, hash_to_scalar};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE};
use coconut_interface::{Credential, hash_to_scalar, Parameters};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
use credentials::obtain_aggregate_verification_key;
use crypto::asymmetric::identity;
use futures::channel::mpsc;
@@ -173,15 +173,16 @@ impl NymClient {
.await
.expect("could not obtain aggregate verification key of validators");
let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
let bandwidth_credential_attributes = BandwidthVoucherAttributes{
serial_number : hash_to_scalar(self.key_manager.identity_keypair().public_key().to_bytes()),
binding_number : hash_to_scalar(self.key_manager.identity_keypair().public_key().to_bytes()),
serial_number : params.random_scalar(),
binding_number : params.random_scalar(),
voucher_value : hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
voucher_info : hash_to_scalar("BANDWIDTH_VOUCHER".as_bytes()),
voucher_info : hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
};
let bandwidth_credential = credentials::bandwidth::obtain_signature(
&params,
&bandwidth_credential_attributes,
&self.config.get_base().get_validator_api_endpoints(),
&verification_key,
clients/native/src/commands/init.rs
+7 -7
View File
@@ -6,9 +6,9 @@ use crate::commands::override_config;
use clap::{App, Arg, ArgMatches};
use client_core::client::key_manager::KeyManager;
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
use coconut_interface::{Credential, hash_to_scalar};
use coconut_interface::{Credential, hash_to_scalar, Parameters};
use config::NymConfig;
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
use credentials::obtain_aggregate_verification_key;
use crypto::asymmetric::{encryption, identity};
use gateway_client::GatewayClient;
@@ -67,15 +67,15 @@ async fn prepare_temporary_credential(validators: &[Url], raw_identity: &[u8]) -
.await
.expect("could not obtain aggregate verification key of validators");
let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
let bandwidth_credential_attributes = BandwidthVoucherAttributes{
serial_number : hash_to_scalar(raw_identity),
binding_number : hash_to_scalar(raw_identity),
serial_number : params.random_scalar(),
binding_number : params.random_scalar(),
voucher_value : hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
voucher_info : hash_to_scalar("BANDWIDTH_VOUCHER".as_bytes()),
voucher_info : hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
};
let bandwidth_credential = credentials::bandwidth::obtain_signature(&bandwidth_credential_attributes, validators, &verification_key)
let bandwidth_credential = credentials::bandwidth::obtain_signature(&params, &bandwidth_credential_attributes, validators, &verification_key)
.await
.expect("could not obtain bandwidth credential");
clients/socks5/src/client/mod.rs
+7 -6
View File
@@ -23,8 +23,8 @@ use client_core::client::topology_control::{
TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
};
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
use coconut_interface::{Credential, hash_to_scalar};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE};
use coconut_interface::{Credential, hash_to_scalar, Parameters};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
use credentials::obtain_aggregate_verification_key;
use crypto::asymmetric::identity;
use futures::channel::mpsc;
@@ -161,15 +161,16 @@ impl NymClient {
.await
.expect("could not obtain aggregate verification key of validators");
let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
let bandwidth_credential_attributes = BandwidthVoucherAttributes{
serial_number : hash_to_scalar(self.key_manager.identity_keypair().public_key().to_bytes()),
binding_number : hash_to_scalar(self.key_manager.identity_keypair().public_key().to_bytes()),
serial_number : params.random_scalar(),
binding_number : params.random_scalar(),
voucher_value : hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
voucher_info : hash_to_scalar("BANDWIDTH_VOUCHER".as_bytes()),
voucher_info : hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
};
let bandwidth_credential = credentials::bandwidth::obtain_signature(
&params,
&bandwidth_credential_attributes,
&self.config.get_base().get_validator_api_endpoints(),
&verification_key,
clients/socks5/src/commands/init.rs
+7 -7
View File
@@ -6,9 +6,9 @@ use crate::commands::override_config;
use clap::{App, Arg, ArgMatches};
use client_core::client::key_manager::KeyManager;
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
use coconut_interface::{Credential, hash_to_scalar};
use coconut_interface::{Credential, hash_to_scalar, Parameters};
use config::NymConfig;
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
use credentials::obtain_aggregate_verification_key;
use crypto::asymmetric::{encryption, identity};
use gateway_client::GatewayClient;
@@ -67,15 +67,15 @@ async fn prepare_temporary_credential(validators: &[Url], raw_identity: &[u8]) -
.await
.expect("could not obtain aggregate verification key of validators");
let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
let bandwidth_credential_attributes = BandwidthVoucherAttributes{
serial_number : hash_to_scalar(raw_identity),
binding_number : hash_to_scalar(raw_identity),
serial_number : params.random_scalar(),
binding_number : params.random_scalar(),
voucher_value : hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
voucher_info : hash_to_scalar("BANDWIDTH_VOUCHER".as_bytes()),
voucher_info : hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
};
let bandwidth_credential = credentials::bandwidth::obtain_signature(&bandwidth_credential_attributes, validators, &verification_key)
let bandwidth_credential = credentials::bandwidth::obtain_signature(&params, &bandwidth_credential_attributes, validators, &verification_key)
.await
.expect("could not obtain bandwidth credential");
common/credentials/src/bandwidth.rs
+1 -4
View File
@@ -48,11 +48,8 @@ impl BandwidthVoucherAttributes {
}
// TODO: this definitely has to be moved somewhere else. It's just a temporary solution
pub async fn obtain_signature(attributes: &BandwidthVoucherAttributes, validators: &[Url], verification_key: &VerificationKey) -> Result<Signature, Error> {
// let public_attributes = vec![hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes())];
// let private_attributes = vec![hash_to_scalar(raw_identity)];
pub async fn obtain_signature(params: &Parameters, attributes: &BandwidthVoucherAttributes, validators: &[Url], verification_key: &VerificationKey) -> Result<Signature, Error> {
let params = Parameters::new(TOTAL_ATTRIBUTES)?;
let public_attributes = attributes.get_public_attributes();
let private_attributes = attributes.get_private_attributes();
common/nymcoconut/src/scheme/setup.rs
+1 -1
View File
@@ -69,7 +69,7 @@ impl Parameters {
&self.hs
}
pub(crate) fn random_scalar(&self) -> Scalar {
pub fn random_scalar(&self) -> Scalar {
// lazily-initialized thread-local random number generator, seeded by the system
let mut rng = thread_rng();
Scalar::random(&mut rng)
validator-api/src/network_monitor/mod.rs
+7 -7
View File
@@ -15,8 +15,8 @@ use crate::network_monitor::monitor::summary_producer::SummaryProducer;
use crate::network_monitor::monitor::Monitor;
use crate::network_monitor::tested_network::TestedNetwork;
use crate::storage::NodeStatusStorage;
use coconut_interface::{Credential, hash_to_scalar};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE};
use coconut_interface::{Credential, hash_to_scalar, Parameters};
use credentials::bandwidth::{prepare_for_spending, BandwidthVoucherAttributes, BANDWIDTH_VALUE, TOTAL_ATTRIBUTES};
use credentials::obtain_aggregate_verification_key;
use crypto::asymmetric::{encryption, identity};
use futures::channel::mpsc;
@@ -175,16 +175,16 @@ async fn TEMPORARY_obtain_bandwidth_credential(
.await
.expect("could not obtain aggregate verification key of ALL validators");
let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
let bandwidth_credential_attributes = BandwidthVoucherAttributes{
serial_number : hash_to_scalar(identity.to_bytes()),
binding_number : hash_to_scalar(identity.to_bytes()),
serial_number : params.random_scalar(),
binding_number : params.random_scalar(),
voucher_value : hash_to_scalar(BANDWIDTH_VALUE.to_be_bytes()),
voucher_info : hash_to_scalar("BANDWIDTH_VOUCHER".as_bytes()),
voucher_info : hash_to_scalar(String::from("BandwidthVoucher").as_bytes()),
};
let bandwidth_credential =
credentials::bandwidth::obtain_signature(&bandwidth_credential_attributes, &validators, &verification_key)
credentials::bandwidth::obtain_signature(&params, &bandwidth_credential_attributes, &validators, &verification_key)
.await
.expect("failed to obtain bandwidth credential!");