Merge remote-tracking branch 'origin/develop' into feature/reuse_init…

…_owner

clients/client-core/src/config/mod.rs

@@ -117,6 +117,10 @@ impl<T: NymConfig> Config<T> {
  self.client.id = id;
  }
 
+ pub fn with_testnet_mode(&mut self, testnet_mode: bool) {
+ self.client.testnet_mode = testnet_mode;
+ }
+
  pub fn with_gateway_endpoint<S: Into<String>>(&mut self, id: S, owner: S, listener: S) {
  self.client.gateway_endpoint = GatewayEndpoint {
  gateway_id: id.into(),

clients/native/src/client/mod.rs

@@ -185,17 +185,17 @@ impl NymClient {
  )
  .expect("Could not create bandwidth controller");
 
-  let mut gateway_client = GatewayClient::new(
-  gateway_address,
-  self.key_manager.identity_keypair(),
-  gateway_identity,
-  gateway_owner,
-  Some(self.key_manager.gateway_shared_key()),
-  mixnet_message_sender,
-  ack_sender,
-  self.config.get_base().get_gateway_response_timeout(),
-  Some(bandwidth_controller),
-  );
+ let mut gateway_client = GatewayClient::new(
+ gateway_address,
+ self.key_manager.identity_keypair(),
+ gateway_identity,
+ gateway_owner,
+ Some(self.key_manager.gateway_shared_key()),
+ mixnet_message_sender,
+ ack_sender,
+ self.config.get_base().get_gateway_response_timeout(),
+ Some(bandwidth_controller),
+ );
 
  if self.config.get_base().get_testnet_mode() {
  gateway_client.set_testnet_mode(true)

clients/native/src/commands/init.rs

@@ -251,20 +251,14 @@ pub async fn execute(matches: ArgMatches<'static>) {
 
  let chosen_gateway_id = matches.value_of("gateway");
 
- let registration_fut = async {
- let gate_details = gateway_details(
- config.get_base().get_validator_api_endpoints(),
- chosen_gateway_id,
- )
- .await;
- let shared_keys =
- register_with_gateway(&gate_details, key_manager.identity_keypair()).await;
- (shared_keys, gate_details)
- };
+ let gateway_details = gateway_details(
+ config.get_base().get_validator_api_endpoints(),
+ chosen_gateway_id,
+ )
+ .await;
+ let shared_keys =
+ register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
 
- // TODO: is there perhaps a way to make it work without having to spawn entire runtime?
- let rt = tokio::runtime::Runtime::new().unwrap();
- let (shared_keys, gateway_details) = rt.block_on(registration_fut);
  config.get_base_mut().with_gateway_endpoint(
  gateway_details.identity_key.to_base58_string(),
  gateway_details.owner.clone(),

clients/socks5/src/client/mod.rs

@@ -173,17 +173,17 @@ impl NymClient {
  )
  .expect("Could not create bandwidth controller");
 
-  let mut gateway_client = GatewayClient::new(
-  gateway_address,
-  self.key_manager.identity_keypair(),
-  gateway_identity,
-  gateway_owner,
-  Some(self.key_manager.gateway_shared_key()),
-  mixnet_message_sender,
-  ack_sender,
-  self.config.get_base().get_gateway_response_timeout(),
-  Some(bandwidth_controller),
-  );
+ let mut gateway_client = GatewayClient::new(
+ gateway_address,
+ self.key_manager.identity_keypair(),
+ gateway_identity,
+ gateway_owner,
+ Some(self.key_manager.gateway_shared_key()),
+ mixnet_message_sender,
+ ack_sender,
+ self.config.get_base().get_gateway_response_timeout(),
+ Some(bandwidth_controller),
+ );
 
  if self.config.get_base().get_testnet_mode() {
  gateway_client.set_testnet_mode(true)

clients/socks5/src/commands/init.rs

@@ -252,20 +252,14 @@ pub async fn execute(matches: ArgMatches<'static>) {
 
  let chosen_gateway_id = matches.value_of("gateway");
 
- let registration_fut = async {
- let gate_details = gateway_details(
- config.get_base().get_validator_api_endpoints(),
- chosen_gateway_id,
- )
- .await;
- let shared_keys =
- register_with_gateway(&gate_details, key_manager.identity_keypair()).await;
- (shared_keys, gate_details)
- };
+ let gateway_details = gateway_details(
+ config.get_base().get_validator_api_endpoints(),
+ chosen_gateway_id,
+ )
+ .await;
+ let shared_keys =
+ register_with_gateway(&gateway_details, key_manager.identity_keypair()).await;
 
- // TODO: is there perhaps a way to make it work without having to spawn entire runtime?
- let rt = tokio::runtime::Runtime::new().unwrap();
- let (shared_keys, gateway_details) = rt.block_on(registration_fut);
  config.get_base_mut().with_gateway_endpoint(
  gateway_details.identity_key.to_base58_string(),
  gateway_details.owner.clone(),

common/client-libs/gateway-client/src/bandwidth.rs

@@ -205,8 +205,7 @@ impl BandwidthController {
  &self.eth_private_key,
  )
  .await?;
- // 0 means a transaction failure, 1 means success
- if Some(U64::from(0)) == recipt.status {
+ if Some(U64::from(0u64)) == recipt.status {
  Err(GatewayClientError::BurnTokenError(
  web3::Error::InvalidResponse(format!(
  "Transaction status is 0 (failure): {:?}",

common/client-libs/validator-client/src/client.rs

@@ -159,13 +159,18 @@ impl Client<QueryNymdClient> {
  Some(config.vesting_contract_address.clone().unwrap_or_else(|| {
  cosmrs::AccountId::from_str(network_defaults::DEFAULT_VESTING_CONTRACT_ADDRESS)
  .unwrap()
- }),
- config
- .erc20_bridge_contract_address
- .clone()
- .unwrap_or_else(|| {
- cosmrs::AccountId::from_str(network_defaults::COSMOS_CONTRACT_ADDRESS).unwrap()
- }),
+ })),
+ Some(
+ config
+ .erc20_bridge_contract_address
+ .clone()
+ .unwrap_or_else(|| {
+ cosmrs::AccountId::from_str(
+ network_defaults::DEFAULT_BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+ )
+ .unwrap()
+ }),
+ ),
  )?;
 
  Ok(Client {
@@ -185,9 +190,9 @@ impl Client<QueryNymdClient> {
  pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
  self.nymd = NymdClient::connect(
  new_endpoint.as_ref(),
- self.mixnet_contract_address.clone().unwrap(),
- self.vesting_contract_address.clone().unwrap(),
- self.erc20_bridge_contract_address.clone().unwrap(),
+ self.mixnet_contract_address.clone(),
+ self.vesting_contract_address.clone(),
+ self.erc20_bridge_contract_address.clone(),
  )?;
  Ok(())
  }

common/client-libs/validator-client/src/nymd/mod.rs

@@ -61,18 +61,18 @@ pub struct NymdClient<C> {
 impl NymdClient<QueryNymdClient> {
  pub fn connect<U>(
  endpoint: U,
- mixnet_contract_address: AccountId,
- vesting_contract_address: AccountId,
- erc20_bridge_contract_address: AccountId,
+ mixnet_contract_address: Option<AccountId>,
+ vesting_contract_address: Option<AccountId>,
+ erc20_bridge_contract_address: Option<AccountId>,
  ) -> Result<NymdClient<QueryNymdClient>, NymdError>
  where
  U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
  {
  Ok(NymdClient {
  client: QueryNymdClient::new(endpoint)?,
- mixnet_contract_address: Some(mixnet_contract_address),
- vesting_contract_address: Some(vesting_contract_address),
- erc20_bridge_contract_address: Some(erc20_bridge_contract_address),
+ mixnet_contract_address,
+ vesting_contract_address,
+ erc20_bridge_contract_address,
  client_address: None,
  custom_gas_limits: Default::default(),
  simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,

common/network-defaults/src/lib.rs

@@ -112,8 +112,8 @@ pub const ETH_CONTRACT_ADDRESS: [u8; 20] =
  hex_literal::hex!("9fEE3e28c17dbB87310A51F13C4fbf4331A6f102");
 // Name of the event triggered by the eth contract. If the event name is changed,
 // this would also need to be changed; It is currently tested against the json abi
-pub const ETH_EVENT_NAME: &str = "Burned";
-pub const ETH_BURN_FUNCTION_NAME: &str = "burnTokenForAccessCode";
+pub const ETH_EVENT_NAME: &str = "BBCredentialPurchased";
+pub const ETH_BURN_FUNCTION_NAME: &str = "generateBasicBandwidthCredential";
 
 // Ethereum constants used for token bridge
 /// How much bandwidth (in bytes) one token can buy
@@ -124,11 +124,6 @@ pub const TOKENS_TO_BURN: u64 = 10;
 pub const BANDWIDTH_VALUE: u64 = TOKENS_TO_BURN * BYTES_PER_TOKEN;
 
 pub const ETH_MIN_BLOCK_DEPTH: usize = 7;
-pub const COSMOS_CONTRACT_ADDRESS: &str = "punk1jld76tqw4wnpfenmay2xkv86nr3j0w426eka82";
-// Name of the event triggered by the eth contract. If the event name is changed,
-// this would also need to be changed; It is currently tested against the json abi
-pub const ETH_EVENT_NAME: &str = "BBCredentialPurchased";
-pub const ETH_BURN_FUNCTION_NAME: &str = "generateBasicBandwidthCredential";
 
 /// Defaults Cosmos Hub/ATOM path
 pub const COSMOS_DERIVATION_PATH: &str = "m/44'/118'/0'/0/0";

explorer-api/src/client.rs

@@ -13,6 +13,7 @@ pub(crate) fn new_nymd_client() -> validator_client::Client<QueryNymdClient> {
  api_url,
  Some(mixnet_contract.parse().unwrap()),
  None,
+ None,
  );
 
  validator_client::Client::new_query(client_config).expect("Failed to connect to nymd!")