From 73d53653db18dff38b63b4598b9275044e22c029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C8=99u?= Date: Tue, 16 May 2023 15:15:35 +0200 Subject: [PATCH 01/16] Link coconut flag with the functionality in the sdk --- service-providers/network-requester/src/core.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs index 9db226857a..c4d4ac8efd 100644 --- a/service-providers/network-requester/src/core.rs +++ b/service-providers/network-requester/src/core.rs @@ -485,16 +485,21 @@ async fn create_mixnet_client( let storage_paths = nym_sdk::mixnet::StoragePaths::from(config); - let mixnet_client = + let mut client_builder = nym_sdk::mixnet::MixnetClientBuilder::new_with_default_storage(storage_paths) .await .map_err(|err| NetworkRequesterError::FailedToSetupMixnetClient { source: err })? .network_details(NymNetworkDetails::new_from_env()) .debug_config(debug_config) - .registered_gateway(config.get_gateway_endpoint_config().clone()) - .build() - .await - .map_err(|err| NetworkRequesterError::FailedToSetupMixnetClient { source: err })?; + .registered_gateway(config.get_gateway_endpoint_config().clone()); + if !config.get_disabled_credentials_mode() { + client_builder = client_builder.enable_credentials_mode(); + } + + let mixnet_client = client_builder + .build() + .await + .map_err(|err| NetworkRequesterError::FailedToSetupMixnetClient { source: err })?; mixnet_client .connect_to_mixnet() From 5b02801c0487297cb9f1e8c966e5ccb02e3959ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Thu, 25 May 2023 13:54:30 +0200 Subject: [PATCH 02/16] nym-cli: support name-service contract (#3404) * nym-cli: support name-service contract * rustfmt * Fix querying names and service-providers * Tidy some logging * Fix table headers * Remove expect from register/delete names --- Cargo.lock | 1 + .../validator-client/src/nym_api/mod.rs | 13 ++++- .../validator-client/src/nym_api/routes.rs | 3 +- .../validator-client/src/nyxd/mod.rs | 6 +-- common/commands/Cargo.toml | 1 + .../src/validator/mixnet/operators/mod.rs | 3 ++ .../validator/mixnet/operators/name/delete.rs | 25 +++++++++ .../validator/mixnet/operators/name/mod.rs | 19 +++++++ .../mixnet/operators/name/register.rs | 43 +++++++++++++++ .../src/validator/mixnet/query/mod.rs | 3 ++ .../validator/mixnet/query/query_all_names.rs | 53 +++++++++++++++++++ .../query/query_all_service_providers.rs | 6 +-- .../name-service/src/lib.rs | 2 + nym-api/src/nym_contract_cache/cache/data.rs | 4 +- nym-api/src/nym_contract_cache/cache/mod.rs | 4 +- nym-api/src/nym_contract_cache/mod.rs | 2 +- nym-api/src/nym_contract_cache/routes.rs | 2 +- .../src/validator/mixnet/operators/mod.rs | 9 ++-- .../validator/mixnet/operators/name/mod.rs | 28 ++++++++++ .../nym-cli/src/validator/mixnet/query/mod.rs | 7 +++ 20 files changed, 215 insertions(+), 19 deletions(-) create mode 100644 common/commands/src/validator/mixnet/operators/name/delete.rs create mode 100644 common/commands/src/validator/mixnet/operators/name/mod.rs create mode 100644 common/commands/src/validator/mixnet/operators/name/register.rs create mode 100644 common/commands/src/validator/mixnet/query/query_all_names.rs create mode 100644 tools/nym-cli/src/validator/mixnet/operators/name/mod.rs diff --git a/Cargo.lock b/Cargo.lock index adf2ab3d00..ca90aba388 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3265,6 +3265,7 @@ dependencies = [ "nym-crypto", "nym-mixnet-contract-common", "nym-multisig-contract-common", + "nym-name-service-common", "nym-network-defaults", "nym-service-provider-directory-common", "nym-validator-client", diff --git a/common/client-libs/validator-client/src/nym_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs index a98ce62754..283f12d4a7 100644 --- a/common/client-libs/validator-client/src/nym_api/mod.rs +++ b/common/client-libs/validator-client/src/nym_api/mod.rs @@ -15,7 +15,8 @@ use nym_api_requests::models::{ }; use nym_mixnet_contract_common::mixnode::MixNodeDetails; use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId}; -use nym_service_provider_directory_common::ServiceInfo; +use nym_name_service_common::response::NamesListResponse; +use nym_service_provider_directory_common::response::ServicesListResponse; use reqwest::{Response, StatusCode}; use serde::{Deserialize, Serialize}; use url::Url; @@ -484,10 +485,18 @@ impl Client { .await } - pub async fn get_service_providers(&self) -> Result, NymAPIError> { + pub async fn get_service_providers(&self) -> Result { + log::trace!("Getting service providers"); self.query_nym_api(&[routes::API_VERSION, routes::SERVICE_PROVIDERS], NO_PARAMS) .await } + + //pub async fn get_registered_names(&self) -> Result, NymAPIError> { + pub async fn get_registered_names(&self) -> Result { + log::trace!("Getting registered names"); + self.query_nym_api(&[routes::API_VERSION, routes::REGISTERED_NAMES], NO_PARAMS) + .await + } } // utility function that should solve the double slash problem in validator API forever. diff --git a/common/client-libs/validator-client/src/nym_api/routes.rs b/common/client-libs/validator-client/src/nym_api/routes.rs index 12722757dc..fd97047b6a 100644 --- a/common/client-libs/validator-client/src/nym_api/routes.rs +++ b/common/client-libs/validator-client/src/nym_api/routes.rs @@ -33,4 +33,5 @@ pub const AVG_UPTIME: &str = "avg_uptime"; pub const STAKE_SATURATION: &str = "stake-saturation"; pub const INCLUSION_CHANCE: &str = "inclusion-probability"; -pub const SERVICE_PROVIDERS: &str = "service-providers"; +pub const SERVICE_PROVIDERS: &str = "services"; +pub const REGISTERED_NAMES: &str = "names"; diff --git a/common/client-libs/validator-client/src/nyxd/mod.rs b/common/client-libs/validator-client/src/nyxd/mod.rs index 20276ab609..58890e8621 100644 --- a/common/client-libs/validator-client/src/nyxd/mod.rs +++ b/common/client-libs/validator-client/src/nyxd/mod.rs @@ -16,7 +16,7 @@ use cosmrs::rpc::query::Query; use cosmrs::rpc::Error as TendermintRpcError; use cosmrs::rpc::HttpClientUrl; use cosmrs::tx::Msg; -use log::debug; +use log::{debug, trace}; use nym_network_defaults::{ChainDetails, NymNetworkDetails}; use serde::{Deserialize, Serialize}; use std::convert::TryInto; @@ -79,8 +79,8 @@ impl Config { expected_prefix: &str, ) -> Result, NyxdError> { if let Some(address) = raw { - debug!("Raw address:{:?}", raw); - debug!("Expected prefix:{:?}", expected_prefix); + trace!("Raw address:{:?}", raw); + trace!("Expected prefix:{:?}", expected_prefix); let parsed: AccountId = address .parse() .map_err(|_| NyxdError::MalformedAccountAddress(address.clone()))?; diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml index 3e3a99f712..6fd2eae958 100644 --- a/common/commands/Cargo.toml +++ b/common/commands/Cargo.toml @@ -39,3 +39,4 @@ nym-coconut-bandwidth-contract-common = { path = "../cosmwasm-smart-contracts/co nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" } nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" } nym-service-provider-directory-common = { path = "../cosmwasm-smart-contracts/service-provider-directory" } +nym-name-service-common = { path = "../cosmwasm-smart-contracts/name-service" } diff --git a/common/commands/src/validator/mixnet/operators/mod.rs b/common/commands/src/validator/mixnet/operators/mod.rs index aa8af7d314..fa92fb5518 100644 --- a/common/commands/src/validator/mixnet/operators/mod.rs +++ b/common/commands/src/validator/mixnet/operators/mod.rs @@ -5,6 +5,7 @@ use clap::{Args, Subcommand}; pub mod gateway; pub mod mixnode; +pub mod name; pub mod service; #[derive(Debug, Args)] @@ -22,4 +23,6 @@ pub enum MixnetOperatorsCommands { Gateway(gateway::MixnetOperatorsGateway), /// Manage your service ServiceProvider(service::MixnetOperatorsService), + /// Manage your registered name + Name(name::MixnetOperatorsName), } diff --git a/common/commands/src/validator/mixnet/operators/name/delete.rs b/common/commands/src/validator/mixnet/operators/name/delete.rs new file mode 100644 index 0000000000..558dbf190c --- /dev/null +++ b/common/commands/src/validator/mixnet/operators/name/delete.rs @@ -0,0 +1,25 @@ +use clap::Parser; +use log::{error, info}; +use nym_name_service_common::NameId; +use nym_validator_client::nyxd::{error::NyxdError, traits::NameServiceSigningClient}; +use tap::TapFallible; + +use crate::context::SigningClient; + +#[derive(Debug, Parser)] +pub struct Args { + #[clap(long)] + pub id: NameId, +} + +pub async fn delete(args: Args, client: SigningClient) -> Result<(), NyxdError> { + info!("Deleting registered name alias with id {}", args.id); + + let res = client + .delete_name_by_id(args.id, None) + .await + .tap_err(|err| error!("Failed to delete name: {err:#?}"))?; + + info!("Deleted: {res:?}"); + Ok(()) +} diff --git a/common/commands/src/validator/mixnet/operators/name/mod.rs b/common/commands/src/validator/mixnet/operators/name/mod.rs new file mode 100644 index 0000000000..a1e2733ac5 --- /dev/null +++ b/common/commands/src/validator/mixnet/operators/name/mod.rs @@ -0,0 +1,19 @@ +use clap::{Args, Subcommand}; + +pub mod delete; +pub mod register; + +#[derive(Debug, Args)] +#[clap(args_conflicts_with_subcommands = true, subcommand_required = true)] +pub struct MixnetOperatorsName { + #[clap(subcommand)] + pub command: MixnetOperatorsNameCommands, +} + +#[derive(Debug, Subcommand)] +pub enum MixnetOperatorsNameCommands { + /// Register a name alias for a nym address + Register(register::Args), + /// Delete name alias for a nym address + Delete(delete::Args), +} diff --git a/common/commands/src/validator/mixnet/operators/name/register.rs b/common/commands/src/validator/mixnet/operators/name/register.rs new file mode 100644 index 0000000000..6458faf8a6 --- /dev/null +++ b/common/commands/src/validator/mixnet/operators/name/register.rs @@ -0,0 +1,43 @@ +use clap::Parser; +use log::{error, info}; +use nym_name_service_common::{Address, Coin, NymName}; +use nym_validator_client::nyxd::{error::NyxdError, traits::NameServiceSigningClient}; +use tap::TapFallible; + +use crate::context::SigningClient; + +#[derive(Debug, Parser)] +pub struct Args { + /// Name alias + #[clap(long)] + pub name: String, + + /// Nym address that the alias is pointing to + #[clap(long)] + pub nym_address: String, + + /// Deposit to be made to the service provider directory, in curent DENOMINATION (e.g. 'unym') + #[clap(long)] + pub deposit: u128, +} + +pub async fn register(args: Args, client: SigningClient) -> Result<(), NyxdError> { + info!( + "Registering name alias '{}' for nym address '{}'", + args.name, args.nym_address + ); + + let name = NymName::new(&args.name).expect("invalid name"); + let address = Address::new(&args.nym_address); + + let denom = client.current_chain_details().mix_denom.base.as_str(); + let deposit = Coin::new(args.deposit, denom); + + let res = client + .register_name(name, address, deposit.into(), None) + .await + .tap_err(|err| error!("Failed to register name: {err:#?}"))?; + + info!("Registered name: {res:?}"); + Ok(()) +} diff --git a/common/commands/src/validator/mixnet/query/mod.rs b/common/commands/src/validator/mixnet/query/mod.rs index 79481a728a..2a6c04c312 100644 --- a/common/commands/src/validator/mixnet/query/mod.rs +++ b/common/commands/src/validator/mixnet/query/mod.rs @@ -5,6 +5,7 @@ use clap::{Args, Subcommand}; pub mod query_all_gateways; pub mod query_all_mixnodes; +pub mod query_all_names; pub mod query_all_service_providers; #[derive(Debug, Args)] @@ -22,4 +23,6 @@ pub enum MixnetQueryCommands { Gateways(query_all_gateways::Args), /// Query announced service-providers ServiceProviders(query_all_service_providers::Args), + /// Query registed names + Names(query_all_names::Args), } diff --git a/common/commands/src/validator/mixnet/query/query_all_names.rs b/common/commands/src/validator/mixnet/query/query_all_names.rs new file mode 100644 index 0000000000..e3bb24ebae --- /dev/null +++ b/common/commands/src/validator/mixnet/query/query_all_names.rs @@ -0,0 +1,53 @@ +// Copyright 2023 - Nym Technologies SA +// SPDX-License-Identifier: Apache-2.0 + +use clap::Parser; +use comfy_table::Table; +use nym_validator_client::nym_api::error::NymAPIError; + +use crate::context::QueryClientWithNyxd; +use crate::utils::show_error; + +#[derive(Debug, Parser)] +pub struct Args { + #[clap(value_parser)] + #[clap(help = "Optionally, the registered name to display")] + pub name: Option, +} + +pub async fn query(args: Args, client: &QueryClientWithNyxd) { + log::trace!("Querying all registered names"); + + match client.nym_api.get_registered_names().await { + Ok(res) => { + if let Some(name) = args.name { + let name = res.names.iter().find(|name_entry| { + name_entry.name.name.to_string().eq_ignore_ascii_case(&name) + }); + println!( + "{}", + ::serde_json::to_string_pretty(&name).expect("json formatting error") + ); + } else { + let mut table = Table::new(); + + table.set_header(vec!["Name Id", "Owner", "Nym Address", "Name"]); + for name_entry in res.names { + table.add_row(vec![ + name_entry.name_id.to_string(), + name_entry.name.owner.to_string(), + name_entry.name.address.to_string(), + name_entry.name.name.to_string(), + ]); + } + + println!("The registered names in the directory are:"); + println!("{table}"); + } + } + Err(NymAPIError::NotFound) => { + println!("nym-api reports no name endpoint available"); + } + Err(e) => show_error(e), + } +} diff --git a/common/commands/src/validator/mixnet/query/query_all_service_providers.rs b/common/commands/src/validator/mixnet/query/query_all_service_providers.rs index d3cb805d38..f803078eb8 100644 --- a/common/commands/src/validator/mixnet/query/query_all_service_providers.rs +++ b/common/commands/src/validator/mixnet/query/query_all_service_providers.rs @@ -19,7 +19,7 @@ pub async fn query(args: Args, client: &QueryClientWithNyxd) { match client.nym_api.get_service_providers().await { Ok(res) => { if let Some(nym_address) = args.nym_address { - let service = res.iter().find(|service| { + let service = res.services.iter().find(|service| { service .service .nym_address @@ -33,8 +33,8 @@ pub async fn query(args: Args, client: &QueryClientWithNyxd) { } else { let mut table = Table::new(); - table.set_header(vec!["Service Id", "Announcer", "Nym Address"]); - for service in res { + table.set_header(vec!["Service Id", "Announcer", "Type", "Nym Address"]); + for service in res.services { table.add_row(vec![ service.service_id.to_string(), service.service.announcer.to_string(), diff --git a/common/cosmwasm-smart-contracts/name-service/src/lib.rs b/common/cosmwasm-smart-contracts/name-service/src/lib.rs index f456db01aa..4609473c60 100644 --- a/common/cosmwasm-smart-contracts/name-service/src/lib.rs +++ b/common/cosmwasm-smart-contracts/name-service/src/lib.rs @@ -5,3 +5,5 @@ pub mod types; // Re-export all types at the top-level pub use types::*; + +pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction}; diff --git a/nym-api/src/nym_contract_cache/cache/data.rs b/nym-api/src/nym_contract_cache/cache/data.rs index 98c0046620..adde788bab 100644 --- a/nym-api/src/nym_contract_cache/cache/data.rs +++ b/nym-api/src/nym_contract_cache/cache/data.rs @@ -26,7 +26,7 @@ pub(crate) struct ValidatorCacheData { pub(crate) mix_to_family: Cache>, pub(crate) service_providers: Cache>, - pub(crate) names: Cache>, + pub(crate) registered_names: Cache>, } impl ValidatorCacheData { @@ -42,7 +42,7 @@ impl ValidatorCacheData { current_reward_params: Cache::default(), mix_to_family: Cache::default(), service_providers: Cache::default(), - names: Cache::default(), + registered_names: Cache::default(), } } } diff --git a/nym-api/src/nym_contract_cache/cache/mod.rs b/nym-api/src/nym_contract_cache/cache/mod.rs index 76d033da40..73b9699c6a 100644 --- a/nym-api/src/nym_contract_cache/cache/mod.rs +++ b/nym-api/src/nym_contract_cache/cache/mod.rs @@ -66,7 +66,7 @@ impl NymContractCache { cache.mix_to_family.update(mix_to_family); // Just return empty lists when these are not available cache.service_providers.update(services.unwrap_or_default()); - cache.names.update(names.unwrap_or_default()); + cache.registered_names.update(names.unwrap_or_default()); } Err(err) => { error!("{err}"); @@ -305,7 +305,7 @@ impl NymContractCache { pub(crate) async fn names(&self) -> Cache> { match time::timeout(Duration::from_millis(100), self.inner.read()).await { - Ok(cache) => cache.names.clone(), + Ok(cache) => cache.registered_names.clone(), Err(err) => { error!("{err}"); Cache::new(Vec::new()) diff --git a/nym-api/src/nym_contract_cache/mod.rs b/nym-api/src/nym_contract_cache/mod.rs index bdc1fe6882..2926a3304f 100644 --- a/nym-api/src/nym_contract_cache/mod.rs +++ b/nym-api/src/nym_contract_cache/mod.rs @@ -29,7 +29,7 @@ pub(crate) fn nym_contract_cache_routes(settings: &OpenApiSettings) -> (Vec) -> Json) -> Json { +pub async fn get_registered_names(cache: &State) -> Json { let names = cache.names().await.value; Json(names.as_slice().into()) } diff --git a/tools/nym-cli/src/validator/mixnet/operators/mod.rs b/tools/nym-cli/src/validator/mixnet/operators/mod.rs index 780886e40c..4111cb4608 100644 --- a/tools/nym-cli/src/validator/mixnet/operators/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/operators/mod.rs @@ -6,6 +6,7 @@ use nym_network_defaults::NymNetworkDetails; pub(crate) mod gateways; pub(crate) mod mixnodes; +pub(crate) mod name; pub(crate) mod services; pub(crate) async fn execute( @@ -16,11 +17,11 @@ pub(crate) async fn execute( match operators.command { nym_cli_commands::validator::mixnet::operators::MixnetOperatorsCommands::Gateway( gateway, - ) => gateways::execute(global_args, gateway, network_details).await?, + ) => gateways::execute(global_args, gateway, network_details).await, nym_cli_commands::validator::mixnet::operators::MixnetOperatorsCommands::Mixnode( mixnode, - ) => mixnodes::execute(global_args, mixnode, network_details).await?, - nym_cli_commands::validator::mixnet::operators::MixnetOperatorsCommands::ServiceProvider(service) => services::execute(global_args, service, network_details).await?, + ) => mixnodes::execute(global_args, mixnode, network_details).await, + nym_cli_commands::validator::mixnet::operators::MixnetOperatorsCommands::ServiceProvider(service) => services::execute(global_args, service, network_details).await, + nym_cli_commands::validator::mixnet::operators::MixnetOperatorsCommands::Name(name) => name::execute(global_args, name, network_details).await, } - Ok(()) } diff --git a/tools/nym-cli/src/validator/mixnet/operators/name/mod.rs b/tools/nym-cli/src/validator/mixnet/operators/name/mod.rs new file mode 100644 index 0000000000..d7873a9839 --- /dev/null +++ b/tools/nym-cli/src/validator/mixnet/operators/name/mod.rs @@ -0,0 +1,28 @@ +use nym_cli_commands::context::{create_signing_client, ClientArgs}; +use nym_network_defaults::NymNetworkDetails; + +pub(crate) async fn execute( + global_args: ClientArgs, + name: nym_cli_commands::validator::mixnet::operators::name::MixnetOperatorsName, + network_details: &NymNetworkDetails, +) -> anyhow::Result<()> { + let res = match name.command { + nym_cli_commands::validator::mixnet::operators::name::MixnetOperatorsNameCommands::Register(register) => { + let res = nym_cli_commands::validator::mixnet::operators::name::register::register(register, create_signing_client(global_args, network_details)?).await; + match res { + Ok(_) => println!("Successfully registered the name"), + Err(_) => println!("Failed to register name") + }; + res + }, + nym_cli_commands::validator::mixnet::operators::name::MixnetOperatorsNameCommands::Delete(delete) => { + let res = nym_cli_commands::validator::mixnet::operators::name::delete::delete(delete, create_signing_client(global_args, network_details)?).await; + match res { + Ok(_) => println!("Successfully deleted the name"), + Err(_) => println!("Failed to delete name") + }; + res + }, + }; + Ok(res?) +} diff --git a/tools/nym-cli/src/validator/mixnet/query/mod.rs b/tools/nym-cli/src/validator/mixnet/query/mod.rs index 0edc62c9bb..8f0e299720 100644 --- a/tools/nym-cli/src/validator/mixnet/query/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/query/mod.rs @@ -30,6 +30,13 @@ pub(crate) async fn execute( ) .await } + nym_cli_commands::validator::mixnet::query::MixnetQueryCommands::Names(args) => { + nym_cli_commands::validator::mixnet::query::query_all_names::query( + args, + &create_query_client_with_nym_api(network_details)?, + ) + .await + } } Ok(()) } From ce380a6b0d0341f298472da7be92945fde277e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Thu, 25 May 2023 15:45:40 +0200 Subject: [PATCH 03/16] Native nym-connect clients for iOS and Android (initial version) (#3452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * initial crate * foomp * Make it work for x86_64-linux-android * remove unused stuff * Add header * another layer of hacks * additional target os locking * cleanup * bootstrap android app * android jni function * instructions + xcode project * update jni name * add native socks5 class * typo * gitkeep android native lib path * add native socks5 class * add socks5 native lib in java * add build script * fix jni dependency declaration * wip * Update build.sh * Move build.sh to new subdir * rename to build-android.sh * fix typo in FFI function name * use a good SP * wip not crashing state * add android network permissions * android_logging * starting client on button in swift + safer ffi * set tag for libnyms5 logs * testing callbacks * android: start socks5 process in a separated thread * non-blocking client with callbacks * Remove the old non-working logger * Restore commented out functionality in socks5 client * basic file write/load + possible android fix * Fully working state (minus task manager) * Remove unused function * data persistence + cb with address * Remove stray old MyClass file from the merge * Make storage_dir and Option * Fix char_p for android * Android now works with the new branch * Tidy up a little in the jni code * Move android mod to seperate file * jni wrap start/stop * Add android build to Makefile * android: add basic UI and start/stop actions * typo * add nym word * dirty persistence restored * dirty android fixes * even dirtier workaround * Move rust crate to sdk/lib * Update cargo.toml * Strip release binary * Update lib name in android project * Move ios project to nym-connect directory * remove old gitignore file * Move ios client one step deeper * fixed xcode lib paths * removed old tracked file * move android app under new path * a bit of cleanup * hopefully fixing the CI issues (🤞) * Update Makefile * android: add better support for persistent state * updating ios UI on ffi callbacks * missing dead code * Added toggle button (wip) * swapped connect and disconnect methods around * icon * fixed android build * reset button + reuse service provider * disabling reset button * android: run proxy in a worker as foreground service * todo user cancel action * android build script: add aarch64 * add stop action from notification * add simple callbacks to the socks5 bridge * pick a sp randomly * pass stop cb to lib call * add loading state support * refactor(android): base connection state on callback calls * android: add optimistic ui * android: unique instance of libnym * removing deadcode --------- Co-authored-by: Jędrzej Stuczyński Co-authored-by: pierre Co-authored-by: Mark Sinclair --- Cargo.lock | 17 - Cargo.toml | 2 +- clients/socks5/src/commands/run.rs | 4 +- clients/webassembly/src/client/mod.rs | 2 +- .../client-core/src/client/base_client/mod.rs | 18 +- .../src/client/base_client/storage/mod.rs | 27 +- .../src/client/topology_control/mod.rs | 6 +- common/client-core/src/config/mod.rs | 42 +- common/client-core/src/init/mod.rs | 9 +- common/config/src/lib.rs | 26 +- .../multisig-contract/Cargo.toml | 1 - common/socks5-client-core/src/config/mod.rs | 18 +- .../src/config/old_config_v1_1_13.rs | 4 +- common/socks5-client-core/src/lib.rs | 186 +- contracts/Cargo.lock | 1 - nym-connect/desktop/Cargo.lock | 17 - nym-connect/desktop/src-tauri/src/tasks.rs | 5 +- nym-connect/native/android/.gitignore | 15 + nym-connect/native/android/app/.gitignore | 1 + nym-connect/native/android/app/build.gradle | 74 + .../native/android/app/proguard-rules.pro | 21 + .../nymtech/nyms5/ExampleInstrumentedTest.kt | 24 + .../android/app/src/main/AndroidManifest.xml | 39 + .../src/main/java/net/nymtech/nyms5/App.kt | 24 + .../net/nymtech/nyms5/CustomWorkerFactory.kt | 26 + .../java/net/nymtech/nyms5/MainActivity.kt | 162 + .../main/java/net/nymtech/nyms5/NymProxy.kt | 42 + .../java/net/nymtech/nyms5/ProxyWorker.kt | 149 + .../java/net/nymtech/nyms5/Socks5ViewModel.kt | 135 + .../java/net/nymtech/nyms5/ui/theme/Color.kt | 11 + .../java/net/nymtech/nyms5/ui/theme/Theme.kt | 70 + .../java/net/nymtech/nyms5/ui/theme/Type.kt | 34 + .../app/src/main/jniLibs/arm64-v8a/.gitkeep | 0 .../app/src/main/jniLibs/x86_64/.gitkeep | 0 .../drawable-v24/ic_launcher_foreground.xml | 30 + .../res/drawable/ic_launcher_background.xml | 170 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values/colors.xml | 10 + .../app/src/main/res/values/strings.xml | 12 + .../app/src/main/res/values/themes.xml | 5 + .../app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../java/net/nymtech/nyms5/ExampleUnitTest.kt | 17 + nym-connect/native/android/build.gradle | 6 + nym-connect/native/android/gradle.properties | 23 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + nym-connect/native/android/gradlew | 185 + nym-connect/native/android/gradlew.bat | 89 + nym-connect/native/android/settings.gradle | 16 + nym-connect/native/ios/.gitignore | 2 + nym-connect/native/ios/README.MD | 58 + .../Socks5/Socks5.xcodeproj/project.pbxproj | 388 ++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 13 + .../Socks5/Assets.xcassets/Contents.json | 6 + .../ios/Socks5/Socks5/ContentView.swift | 147 + .../Extensions/ClientState+String.swift | 21 + .../Preview Assets.xcassets/Contents.json | 6 + .../native/ios/Socks5/Socks5/RustSocks5.swift | 99 + .../Socks5/Socks5/Socks5-Bridging-Header.h | 13 + .../native/ios/Socks5/Socks5/Socks5App.swift | 17 + nym-wallet/Cargo.lock | 17 - sdk/lib/socks5-listener/Cargo.lock | 5252 +++++++++++++++++ sdk/lib/socks5-listener/Cargo.toml | 40 + sdk/lib/socks5-listener/Makefile | 47 + .../socks5-listener/build-android-darwin.sh | 10 + sdk/lib/socks5-listener/build-android.sh | 16 + sdk/lib/socks5-listener/socks5_c.h | 92 + sdk/lib/socks5-listener/src/android.rs | 99 + .../src/bin/generate-headers.rs | 6 + sdk/lib/socks5-listener/src/lib.rs | 288 + sdk/lib/socks5-listener/src/persistence.rs | 75 + sdk/rust/nym-sdk/src/mixnet/client.rs | 10 +- 87 files changed, 8352 insertions(+), 221 deletions(-) create mode 100644 nym-connect/native/android/.gitignore create mode 100644 nym-connect/native/android/app/.gitignore create mode 100644 nym-connect/native/android/app/build.gradle create mode 100644 nym-connect/native/android/app/proguard-rules.pro create mode 100644 nym-connect/native/android/app/src/androidTest/java/net/nymtech/nyms5/ExampleInstrumentedTest.kt create mode 100644 nym-connect/native/android/app/src/main/AndroidManifest.xml create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/App.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/CustomWorkerFactory.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/NymProxy.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ProxyWorker.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/Socks5ViewModel.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Color.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Theme.kt create mode 100644 nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Type.kt create mode 100644 nym-connect/native/android/app/src/main/jniLibs/arm64-v8a/.gitkeep create mode 100644 nym-connect/native/android/app/src/main/jniLibs/x86_64/.gitkeep create mode 100644 nym-connect/native/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 nym-connect/native/android/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 nym-connect/native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 nym-connect/native/android/app/src/main/res/values/colors.xml create mode 100644 nym-connect/native/android/app/src/main/res/values/strings.xml create mode 100644 nym-connect/native/android/app/src/main/res/values/themes.xml create mode 100644 nym-connect/native/android/app/src/main/res/xml/backup_rules.xml create mode 100644 nym-connect/native/android/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 nym-connect/native/android/app/src/test/java/net/nymtech/nyms5/ExampleUnitTest.kt create mode 100644 nym-connect/native/android/build.gradle create mode 100644 nym-connect/native/android/gradle.properties create mode 100644 nym-connect/native/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 nym-connect/native/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 nym-connect/native/android/gradlew create mode 100644 nym-connect/native/android/gradlew.bat create mode 100644 nym-connect/native/android/settings.gradle create mode 100644 nym-connect/native/ios/.gitignore create mode 100644 nym-connect/native/ios/README.MD create mode 100644 nym-connect/native/ios/Socks5/Socks5.xcodeproj/project.pbxproj create mode 100644 nym-connect/native/ios/Socks5/Socks5.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 nym-connect/native/ios/Socks5/Socks5.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 nym-connect/native/ios/Socks5/Socks5/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 nym-connect/native/ios/Socks5/Socks5/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 nym-connect/native/ios/Socks5/Socks5/Assets.xcassets/Contents.json create mode 100644 nym-connect/native/ios/Socks5/Socks5/ContentView.swift create mode 100644 nym-connect/native/ios/Socks5/Socks5/Extensions/ClientState+String.swift create mode 100644 nym-connect/native/ios/Socks5/Socks5/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 nym-connect/native/ios/Socks5/Socks5/RustSocks5.swift create mode 100644 nym-connect/native/ios/Socks5/Socks5/Socks5-Bridging-Header.h create mode 100644 nym-connect/native/ios/Socks5/Socks5/Socks5App.swift create mode 100644 sdk/lib/socks5-listener/Cargo.lock create mode 100644 sdk/lib/socks5-listener/Cargo.toml create mode 100644 sdk/lib/socks5-listener/Makefile create mode 100755 sdk/lib/socks5-listener/build-android-darwin.sh create mode 100755 sdk/lib/socks5-listener/build-android.sh create mode 100644 sdk/lib/socks5-listener/socks5_c.h create mode 100644 sdk/lib/socks5-listener/src/android.rs create mode 100644 sdk/lib/socks5-listener/src/bin/generate-headers.rs create mode 100644 sdk/lib/socks5-listener/src/lib.rs create mode 100644 sdk/lib/socks5-listener/src/persistence.rs diff --git a/Cargo.lock b/Cargo.lock index adf2ab3d00..2fccd20b81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1248,22 +1248,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw3-fixed-multisig" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", - "cw3", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "cw4" version = "0.13.4" @@ -3783,7 +3767,6 @@ dependencies = [ "cosmwasm-std", "cw-utils", "cw3", - "cw3-fixed-multisig", "cw4", "schemars", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2dc2f24aed..e909f44f53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ default-members = [ "explorer-api", ] -exclude = ["explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"] +exclude = ["sdk/lib/socks5-listener", "explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"] [workspace.package] authors = ["Nym Technologies SA"] diff --git a/clients/socks5/src/commands/run.rs b/clients/socks5/src/commands/run.rs index dc2b5648a3..26f2014d7a 100644 --- a/clients/socks5/src/commands/run.rs +++ b/clients/socks5/src/commands/run.rs @@ -9,6 +9,7 @@ use crate::{ use clap::Args; use log::*; use nym_bin_common::version_checker::is_minor_version_compatible; +use nym_client_core::client::base_client::storage::OnDiskPersistent; use nym_config::NymConfig; use nym_crypto::asymmetric::identity; use nym_socks5_client_core::{config::Config, NymClient}; @@ -138,5 +139,6 @@ pub(crate) async fn execute(args: &Run) -> Result<(), Box Option> { + fn topology_provider(&mut self) -> Option> { if let Some(hardcoded_topology) = self.custom_topology.take() { Some(Box::new(HardcodedTopologyProvider::new(hardcoded_topology))) } else { diff --git a/common/client-core/src/client/base_client/mod.rs b/common/client-core/src/client/base_client/mod.rs index e804c1fccf..f4b0e9307a 100644 --- a/common/client-core/src/client/base_client/mod.rs +++ b/common/client-core/src/client/base_client/mod.rs @@ -41,13 +41,14 @@ use nym_sphinx::receiver::{ReconstructedMessage, SphinxMessageReceiver}; use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths}; use nym_task::{TaskClient, TaskManager}; use nym_topology::provider_trait::TopologyProvider; -use rand::thread_rng; +use rand::rngs::OsRng; use std::sync::Arc; use tap::TapFallible; use url::Url; #[cfg(target_arch = "wasm32")] use nym_bandwidth_controller::wasm_mockups::DkgQueryClient; + #[cfg(not(target_arch = "wasm32"))] use nym_validator_client::nyxd::traits::DkgQueryClient; @@ -163,7 +164,7 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> { reply_storage_backend: S::ReplyStore, key_store: S::KeyStore, - custom_topology_provider: Option>, + custom_topology_provider: Option>, bandwidth_controller: Option>, managed_keys: ManagedKeys, } @@ -216,7 +217,10 @@ where } } - pub fn with_topology_provider(mut self, provider: Box) -> Self { + pub fn with_topology_provider( + mut self, + provider: Box, + ) -> Self { self.custom_topology_provider = Some(provider); self } @@ -367,9 +371,9 @@ where } fn setup_topology_provider( - custom_provider: Option>, + custom_provider: Option>, nym_api_urls: Vec, - ) -> Box { + ) -> Box { // if no custom provider was ... provided ..., create one using nym-api custom_provider.unwrap_or_else(|| { Box::new(NymApiTopologyProvider::new( @@ -382,7 +386,7 @@ where // future responsible for periodically polling directory server and updating // the current global view of topology async fn start_topology_refresher( - topology_provider: Box, + topology_provider: Box, topology_config: config::Topology, topology_accessor: TopologyAccessor, mut shutdown: TaskClient, @@ -469,7 +473,7 @@ where async fn initial_key_setup(&mut self) { assert!(!self.managed_keys.is_valid()); - let mut rng = thread_rng(); + let mut rng = OsRng; self.managed_keys = ManagedKeys::load_or_generate(&mut rng, &self.key_store).await; } diff --git a/common/client-core/src/client/base_client/storage/mod.rs b/common/client-core/src/client/base_client/storage/mod.rs index 9bc0881619..f04f431151 100644 --- a/common/client-core/src/client/base_client/storage/mod.rs +++ b/common/client-core/src/client/base_client/storage/mod.rs @@ -12,9 +12,14 @@ use nym_credential_storage::ephemeral_storage::{ }; use nym_credential_storage::storage::Storage as CredentialStorage; +#[cfg(not(target_arch = "wasm32"))] +use crate::client::base_client::non_wasm_helpers; #[cfg(not(target_arch = "wasm32"))] use crate::client::key_manager::persistence::OnDiskKeys; - +#[cfg(not(target_arch = "wasm32"))] +use crate::config::{persistence::key_pathfinder::ClientKeyPathfinder, Config}; +#[cfg(not(target_arch = "wasm32"))] +use crate::error::ClientCoreError; #[cfg(not(target_arch = "wasm32"))] use nym_credential_storage::persistent_storage::PersistentStorage as PersistentCredentialStorage; @@ -89,6 +94,26 @@ impl OnDiskPersistent { credential_store, } } + + pub async fn from_config(config: &Config) -> Result { + let pathfinder = ClientKeyPathfinder::new_from_config(config); + let key_store = OnDiskKeys::new(pathfinder); + + let reply_store = non_wasm_helpers::setup_fs_reply_surb_backend( + config.get_reply_surb_database_path(), + &config.get_debug_config().reply_surbs, + ) + .await?; + + let credential_store = + nym_credential_storage::initialise_persistent_storage(config.get_database_path()).await; + + Ok(OnDiskPersistent { + key_store, + reply_store, + credential_store, + }) + } } #[cfg(not(target_arch = "wasm32"))] diff --git a/common/client-core/src/client/topology_control/mod.rs b/common/client-core/src/client/topology_control/mod.rs index 168767cd3e..0fef523b1e 100644 --- a/common/client-core/src/client/topology_control/mod.rs +++ b/common/client-core/src/client/topology_control/mod.rs @@ -26,7 +26,7 @@ impl TopologyRefresherConfig { } pub struct TopologyRefresher { - topology_provider: Box, + topology_provider: Box, topology_accessor: TopologyAccessor, refresh_rate: Duration, @@ -37,7 +37,7 @@ impl TopologyRefresher { pub fn new( cfg: TopologyRefresherConfig, topology_accessor: TopologyAccessor, - topology_provider: Box, + topology_provider: Box, ) -> Self { TopologyRefresher { topology_provider, @@ -47,7 +47,7 @@ impl TopologyRefresher { } } - pub fn change_topology_provider(&mut self, provider: Box) { + pub fn change_topology_provider(&mut self, provider: Box) { self.topology_provider = provider; } diff --git a/common/client-core/src/config/mod.rs b/common/client-core/src/config/mod.rs index d1ee728a26..546be9a2db 100644 --- a/common/client-core/src/config/mod.rs +++ b/common/client-core/src/config/mod.rs @@ -7,7 +7,7 @@ use nym_crypto::asymmetric::identity; use nym_sphinx::params::PacketSize; use serde::{Deserialize, Serialize}; use std::marker::PhantomData; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::time::Duration; use url::Url; @@ -18,6 +18,15 @@ use wasm_bindgen::prelude::*; pub mod old_config_v1_1_13; pub mod persistence; +pub const DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME: &str = "private_identity.pem"; +pub const DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME: &str = "public_identity.pem"; +pub const DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME: &str = "private_encryption.pem"; +pub const DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME: &str = "public_encryption.pem"; +pub const DEFAULT_GATEWAY_KEYS_FILENAME: &str = "gateway_shared.pem"; +pub const DEFAULT_ACK_KEY_FILENAME: &str = "ack_key.pem"; +pub const DEFAULT_REPLY_STORE_FILENAME: &str = "persistent_reply_store.sqlite"; +pub const DEFAULT_CREDENTIAL_STORE_FILENAME: &str = CRED_DB_FILE_NAME; + pub const MISSING_VALUE: &str = "MISSING VALUE"; // 'DEBUG' @@ -109,6 +118,37 @@ impl Config { self } + #[must_use] + #[doc(hidden)] + // TODO: this totally contradicts our trait... we REALLY have to refactor it... + pub fn reset_data_directory>(mut self, dir: P) -> Self { + self.client.private_identity_key_file = + dir.as_ref().join(DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME); + self.client.public_identity_key_file = + dir.as_ref().join(DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME); + self.client.private_encryption_key_file = + dir.as_ref().join(DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME); + self.client.public_encryption_key_file = + dir.as_ref().join(DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME); + self.client.gateway_shared_key_file = dir.as_ref().join(DEFAULT_GATEWAY_KEYS_FILENAME); + self.client.ack_key_file = dir.as_ref().join(DEFAULT_ACK_KEY_FILENAME); + self.client.reply_surb_database_path = dir.as_ref().join(DEFAULT_REPLY_STORE_FILENAME); + self.client.database_path = dir.as_ref().join(DEFAULT_CREDENTIAL_STORE_FILENAME); + + self + } + + #[must_use] + #[doc(hidden)] + // TODO: this totally contradicts our trait... we REALLY have to refactor it... + pub fn reset_nym_root_directory>(mut self, dir: P) -> Self + where + T: NymConfig, + { + self.client.nym_root_directory = dir.as_ref().to_owned(); + self + } + pub fn set_empty_fields_to_defaults(&mut self) -> bool where T: NymConfig, diff --git a/common/client-core/src/init/mod.rs b/common/client-core/src/init/mod.rs index 028dd2388e..27cab34fb4 100644 --- a/common/client-core/src/init/mod.rs +++ b/common/client-core/src/init/mod.rs @@ -19,9 +19,8 @@ use nym_crypto::asymmetric::{encryption, identity}; use nym_sphinx::addressing::{clients::Recipient, nodes::NodeIdentity}; use nym_validator_client::client::IdentityKey; use rand::rngs::OsRng; -use rand::thread_rng; use serde::Serialize; -use std::fmt::Display; +use std::fmt::{Debug, Display}; use tap::TapFallible; use url::Url; @@ -85,7 +84,7 @@ impl GatewaySetup { ) -> Result { match self { GatewaySetup::New { by_latency } => { - let mut rng = thread_rng(); + let mut rng = OsRng; let gateways = current_gateways(&mut rng, validator_servers).await?; if by_latency { choose_gateway_by_latency(&mut rng, gateways).await @@ -98,7 +97,7 @@ impl GatewaySetup { let user_gateway = identity::PublicKey::from_base58_string(&gateway_identity) .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?; - let mut rng = thread_rng(); + let mut rng = OsRng; let gateways = current_gateways(&mut rng, validator_servers).await?; gateways .into_iter() @@ -161,7 +160,7 @@ where S: MixnetClientStorage, ::StorageError: Send + Sync + 'static, { - let mut rng = rand::thread_rng(); + let mut rng = OsRng; // try load keys let mut managed_keys = match ManagedKeys::try_load(key_store).await { diff --git a/common/config/src/lib.rs b/common/config/src/lib.rs index 4d38e55467..030a991bfc 100644 --- a/common/config/src/lib.rs +++ b/common/config/src/lib.rs @@ -10,7 +10,7 @@ use std::any::type_name; use std::fmt::Debug; #[cfg(unix)] use std::os::unix::fs::PermissionsExt; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::str::FromStr; use std::{fs, io}; @@ -31,17 +31,29 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned { // default, most probable, implementations; can be easily overridden where required fn default_config_directory(id: &str) -> PathBuf { - Self::default_root_directory().join(id).join(CONFIG_DIR) + Self::default_config_directory_with_root(Self::default_root_directory(), id) + } + + fn default_config_directory_with_root>(root: P, id: &str) -> PathBuf { + root.as_ref().join(id).join(CONFIG_DIR) } fn default_data_directory(id: &str) -> PathBuf { - Self::default_root_directory().join(id).join(DATA_DIR) + Self::default_data_directory_with_root(Self::default_root_directory(), id) + } + + fn default_data_directory_with_root>(root: P, id: &str) -> PathBuf { + root.as_ref().join(id).join(DATA_DIR) } fn default_config_file_path(id: &str) -> PathBuf { Self::default_config_directory(id).join(Self::config_file_name()) } + fn default_config_file_path_with_root>(root: P, id: &str) -> PathBuf { + Self::default_config_directory_with_root(root, id).join(Self::config_file_name()) + } + // We provide a second set of functions that tries to not panic. fn try_default_root_directory() -> Option; @@ -99,8 +111,12 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned { fn load_from_file(id: &str) -> io::Result { let file = Self::default_config_file_path(id); - log::trace!("Loading from file: {:#?}", file); - let config_contents = fs::read_to_string(file)?; + Self::load_from_filepath(file) + } + + fn load_from_filepath>(filepath: P) -> io::Result { + log::trace!("Loading from file: {:#?}", filepath.as_ref().to_owned()); + let config_contents = fs::read_to_string(filepath)?; toml::from_str(&config_contents) .map_err(|toml_err| io::Error::new(io::ErrorKind::Other, toml_err)) diff --git a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml index 14ef586c93..4688654e1b 100644 --- a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] cw-utils = { workspace = true } cw3 = { workspace = true } -cw3-fixed-multisig = { workspace = true, features = ["library"] } cw4 = { workspace= true } cosmwasm-std = { workspace = true } schemars = "0.8" diff --git a/common/socks5-client-core/src/config/mod.rs b/common/socks5-client-core/src/config/mod.rs index fbe5f06c8d..33e6bd2774 100644 --- a/common/socks5-client-core/src/config/mod.rs +++ b/common/socks5-client-core/src/config/mod.rs @@ -12,7 +12,7 @@ use nym_socks5_requests::Socks5ProtocolVersion; use nym_sphinx::addressing::clients::Recipient; use serde::{Deserialize, Serialize}; use std::fmt::Debug; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::str::FromStr; pub mod old_config_v1_1_13; @@ -36,9 +36,9 @@ impl NymConfig for Config { } fn default_root_directory() -> PathBuf { - #[cfg(not(target_os = "android"))] + #[cfg(not(any(target_os = "android", target_os = "ios")))] let base_dir = dirs::home_dir().expect("Failed to evaluate $HOME value"); - #[cfg(target_os = "android")] + #[cfg(any(target_os = "android", target_os = "ios"))] let base_dir = PathBuf::from("/tmp"); base_dir.join(".nym").join("socks5-clients") @@ -77,6 +77,14 @@ impl Config { } } + #[must_use] + pub fn with_root_directory>(mut self, root_dir: P) -> Self { + self.base = self.base.reset_nym_root_directory(root_dir); + let data_dir = self.data_directory(); + self.base = self.base.reset_data_directory(data_dir); + self + } + pub fn validate(&self) -> bool { // no other sections have explicit requirements (yet) self.base.validate() @@ -224,6 +232,10 @@ impl Socks5 { self.send_anonymously = anonymous_replies; } + pub fn get_raw_provider_mix_address(&self) -> String { + self.provider_mix_address.clone() + } + pub fn get_provider_mix_address(&self) -> Recipient { Recipient::try_from_base58_string(&self.provider_mix_address) .expect("malformed provider address") diff --git a/common/socks5-client-core/src/config/old_config_v1_1_13.rs b/common/socks5-client-core/src/config/old_config_v1_1_13.rs index 241acf96a6..754b363d81 100644 --- a/common/socks5-client-core/src/config/old_config_v1_1_13.rs +++ b/common/socks5-client-core/src/config/old_config_v1_1_13.rs @@ -23,9 +23,9 @@ impl NymConfig for OldConfigV1_1_13 { } fn default_root_directory() -> PathBuf { - #[cfg(not(target_os = "android"))] + #[cfg(not(any(target_os = "android", target_os = "ios")))] let base_dir = dirs::home_dir().expect("Failed to evaluate $HOME value"); - #[cfg(target_os = "android")] + #[cfg(any(target_os = "android", target_os = "ios"))] let base_dir = PathBuf::from("/tmp"); base_dir.join(".nym").join("socks5-clients") diff --git a/common/socks5-client-core/src/lib.rs b/common/socks5-client-core/src/lib.rs index 1b9b504485..21c2316aa4 100644 --- a/common/socks5-client-core/src/lib.rs +++ b/common/socks5-client-core/src/lib.rs @@ -10,34 +10,18 @@ use crate::socks::{ use futures::channel::mpsc; use futures::StreamExt; use log::*; -use nym_bandwidth_controller::BandwidthController; +use nym_client_core::client::base_client::storage::MixnetClientStorage; use nym_client_core::client::base_client::{ - BaseClientBuilder, ClientInput, ClientOutput, ClientState, + non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput, ClientState, }; -use nym_client_core::config::persistence::key_pathfinder::ClientKeyPathfinder; +use nym_client_core::client::key_manager::persistence::KeyStore; +use nym_client_core::client::replies::reply_storage::ReplyStorageBackend; use nym_client_core::config::DebugConfig; +use nym_credential_storage::storage::Storage as CredentialStorage; use nym_sphinx::addressing::clients::Recipient; use nym_task::{TaskClient, TaskManager}; -use nym_validator_client::nyxd::QueryNyxdClient; -use nym_validator_client::Client; use std::error::Error; -#[cfg(target_os = "android")] -use nym_client_core::client::{ - base_client::helpers::setup_empty_reply_surb_backend, base_client::storage, - key_manager::persistence::InMemEphemeralKeys, replies::reply_storage, -}; -#[cfg(target_os = "android")] -use nym_credential_storage::ephemeral_storage::EphemeralStorage; - -#[cfg(not(target_os = "android"))] -use nym_client_core::client::{ - base_client::non_wasm_helpers, base_client::storage::OnDiskPersistent, - key_manager::persistence::OnDiskKeys, replies::reply_storage::fs_backend, -}; -#[cfg(not(target_os = "android"))] -use nym_credential_storage::persistent_storage::PersistentStorage; - pub mod config; pub mod error; pub mod socks; @@ -46,28 +30,38 @@ pub mod socks; pub type Socks5ControlMessageSender = mpsc::UnboundedSender; pub type Socks5ControlMessageReceiver = mpsc::UnboundedReceiver; -#[cfg(target_os = "android")] -type AndroidSocks5ClientBuilder<'a> = - BaseClientBuilder<'a, Client, storage::Ephemeral>; - -#[cfg(not(target_os = "android"))] -type Socks5ClientBuilder<'a> = BaseClientBuilder<'a, Client, OnDiskPersistent>; - #[derive(Debug)] pub enum Socks5ControlMessage { /// Tell the main task to stop Stop, } -pub struct NymClient { +pub struct StartedSocks5Client { + /// Handle for managing graceful shutdown of this client. If dropped, the client will be stopped. + pub shutdown_handle: TaskManager, + + /// Address of the started client + pub address: Recipient, +} + +pub struct NymClient { /// Client configuration options, including, among other things, packet sending rates, /// key filepaths, etc. config: Config, + + storage: S, } -impl NymClient { - pub fn new(config: Config) -> Self { - NymClient { config } +impl NymClient +where + S: MixnetClientStorage + 'static, + S::ReplyStore: Send + Sync, + ::StorageError: Sync + Send, + ::StorageError: Send + Sync, + ::StorageError: Send + Sync, +{ + pub fn new(config: Config, storage: S) -> Self { + NymClient { config, storage } } pub fn start_socks5_listener( @@ -135,21 +129,22 @@ impl NymClient { /// blocking version of `start` method. Will run forever (or until SIGINT is sent) pub async fn run_forever(self) -> Result<(), Box> { - let shutdown = self.start().await?; + let started = self.start().await?; - let res = shutdown.catch_interrupt().await; + let res = started.shutdown_handle.catch_interrupt().await; log::info!("Stopping nym-socks5-client"); res } - // Variant of `run_forever` that listends for remote control messages + // Variant of `run_forever` that listens for remote control messages pub async fn run_and_listen( self, mut receiver: Socks5ControlMessageReceiver, sender: nym_task::StatusSender, ) -> Result<(), Box> { // Start the main task - let mut shutdown = self.start().await?; + let started = self.start().await?; + let mut shutdown = started.shutdown_handle; // Listen to status messages from task, that we forward back to the caller shutdown.start_status_listener(sender).await; @@ -188,12 +183,25 @@ impl NymClient { res } - pub async fn start(self) -> Result { - #[cfg(not(target_os = "android"))] - let base_builder = self.create_base_client_builder().await?; + pub async fn start(self) -> Result { + let (key_store, reply_storage_backend, credential_store) = self.storage.into_split(); - #[cfg(target_os = "android")] - let base_builder = self.create_base_client_builder().await; + // don't create bandwidth controller if credentials are disabled + let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() { + None + } else { + Some(non_wasm_helpers::create_bandwidth_controller( + self.config.get_base(), + credential_store, + )) + }; + + let base_builder = BaseClientBuilder::<_, S>::new_from_base_config( + self.config.get_base(), + key_store, + bandwidth_controller, + reply_storage_backend, + ); let mut started_client = base_builder.start_base().await?; let self_address = started_client.address; @@ -212,97 +220,11 @@ impl NymClient { ); info!("Client startup finished!"); - info!("The address of this client is: {}", self_address); + info!("The address of this client is: {self_address}"); - Ok(started_client.task_manager) - } -} - -#[cfg(not(target_os = "android"))] -impl NymClient { - fn key_store(&self) -> OnDiskKeys { - let pathfinder = ClientKeyPathfinder::new_from_config(self.config.get_base()); - OnDiskKeys::new(pathfinder) - } - - async fn create_bandwidth_controller( - &self, - ) -> BandwidthController, PersistentStorage> { - let storage = nym_credential_storage::initialise_persistent_storage( - self.config.get_base().get_database_path(), - ) - .await; - - non_wasm_helpers::create_bandwidth_controller(self.config.get_base(), storage) - } - - async fn create_reply_storage_backend( - &self, - ) -> Result { - non_wasm_helpers::setup_fs_reply_surb_backend( - self.config.get_base().get_reply_surb_database_path(), - &self.config.get_debug_settings().reply_surbs, - ) - .await - .map_err(Into::into) - } - - async fn create_base_client_builder( - &self, - ) -> Result { - // don't create bandwidth controller if credentials are disabled - let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() { - None - } else { - Some(self.create_bandwidth_controller().await) - }; - - let key_store = self.key_store(); - let reply_storage_backend = self.create_reply_storage_backend().await?; - - Ok(BaseClientBuilder::new_from_base_config( - self.config.get_base(), - key_store, - bandwidth_controller, - reply_storage_backend, - )) - } -} - -#[cfg(target_os = "android")] -impl NymClient { - fn key_store(&self) -> InMemEphemeralKeys { - InMemEphemeralKeys::new() - } - - fn create_bandwidth_controller( - config: &Config, - ) -> BandwidthController, EphemeralStorage> { - let storage = nym_credential_storage::initialise_ephemeral_storage(); - - create_bandwidth_controller(config.get_base(), storage) - } - - fn create_reply_storage_backend(&self) -> reply_storage::Empty { - setup_empty_reply_surb_backend(self.config.get_debug_settings()) - } - - #[cfg(target_os = "android")] - fn create_base_client_builder(&self) -> Socks5ClientBuilder { - let bandwidth_controller = if self.config.get_base().get_disabled_credentials_mode() { - None - } else { - Some(self.create_bandwidth_controller().await) - }; - - let key_store = self.key_store(); - let reply_storage_backend = self.create_reply_storage_backend(); - - BaseClientBuilder::new_from_base_config( - self.config.get_base(), - key_store, - bandwidth_controller, - reply_storage_backend, - ) + Ok(StartedSocks5Client { + shutdown_handle: started_client.task_manager, + address: self_address, + }) } } diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index cccdd68c81..7eb0a02fa0 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -1216,7 +1216,6 @@ dependencies = [ "cosmwasm-std", "cw-utils", "cw3", - "cw3-fixed-multisig", "cw4", "schemars", "serde", diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock index 09f7b01640..3e02e639d5 100644 --- a/nym-connect/desktop/Cargo.lock +++ b/nym-connect/desktop/Cargo.lock @@ -1100,22 +1100,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw3-fixed-multisig" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706" -dependencies = [ - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", - "cw3", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "cw4" version = "0.13.4" @@ -3522,7 +3506,6 @@ dependencies = [ "cosmwasm-std", "cw-utils", "cw3", - "cw3-fixed-multisig", "cw4", "schemars", "serde", diff --git a/nym-connect/desktop/src-tauri/src/tasks.rs b/nym-connect/desktop/src-tauri/src/tasks.rs index 8dfa446556..c65289dde8 100644 --- a/nym-connect/desktop/src-tauri/src/tasks.rs +++ b/nym-connect/desktop/src-tauri/src/tasks.rs @@ -1,4 +1,5 @@ use futures::{channel::mpsc, StreamExt}; +use nym_client_core::client::base_client::storage::OnDiskPersistent; use nym_client_core::{ config::{ClientCoreConfigTrait, GatewayEndpointConfig}, error::ClientCoreStatusMessage, @@ -45,7 +46,6 @@ pub fn start_nym_socks5_client( .tap_err(|_| log::warn!("Failed to load configuration file"))?; let used_gateway = config.get_base().get_gateway_endpoint().clone(); - let socks5_client = Socks5NymClient::new(config); log::info!("Starting socks5 client"); // Channel to send control messages to the socks5 client @@ -65,6 +65,9 @@ pub fn start_nym_socks5_client( let result = tokio::runtime::Runtime::new() .expect("Failed to create runtime for SOCKS5 client") .block_on(async move { + let storage = OnDiskPersistent::from_config(config.get_base()).await?; + let socks5_client = Socks5NymClient::new(config, storage); + socks5_client .run_and_listen(socks5_ctrl_rx, socks5_status_tx) .await diff --git a/nym-connect/native/android/.gitignore b/nym-connect/native/android/.gitignore new file mode 100644 index 0000000000..aa724b7707 --- /dev/null +++ b/nym-connect/native/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/nym-connect/native/android/app/.gitignore b/nym-connect/native/android/app/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/nym-connect/native/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/nym-connect/native/android/app/build.gradle b/nym-connect/native/android/app/build.gradle new file mode 100644 index 0000000000..7ad06e1732 --- /dev/null +++ b/nym-connect/native/android/app/build.gradle @@ -0,0 +1,74 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' +} + +android { + namespace 'net.nymtech.nyms5' + compileSdk 33 + + defaultConfig { + applicationId "net.nymtech.nyms5" + minSdk 24 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion '1.4.6' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' + implementation 'androidx.activity:activity-compose:1.5.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0' + implementation platform('androidx.compose:compose-bom:2022.10.00') + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' + implementation 'androidx.compose.runtime:runtime-livedata' + implementation 'androidx.compose.ui:ui' + implementation 'androidx.compose.ui:ui-graphics' + implementation 'androidx.compose.ui:ui-tooling-preview' + implementation 'androidx.compose.material3:material3' + implementation 'androidx.work:work-runtime-ktx:2.8.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') + androidTestImplementation 'androidx.compose.ui:ui-test-junit4' + debugImplementation 'androidx.compose.ui:ui-tooling' + debugImplementation 'androidx.compose.ui:ui-test-manifest' + implementation 'com.github.kittinunf.fuel:fuel:3.0.0-alpha1' +} \ No newline at end of file diff --git a/nym-connect/native/android/app/proguard-rules.pro b/nym-connect/native/android/app/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/nym-connect/native/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/nym-connect/native/android/app/src/androidTest/java/net/nymtech/nyms5/ExampleInstrumentedTest.kt b/nym-connect/native/android/app/src/androidTest/java/net/nymtech/nyms5/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000..03593bfec4 --- /dev/null +++ b/nym-connect/native/android/app/src/androidTest/java/net/nymtech/nyms5/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package net.nymtech.nyms5 + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("net.nymtech.nyms5", appContext.packageName) + } +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/AndroidManifest.xml b/nym-connect/native/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..311aa8bd42 --- /dev/null +++ b/nym-connect/native/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/App.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/App.kt new file mode 100644 index 0000000000..08c075a460 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/App.kt @@ -0,0 +1,24 @@ +package net.nymtech.nyms5 + +import android.app.Application +import android.util.Log +import androidx.work.Configuration +import androidx.work.DelegatingWorkerFactory + +class App : Application(), Configuration.Provider { + companion object { + // NymProxy singleton (unique instance) + val nymProxy = NymProxy() + } + + private val tag = "App" + + override fun getWorkManagerConfiguration(): Configuration { + val workerFactory = DelegatingWorkerFactory() + // pass in the NymProxy class instance + workerFactory.addFactory(CustomWorkerFactory(nymProxy)) + + Log.d(tag, "using a custom configuration for WorkManager") + return Configuration.Builder().setWorkerFactory(workerFactory).build() + } +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/CustomWorkerFactory.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/CustomWorkerFactory.kt new file mode 100644 index 0000000000..61d0683457 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/CustomWorkerFactory.kt @@ -0,0 +1,26 @@ +package net.nymtech.nyms5 + +import android.content.Context +import androidx.work.ListenableWorker +import androidx.work.WorkerFactory +import androidx.work.WorkerParameters + +class CustomWorkerFactory(private val nymProxy: NymProxy) : WorkerFactory() { + + override fun createWorker( + appContext: Context, + workerClassName: String, + workerParameters: WorkerParameters + ): ListenableWorker? { + + return when (workerClassName) { + ProxyWorker::class.java.name -> + ProxyWorker(appContext, workerParameters, nymProxy) + + else -> + // Return null, so that the base class can delegate to the default WorkerFactory. + null + } + + } +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt new file mode 100644 index 0000000000..4e7ef5dd21 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt @@ -0,0 +1,162 @@ +package net.nymtech.nyms5 + +import android.os.Bundle +import android.util.Log +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.viewModels +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import kotlinx.coroutines.launch +import net.nymtech.nyms5.ui.theme.NymTheme +import androidx.compose.runtime.getValue +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.font.FontStyle +import androidx.work.WorkManager + +class MainActivity : ComponentActivity() { + private val tag = "MainActivity" + + private val viewModel: Socks5ViewModel by viewModels { + Socks5ViewModelFactory( + workManager = WorkManager.getInstance(applicationContext), + nymProxy = App.nymProxy + ) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.uiState.collect { + setContent { + NymTheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + val loading = it.loading + + S5ClientSwitch(it.connected, loading, { + if (!loading) { + when { + it -> { + Log.d(tag, "switch ON") + viewModel.startProxyWork() + } + else -> { + Log.d(tag, "switch OFF") + viewModel.cancelProxyWork() + } + } + } + }) + } + } + } + } + } + } + } +} + +@Composable +fun S5ClientSwitch( + connected: Boolean, + loading: Boolean, + onSwitch: (value: Boolean) -> Unit, + modifier: Modifier = Modifier +) { + val clipboardManager = LocalClipboardManager.current + val proxyHost = stringResource(R.string.proxy_host) + if (loading) { + Row { + LinearProgressIndicator( + modifier = modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.secondary + ) + } + } else { + Spacer(modifier = modifier.height(2.dp)) + } + Column(modifier = modifier.padding(16.dp)) { + Row(modifier = modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) { + Text("Nym proxy") + Spacer(modifier = modifier.width(14.dp)) + Switch(checked = connected, enabled = !loading, onCheckedChange = { + onSwitch(!connected) + }) + } + if (connected && !loading) { + Column(modifier = modifier.padding(16.dp)) { + Text( + color = Color.Green, + fontStyle = FontStyle.Italic, + text = stringResource(R.string.connected_text) + ) + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Text(proxyHost) + Spacer(modifier = modifier.width(14.dp)) + TextButton(onClick = { + clipboardManager.setText(AnnotatedString(proxyHost)) + }) { + Text("Copy") + } + } + } + } + } +} + +@Preview +@Composable +fun PreviewSocks5Client() { + val tag = "UI" + var connected by rememberSaveable { mutableStateOf(false) } + var loading by rememberSaveable { mutableStateOf(false) } + NymTheme { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + S5ClientSwitch(connected, loading, { + when { + it -> Log.d(tag, "switch ON") + else -> Log.d(tag, "switch OFF") + } + connected = it + loading = !loading + }) + } + } +} diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/NymProxy.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/NymProxy.kt new file mode 100644 index 0000000000..4c5f7a2eb2 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/NymProxy.kt @@ -0,0 +1,42 @@ +package net.nymtech.nyms5 + +import android.util.Log + +const val nymNativeLib = "nym_socks5_listener" + +class NymProxy { + private val tag = "NymProxy" + + // Load the native library "libnym_socks5_listener.so" + init { + System.loadLibrary(nymNativeLib) + Log.i(tag, "loaded native library $nymNativeLib") + } + + fun start(serviceProvider: String, callback: Any) { + Log.d(tag, "calling $nymNativeLib:run") + try { + run(serviceProvider, callback) + } catch (e: Throwable) { + Log.e(tag, "$nymNativeLib:run internal error: $e") + } + } + + /* fun start() { + Log.d(tag, "calling $nymNativeLib:startClient") + return startClient() + } */ + + fun stop(callback: Any) { + Log.d(tag, "calling $nymNativeLib:stopClient") + try { + stopClient(callback) + } catch (e: Throwable) { + Log.e(tag, "$nymNativeLib:stopClient internal error: $e") + } + } + + private external fun run(spAddress: String, callback: Any) + private external fun stopClient(callbacks: Any) + // private external fun startClient() +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ProxyWorker.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ProxyWorker.kt new file mode 100644 index 0000000000..49f51bdc19 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ProxyWorker.kt @@ -0,0 +1,149 @@ +package net.nymtech.nyms5 + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.Context +import android.os.Build +import android.util.Log +import androidx.annotation.RequiresApi +import androidx.core.app.NotificationCompat +import androidx.work.CoroutineWorker +import androidx.work.ForegroundInfo +import androidx.work.WorkManager +import androidx.work.WorkerParameters +import androidx.work.workDataOf +import fuel.Fuel +import fuel.get +import kotlinx.serialization.Serializable +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.json.Json +import java.util.UUID +import kotlin.random.Random + +class ProxyWorker( + context: Context, + parameters: WorkerParameters, + private val nymProxy: NymProxy +) : + CoroutineWorker(context, parameters) { + companion object Work { + const val name = "nymS5ProxyWorker" + const val workTag = "nymProxy" + val workId: UUID = UUID.randomUUID() + + const val State = "State" + } + + private val tag = "proxyWorker" + + private val spUrl = context.getString(R.string.sp_url) + + private val defaultSp = context.getString(R.string.default_sp) + + private val channelId = + applicationContext.getString(R.string.notification_channel_id) + + private val notificationId = 2001 + + private val notificationManager = + context.getSystemService(Context.NOTIFICATION_SERVICE) as + NotificationManager + + @Serializable + data class SPData( + val service_provider_client_id: String, + val gateway_identity_key: String, + val routing_score: Float, + val ip_address: String + ) + + @Serializable + data class SPListData(val items: List) + + private val json = Json { ignoreUnknownKeys = true } + + private val callback = object { + fun onStart() { + Log.d(tag, "⚡ ON START callback") + setProgressAsync(workDataOf(State to "CONNECTED")) + } + } + + @RequiresApi(Build.VERSION_CODES.O) + override suspend fun doWork(): Result { + setProgress(workDataOf(State to "STARTING")) + + setForeground(createForegroundInfo()) + return try { + Log.d(tag, "starting work") + + var serviceProvider: String? = null + // fetch the SP list and select a random one + try { + val res = Fuel.get(spUrl) + if (res.statusCode == 200) { + val spJson = json.decodeFromString(res.body) + serviceProvider = + Random.nextInt(until = spJson.items.size) + .let { spJson.items[it].service_provider_client_id } + Log.d(tag, "selected service provider: $serviceProvider") + } else { + Log.w(tag, "failed to fetch the service providers list: $res.statusCode") + Log.w(tag, "using a default service provider $defaultSp") + } + } catch (e: Throwable) { + Log.e(tag, "an error occurred while fetching the service providers list: $e") + Log.w(tag, "using a default service provider $defaultSp") + } + + nymProxy.start(serviceProvider ?: defaultSp, callback) + + setProgress(workDataOf(State to "DISCONNECTED")) + Log.d(tag, "work finished") + Result.success() + } catch (throwable: Throwable) { + Log.e(tag, "error: ${throwable.message}") + Result.failure() + } + } + + // Creates an instance of ForegroundInfo which can be used to update the + // ongoing notification. + @RequiresApi(Build.VERSION_CODES.O) + private fun createForegroundInfo(): ForegroundInfo { + val title = applicationContext.getString(R.string.notification_title) + val cancel = applicationContext.getString(R.string.stop_proxy) + // This PendingIntent can be used to cancel the worker + val intent = WorkManager.getInstance(applicationContext) + .createCancelPendingIntent(id) + + // Create a Notification channel if necessary + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + createChannel() + } + + val notification = NotificationCompat.Builder(applicationContext, channelId) + .setContentTitle(title) + .setTicker(title) + .setContentText("Nym socks5 proxy running") + .setSmallIcon(android.R.drawable.ic_secure) + .setOngoing(true) + // Add the cancel action to the notification which can + // be used to cancel the worker + .addAction(android.R.drawable.ic_delete, cancel, intent) + .build() + + return ForegroundInfo(notificationId, notification) + } + + @RequiresApi(Build.VERSION_CODES.O) + private fun createChannel() { + notificationManager.createNotificationChannel( + NotificationChannel( + channelId, + applicationContext.getString(R.string.notification_channel_name), + NotificationManager.IMPORTANCE_HIGH + ) + ) + } +} diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/Socks5ViewModel.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/Socks5ViewModel.kt new file mode 100644 index 0000000000..89faa7c7ba --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/Socks5ViewModel.kt @@ -0,0 +1,135 @@ +package net.nymtech.nyms5 + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import androidx.work.Constraints +import androidx.work.ExistingWorkPolicy +import androidx.work.NetworkType +import androidx.work.OneTimeWorkRequest +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.OutOfQuotaPolicy +import androidx.work.WorkInfo +import androidx.work.WorkManager +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +class Socks5ViewModel( + private val workManager: WorkManager, + private val nymProxy: NymProxy +) : ViewModel() { + private val tag = "viewModel" + + private val workRequest: OneTimeWorkRequest = OneTimeWorkRequestBuilder() + .setConstraints( + Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build() + ) + .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST) + .addTag(ProxyWorker.workTag) + .setId(ProxyWorker.workId) + .build() + + init { + // observe the proxy work ProxyWorker + workManager.getWorkInfoByIdLiveData(ProxyWorker.workId) + .observeForever { workInfo -> + if (workInfo?.state == WorkInfo.State.CANCELLED || workInfo?.state == WorkInfo.State.FAILED) { + // when the work is cancelled, ie. from the work notification "Stop" action + _uiState.update { currentState -> + currentState.copy( + connected = false, + loading = true, + ) + } + stopProxy() + Log.d(tag, "proxy work cancelled") + } + if (workInfo != null && workInfo.state == WorkInfo.State.RUNNING) { + val progress = workInfo.progress.getString(ProxyWorker.State) + Log.d(tag, "work connection state $progress") + when (progress) { + "CONNECTED" -> if (!_uiState.value.connected || _uiState.value.loading) { + _uiState.update { currentState -> + currentState.copy( + connected = true, + loading = false, + ) + } + Log.i(tag, "Nym proxy connected") + } + + else -> {} + } + } + } + } + + private val callback = object { + fun onStop() { + Log.d(tag, "⚡ ON STOP callback") + _uiState.update { currentState -> + currentState.copy( + connected = false, + loading = false, + ) + } + Log.i(tag, "Nym proxy disconnected") + } + } + + data class Socks5State(val connected: Boolean = false, val loading: Boolean = false) + + // Expose screen UI state + private val _uiState = MutableStateFlow(Socks5State()) + val uiState: StateFlow = _uiState.asStateFlow() + + private fun stopProxy() { + viewModelScope.launch(Dispatchers.IO) { + nymProxy.stop(callback) + } + } + + fun startProxyWork() { + // start loading state + _uiState.update { currentState -> + currentState.copy( + connected = true, + loading = true, + ) + } + + // start long-running proxy service + workManager.enqueueUniqueWork( + ProxyWorker.name, + ExistingWorkPolicy.REPLACE, + workRequest + ) + } + + fun cancelProxyWork() { + // update state + _uiState.update { currentState -> + currentState.copy( + connected = false, + loading = true, + ) + } + stopProxy() + } +} + +class Socks5ViewModelFactory(private val workManager: WorkManager, private val nymProxy: NymProxy) : + ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + return if (modelClass.isAssignableFrom(Socks5ViewModel::class.java)) { + Socks5ViewModel(workManager, nymProxy) as T + } else { + throw IllegalArgumentException("Unknown ViewModel class") + } + } +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Color.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Color.kt new file mode 100644 index 0000000000..1667a76208 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package net.nymtech.nyms5.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Theme.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Theme.kt new file mode 100644 index 0000000000..1792f65f66 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package net.nymtech.nyms5.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun NymTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Type.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Type.kt new file mode 100644 index 0000000000..e8f9620039 --- /dev/null +++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package net.nymtech.nyms5.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/jniLibs/arm64-v8a/.gitkeep b/nym-connect/native/android/app/src/main/jniLibs/arm64-v8a/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nym-connect/native/android/app/src/main/jniLibs/x86_64/.gitkeep b/nym-connect/native/android/app/src/main/jniLibs/x86_64/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/nym-connect/native/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/nym-connect/native/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000..2b068d1146 --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/res/drawable/ic_launcher_background.xml b/nym-connect/native/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000..07d5da9cbf --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..6f3b755bf5 --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..6f3b755bf5 --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/nym-connect/native/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 zcmV-Y3$650Nk&FW3jhFDMM6+kP&il$0000G0000-002h-06|PpNWB9900E$G+qN-D z+81ABX7q?;bwx%xBg?kcwr$(C-Tex-ZCkHUw(Y9#+`E5-zuONG5fgw~E2WDng@Bc@ z24xy+R1n%~6xI#u9vJ8zREI)sb<&Il(016}Z~V1n^PU3-_H17A*Bf^o)&{_uBv}Py zulRfeE8g(g6HFhk_?o_;0@tz?1I+l+Y#Q*;RVC?(ud`_cU-~n|AX-b`JHrOIqn(-t&rOg-o`#C zh0LPxmbOAEb;zHTu!R3LDh1QO zZTf-|lJNUxi-PpcbRjw3n~n-pG;$+dIF6eqM5+L();B2O2tQ~|p{PlpNcvDbd1l%c zLtXn%lu(3!aNK!V#+HNn_D3lp z2%l+hK-nsj|Bi9;V*WIcQRTt5j90A<=am+cc`J zTYIN|PsYAhJ|=&h*4wI4ebv-C=Be#u>}%m;a{IGmJDU`0snWS&$9zdrT(z8#{OZ_Y zxwJx!ZClUi%YJjD6Xz@OP8{ieyJB=tn?>zaI-4JN;rr`JQbb%y5h2O-?_V@7pG_+y z(lqAsqYr!NyVb0C^|uclHaeecG)Sz;WV?rtoqOdAAN{j%?Uo%owya(F&qps@Id|Of zo@~Y-(YmfB+chv^%*3g4k3R0WqvuYUIA+8^SGJ{2Bl$X&X&v02>+0$4?di(34{pt* zG=f#yMs@Y|b&=HyH3k4yP&goF2LJ#tBLJNNDo6lG06r}ghC-pC4Q*=x3;|+W04zte zAl>l4kzUBQFYF(E`KJy?ZXd1tnfbH+Z~SMmA21KokJNs#eqcXWKUIC>{TuoKe^vhF z);H)o`t9j~`$h1D`#bxe@E`oE`cM9w(@)5Bp8BNukIwM>wZHfd0S;5bcXA*5KT3bj zc&_~`&{z7u{Et!Z_k78H75gXf4g8<_ul!H$eVspPeU3j&&Au=2R*Zp#M9$9s;fqwgzfiX=E_?BwVcfx3tG9Q-+<5fw z%Hs64z)@Q*%s3_Xd5>S4dg$s>@rN^ixeVj*tqu3ZV)biDcFf&l?lGwsa zWj3rvK}?43c{IruV2L`hUU0t^MemAn3U~x3$4mFDxj=Byowu^Q+#wKRPrWywLjIAp z9*n}eQ9-gZmnd9Y0WHtwi2sn6n~?i#n9VN1B*074_VbZZ=WrpkMYr{RsI ztM_8X1)J*DZejxkjOTRJ&a*lrvMKBQURNP#K)a5wIitfu(CFYV4FT?LUB$jVwJSZz zNBFTWg->Yk0j&h3e*a5>B=-xM7dE`IuOQna!u$OoxLlE;WdrNlN)1 z7**de7-hZ!(%_ZllHBLg`Ir#|t>2$*xVOZ-ADZKTN?{(NUeLU9GbuG-+Axf*AZ-P1 z0ZZ*fx+ck4{XtFsbcc%GRStht@q!m*ImssGwuK+P@%gEK!f5dHymg<9nSCXsB6 zQ*{<`%^bxB($Z@5286^-A(tR;r+p7B%^%$N5h%lb*Vlz-?DL9x;!j<5>~kmXP$E}m zQV|7uv4SwFs0jUervsxVUm>&9Y3DBIzc1XW|CUZrUdb<&{@D5yuLe%Xniw^x&{A2s z0q1+owDSfc3Gs?ht;3jw49c#mmrViUfX-yvc_B*wY|Lo7; zGh!t2R#BHx{1wFXReX*~`NS-LpSX z#TV*miO^~B9PF%O0huw!1Zv>^d0G3$^8dsC6VI!$oKDKiXdJt{mGkyA`+Gwd4D-^1qtNTUK)`N*=NTG-6}=5k6suNfdLt*dt8D| z%H#$k)z#ZRcf|zDWB|pn<3+7Nz>?WW9WdkO5(a^m+D4WRJ9{wc>Y}IN)2Kbgn;_O? zGqdr&9~|$Y0tP=N(k7^Eu;iO*w+f%W`20BNo)=Xa@M_)+o$4LXJyiw{F?a633SC{B zl~9FH%?^Rm*LVz`lkULs)%idDX^O)SxQol(3jDRyBVR!7d`;ar+D7do)jQ}m`g$TevUD5@?*P8)voa?kEe@_hl{_h8j&5eB-5FrYW&*FHVt$ z$kRF9Nstj%KRzpjdd_9wO=4zO8ritN*NPk_9avYrsF(!4))tm{Ga#OY z(r{0buexOzu7+rw8E08Gxd`LTOID{*AC1m*6Nw@osfB%0oBF5sf<~wH1kL;sd zo)k6^VyRFU`)dt*iX^9&QtWbo6yE8XXH?`ztvpiOLgI3R+=MOBQ9=rMVgi<*CU%+d1PQQ0a1U=&b0vkF207%xU0ssI2 literal 0 HcmV?d00001 diff --git a/nym-connect/native/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/nym-connect/native/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/nym-connect/native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/nym-connect/native/android/app/src/main/res/values/colors.xml b/nym-connect/native/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000..f8c6127d32 --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/res/values/strings.xml b/nym-connect/native/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..bb0c7d4c0e --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/values/strings.xml @@ -0,0 +1,12 @@ + + Nyms5 + Nym socks5 process + Nym proxy + 21 + Nym proxy + Stop + http://localhost:1080 + https://harbourmaster.nymtech.net/v1/services?size=100 + DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh + Connected to the mixnet + \ No newline at end of file diff --git a/nym-connect/native/android/app/src/main/res/values/themes.xml b/nym-connect/native/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000000..be09533927 --- /dev/null +++ b/nym-connect/native/android/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +