Remove unused function

CHANGELOG.md

@@ -4,18 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
-## [v1.1.19] (2023-05-16)
-
-- nym-name-service endpoint in nym-api ([#3403])
-- Implement key storage for WASM client using IndexedDB (for browser) ([#3329])
-- Initial version of nym-name-service contract providing name aliases for nym-addresses ([#3274])
-- Update Cargo.lock ([#3410])
-
-[#3403]: https://github.com/nymtech/nym/issues/3403
-[#3329]: https://github.com/nymtech/nym/issues/3329
-[#3274]: https://github.com/nymtech/nym/issues/3274
-[#3410]: https://github.com/nymtech/nym/pull/3410
-
 ## [v1.1.18] (2023-05-09)
 
 - Implement heartbeat messages between socks5 proxy and network requester ([#3215])

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"
@@ -1640,7 +1624,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "chrono",
  "clap 4.2.7",
@@ -3069,7 +3053,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.20"
+version = "1.1.19"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3203,7 +3187,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -3265,7 +3249,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "clap 4.2.7",
  "dirs",
@@ -3534,7 +3518,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3682,7 +3666,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.20"
+version = "1.1.19"
 dependencies = [
  "anyhow",
  "bs58",
@@ -3762,7 +3746,6 @@ dependencies = [
  "cosmwasm-std",
  "cw-utils",
  "cw3",
- "cw3-fixed-multisig",
  "cw4",
  "schemars",
  "serde",
@@ -3793,7 +3776,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "async-file-watcher",
  "async-trait",
@@ -3835,7 +3818,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "dirs",
  "log",
@@ -3970,7 +3953,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.19"
+version = "1.1.18"
 dependencies = [
  "clap 4.2.7",
  "lazy_static",
@@ -4304,7 +4287,6 @@ dependencies = [
  "nym-name-service-common",
  "nym-network-defaults",
  "nym-service-provider-directory-common",
- "nym-vesting-contract",
  "nym-vesting-contract-common",
  "prost 0.10.4",
  "reqwest",

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 = ["socks5-c", "explorer", "contracts", "clients/webassembly", "nym-wallet", "nym-connect/mobile/src-tauri", "nym-connect/desktop", "cpu-cycles"]
 
 [workspace.package]
 authors = ["Nym Technologies SA"]

android/nyms5/.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

android/nyms5/app/.gitignore

@@ -0,0 +1 @@
+/build

android/nyms5/app/build.gradle

@@ -0,0 +1,70 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+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.3.2'
+    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
+    ndkVersion '25.2.9519653'
+    buildToolsVersion '33.0.2'
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.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 platform('androidx.compose:compose-bom:2022.10.00')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-graphics'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.compose.material3:material3'
+    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'
+}

android/nyms5/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

android/nyms5/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)
+    }
+}

android/nyms5/app/src/main/AndroidManifest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Nyms5"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Nyms5">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

android/nyms5/app/src/main/java/net/nymtech/nyms5/MainActivity.kt

@@ -0,0 +1,61 @@
+package net.nymtech.nyms5
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
+import net.nymtech.nyms5.ui.theme.Nyms5Theme
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val viewModel: MainViewModel by viewModels()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.uiState.collect {
+                    // Update UI elements
+                }
+            }
+        }
+
+        setContent {
+            Nyms5Theme {
+                // A surface container using the 'background' color from the theme
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    Greeting("Android")
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Greeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name!",
+        modifier = modifier
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    Nyms5Theme {
+        Greeting("Android")
+    }
+}

android/nyms5/app/src/main/java/net/nymtech/nyms5/MainViewModel.kt

@@ -0,0 +1,26 @@
+package net.nymtech.nyms5
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+class MainViewModel : ViewModel() {
+
+    init {
+        viewModelScope.launch(Dispatchers.IO) {
+            val result = Socks5().runtest()
+            result?.let { Log.d("App", "result: $it") }
+        }
+        Log.d("App", "libnyms5 CALLED")
+    }
+
+    // Expose screen UI state
+    private val _uiState = MutableStateFlow(false)
+    val uiState: StateFlow<Boolean> = _uiState.asStateFlow()
+
+}

android/nyms5/app/src/main/java/net/nymtech/nyms5/Socks5.kt

@@ -0,0 +1,15 @@
+package net.nymtech.nyms5
+
+class Socks5 {
+    // Load the native library "libsocks5-c.so".
+    init {
+        System.loadLibrary("socks5_c")
+    }
+
+    fun runtest(): String? {
+        return run("TEST")
+    }
+
+    // Native function implemented in Rust.
+    private external fun run(input: String): String?
+}

android/nyms5/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)

android/nyms5/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 Nyms5Theme(
+    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
+    )
+}

android/nyms5/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
+    )
+    */
+)

android/nyms5/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

android/nyms5/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

android/nyms5/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

android/nyms5/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

android/nyms5/app/src/main/res/values/colors.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>

android/nyms5/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">nyms5</string>
+</resources>

android/nyms5/app/src/main/res/values/themes.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Nyms5" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>

android/nyms5/app/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>

android/nyms5/app/src/main/res/xml/data_extraction_rules.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>

android/nyms5/app/src/test/java/net/nymtech/nyms5/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package net.nymtech.nyms5
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

android/nyms5/build.gradle

@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+}

android/nyms5/gradle.properties

@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true

android/nyms5/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Fri May 12 14:52:18 CEST 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/nyms5/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

android/nyms5/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/nyms5/settings.gradle

@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "nyms5"
+include ':app'

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.19"
+version = "1.1.18"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.19"
+version = "1.1.18"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"

clients/webassembly/src/lib.rs

@@ -7,6 +7,7 @@ use wasm_bindgen::prelude::*;
 mod client;
 #[cfg(target_arch = "wasm32")]
 pub mod encoded_payload_helper;
+#[cfg(target_arch = "wasm32")]
 pub mod error;
 #[cfg(target_arch = "wasm32")]
 pub mod gateway_selector;

common/client-libs/validator-client/Cargo.toml

@@ -20,7 +20,7 @@ nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig
 nym-name-service-common = { path = "../../cosmwasm-smart-contracts/name-service" }
 nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
 nym-service-provider-directory-common = { path = "../../cosmwasm-smart-contracts/service-provider-directory" }
-nym-vesting-contract = { path = "../../../contracts/vesting" }
+#nym-vesting-contract = { path = "../../../contracts/vesting" }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 reqwest = { version = "0.11", features = ["json"] }

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

@@ -1,6 +1,6 @@
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Config as ClientConfig, NyxdClient, QueryNyxdClient};
-use crate::{NymApiClient, ValidatorClientError};
+use crate::NymApiClient;
 
 use crate::nyxd::traits::MixnetQueryClient;
 use colored::Colorize;
@@ -45,23 +45,6 @@ pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
     )
 }
 
-pub async fn test_nyxd_url_connection(
-    network: NymNetworkDetails,
-    nyxd_url: Url,
-    address: cosmrs::AccountId,
-) -> Result<bool, ValidatorClientError> {
-    let config = ClientConfig::try_from_nym_network_details(&network)
-        .expect("failed to create valid nyxd client config");
-
-    let mut nyxd_client = NyxdClient::<QueryNyxdClient>::connect(config, nyxd_url.as_str())?;
-    // possibly redundant, but lets just leave it here
-    nyxd_client.set_mixnet_contract_address(address);
-    match test_nyxd_connection(network, &nyxd_url, &nyxd_client).await {
-        ConnectionResult::Nyxd(_, _, res) => Ok(res),
-        _ => Ok(false), // ✶ not possible to happens
-    }
-}
-
 fn setup_connection_tests<H: BuildHasher + 'static>(
     nyxd_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
     api_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
@@ -122,7 +105,7 @@ async fn test_nyxd_connection(
     {
         Ok(Err(NyxdError::TendermintError(e))) => {
             // If we get a tendermint-rpc error, we classify the node as not contactable
-            log::warn!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
+            log::debug!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
             false
         }
         Ok(Err(NyxdError::AbciError { code, log, .. })) => {
@@ -135,12 +118,12 @@ async fn test_nyxd_connection(
             code == 18
         }
         Ok(Err(error @ NyxdError::NoContractAddressAvailable(_))) => {
-            log::warn!("Checking: nyxd url: {url}: {}: {error}", "failed".red());
+            log::debug!("Checking: nyxd url: {url}: {}: {error}", "failed".red());
             false
         }
         Ok(Err(e)) => {
             // For any other error, we're optimistic and just try anyway.
-            log::warn!(
+            log::debug!(
                 "Checking: nyxd_url: {url}: {}, but with error: {e}",
                 "success".green()
             );
@@ -151,7 +134,7 @@ async fn test_nyxd_connection(
             true
         }
         Err(e) => {
-            log::warn!("Checking: nyxd_url: {url}: {}: {e}", "failed".red());
+            log::debug!("Checking: nyxd_url: {url}: {}: {e}", "failed".red());
             false
         }
     };

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

@@ -44,7 +44,7 @@ use cosmwasm_std::Addr;
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
 pub use signing_client::Client as SigningNyxdClient;
-pub use traits::{VestingQueryClient, VestingSigningClient};
+//pub use traits::{VestingQueryClient, VestingSigningClient};
 
 pub type DirectSigningNyxdClient = SigningNyxdClient<DirectSecp256k1HdWallet>;
 

common/client-libs/validator-client/src/nyxd/traits/mod.rs

@@ -8,13 +8,13 @@ mod dkg_query_client;
 mod group_query_client;
 mod mixnet_query_client;
 mod multisig_query_client;
-mod vesting_query_client;
+//mod vesting_query_client;
 
 mod coconut_bandwidth_signing_client;
 mod dkg_signing_client;
 mod mixnet_signing_client;
 mod multisig_signing_client;
-mod vesting_signing_client;
+//mod vesting_signing_client;
 
 mod sp_directory_query_client;
 mod sp_directory_signing_client;
@@ -29,7 +29,7 @@ pub use mixnet_query_client::MixnetQueryClient;
 pub use multisig_query_client::MultisigQueryClient;
 pub use name_service_query_client::NameServiceQueryClient;
 pub use sp_directory_query_client::SpDirectoryQueryClient;
-pub use vesting_query_client::VestingQueryClient;
+//pub use vesting_query_client::VestingQueryClient;
 
 pub use coconut_bandwidth_signing_client::CoconutBandwidthSigningClient;
 pub use dkg_signing_client::DkgSigningClient;
@@ -37,4 +37,4 @@ pub use mixnet_signing_client::MixnetSigningClient;
 pub use multisig_signing_client::MultisigSigningClient;
 pub use name_service_signing_client::NameServiceSigningClient;
 pub use sp_directory_signing_client::SpDirectorySigningClient;
-pub use vesting_signing_client::VestingSigningClient;
+//pub use vesting_signing_client::VestingSigningClient;

common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 cw-utils = { workspace = true }
 cw3 = { workspace = true }
-cw3-fixed-multisig = { workspace = true, features = ["library"] }
+#cw3-fixed-multisig = { workspace = true, features = ["library"] }
 cw4 = { workspace= true }
 cosmwasm-std = { workspace = true }
 schemars = "0.8"

common/socks5-client-core/src/config/mod.rs

@@ -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")

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")

common/socks5-client-core/src/lib.rs

@@ -16,6 +16,9 @@ use nym_client_core::client::base_client::{
 };
 use nym_client_core::client::key_manager::KeyManager;
 use nym_client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+use nym_client_core::config::DebugConfig;
+#[cfg(any(target_os = "android", target_os = "ios"))]
+use nym_credential_storage::ephemeral_storage::EphemeralStorage;
 use nym_credential_storage::storage::Storage;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_task::{TaskClient, TaskManager};
@@ -23,11 +26,10 @@ use nym_validator_client::nyxd::QueryNyxdClient;
 use nym_validator_client::Client;
 use std::error::Error;
 
-#[cfg(target_os = "android")]
+#[cfg(any(target_os = "android", target_os = "ios"))]
 use nym_client_core::client::base_client::helpers::setup_empty_reply_surb_backend;
-#[cfg(not(target_os = "android"))]
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
 use nym_client_core::client::base_client::non_wasm_helpers;
-use nym_client_core::config::DebugConfig;
 
 pub mod config;
 pub mod error;
@@ -75,6 +77,7 @@ impl NymClient {
         }
     }
 
+    #[allow(unused)]
     async fn create_bandwidth_controller<St: Storage>(
         config: &Config,
         storage: St,
@@ -173,7 +176,7 @@ impl NymClient {
         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,
@@ -220,7 +223,7 @@ impl NymClient {
     }
 
     pub async fn start(self) -> Result<TaskManager, Socks5ClientCoreError> {
-        #[cfg(not(target_os = "android"))]
+        #[cfg(not(any(target_os = "android", target_os = "ios")))]
         let base_builder = BaseClientBuilder::new_from_base_config(
             self.config.get_base(),
             self.key_manager,
@@ -241,19 +244,21 @@ impl NymClient {
             .await?,
         );
 
-        #[cfg(target_os = "android")]
-        let base_builder = BaseClientBuilder::<_, Client<QueryNyxdClient>, _>::new_from_base_config(
-            self.config.get_base(),
-            self.key_manager,
-            Some(
-                Self::create_bandwidth_controller(
-                    &self.config,
-                    nym_credential_storage::initialise_ephemeral_storage(),
-                )
-                .await,
-            ),
-            setup_empty_reply_surb_backend(self.config.get_debug_settings()),
-        );
+        #[cfg(any(target_os = "android", target_os = "ios"))]
+        let base_builder =
+            BaseClientBuilder::<_, Client<QueryNyxdClient>, EphemeralStorage>::new_from_base_config(
+                self.config.get_base(),
+                self.key_manager,
+                None,
+                //Some(
+                //    Self::create_bandwidth_controller(
+                //        &self.config,
+                //        nym_credential_storage::initialise_ephemeral_storage(),
+                //    )
+                //    .await,
+                //),
+                setup_empty_reply_surb_backend(self.config.get_debug_settings()),
+            );
 
         let self_address = base_builder.as_mix_recipient();
         let mut started_client = base_builder.start_base().await?;

contracts/Cargo.lock

@@ -1215,7 +1215,6 @@ dependencies = [
  "cosmwasm-std",
  "cw-utils",
  "cw3",
- "cw3-fixed-multisig",
  "cw4",
  "schemars",
  "serde",

documentation/dev-portal/book.toml

@@ -49,9 +49,9 @@ assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
 [preprocessor.variables.variables]
 # code prerequisites versions
 minimum_rust_version = "1.66"
-platform_release_version = "v1.1.19"
-upcoming_platform_release_version = "v1.1.20" # to use when adding 'edit on github' plugin
-mix_node_release_version = "v1.1.20"
+platform_release_version = "v1.1.18"
+upcoming_platform_release_version = "v1.1.19" # to use when adding 'edit on github' plugin
+mix_node_release_version = "v1.1.19"
 #
 [preprocessor.last-changed]
 command = "mdbook-last-changed"

documentation/docs/book.toml

@@ -1,5 +1,5 @@
 [book]
-title = "Nym Docs v1.1.19"
+title = "Nym Docs v1.1.18"
 authors = ["Max Hampshire"]
 description = "Nym technical documentation"
 language = "en"
@@ -48,9 +48,9 @@ assets_version = "2.0.0" # do not edit: managed by `mdbook-admonish install`
 # https://gitlab.com/tglman/mdbook-variables/
 [preprocessor.variables.variables]
 minimum_rust_version = "1.66"
-platform_release_version = "v1.1.19"
-upcoming_platform_release_version = "v1.1.20" # to use in 'edit page on github' plugin (coming soon)
-mix_node_release_version = "v1.1.20"
+platform_release_version = "v1.1.18"
+upcoming_platform_release_version = "v1.1.19" # to use in 'edit page on github' plugin (coming soon)
+mix_node_release_version = "v1.1.19"
 
 [preprocessor.last-changed]
 command = "mdbook-last-changed"

documentation/docs/src/nodes/validator-setup.md

@@ -27,7 +27,7 @@ pacman -S git gcc jq
 sudo rm -rf /usr/local/go
 
 # Install correct Go version
-curl https://dl.google.com/go/go1.20.4.linux-amd64.tar.gz | sudo tar -C/usr/local -zxvf -
+curl https://dl.google.com/go/go1.19.2.linux-amd64.tar.gz | sudo tar -C/usr/local -zxvf -
 
 # Update environment variables to include go
 cat <<'EOF' >>$HOME/.profile
@@ -44,17 +44,10 @@ Verify `Go` is installed with:
 ```
 go version
 # Should return something like:
-go version go1.20.4 linux/amd64
+go version go1.19.2 linux/amd64
 ```
 
-### Download a precompiled validator binary
-You can find pre-compiled binaries for Ubuntu `22.04` and `20.04` [here](https://github.com/nymtech/nyxd/releases).
-
-```admonish caution title=""
-Binaries for both Mainnet and Sandbox testnet can be found in each release - make sure to download the correct binary to avoid `bech32Prefix` mismatches.
-```
-
-### Manually compiling your validator binary
+### Compiling your validator binary
 The codebase for the Nyx validators can be found [here](https://github.com/nymtech/nyxd).
 
 The validator binary can be compiled by running the following commands:
@@ -79,7 +72,7 @@ You should see help text print out.
 
 The `nyxd` binary and the `libwasmvm.so` shared object library binary have been compiled. `libwasmvm.so` is the wasm virtual machine which is needed to execute smart contracts.
 
-```admonish caution title=""
+```admonish caution
 If you have compiled these files locally you need to upload both of them to the server on which the validator will run. **If you have instead compiled them on the server skip to the step outlining setting `LD_LIBRARY PATH` below.**
 ```
 
@@ -139,7 +132,7 @@ nyxd init <ID> --chain-id=nyx
 nyxd init <ID> --chain-id=sandbox
 ```
 
-```admonish caution title=""
+```admonish caution
 `init` generates `priv_validator_key.json` and `node_key.json`.
 
 If you have already set up a validator on a network, **make sure to back up the key located at**
@@ -175,7 +168,7 @@ laddr = "tcp://0.0.0.0:26656"
 ```
 # Sandbox testnet
 cors_allowed_origins = ["*"]
-persistent_peers = "8421c0a3d90d490e27e8061f2abcb1276c8358b6@sandbox-validator1.nymtech.net:26666"
+persistent_peers = "8421c0a3d90d490e27e8061f2abcb1276c8358b6@sandbox-validator1.nymtech.net:26656"
 create_empty_blocks = false
 laddr = "tcp://0.0.0.0:26656"
 ```
@@ -273,7 +266,7 @@ If you wish to sync from a snapshot or via state-sync please check out the Polka
 
 > If you are having trouble upgrading your validator binary, try replacing (or re-compile) the `libwasmvm.so` file and replace it on your validator server.
 
-```admonish caution title=""
+```admonish caution
 When joining consensus, make sure that you do not disrupt (or worse - halt) the network by coming in with a disproportionately large amount of staked tokens.
 
 Please initially stake a small amount of tokens compared to existing validators, then delegate to yourself in tranches over time.
@@ -436,7 +429,7 @@ sudo apt install certbot nginx python3
 certbot --nginx -d nym-validator.yourdomain.com -m you@yourdomain.com --agree-tos --noninteractive --redirect
 ```
 
-```admonish caution title=""
+```admonish caution
 If using a VPS running Ubuntu 20: replace `certbot nginx python3` with `python3-certbot-nginx`
 ```
 

explorer-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.1.19"
+version = "1.1.18"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

gateway/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-gateway"
-version = "1.1.19"
+version = "1.1.18"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

mixnode/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-mixnode"
-version = "1.1.20"
+version = "1.1.19"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-api/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-api"
-version = "1.1.20"
+version = "1.1.19"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-connect/desktop/Cargo.lock

@@ -1076,18 +1076,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw2"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "cw3"
 version = "0.13.4"
@@ -1100,22 +1088,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"
@@ -3516,7 +3488,6 @@ dependencies = [
  "cosmwasm-std",
  "cw-utils",
  "cw3",
- "cw3-fixed-multisig",
  "cw4",
  "schemars",
  "serde",
@@ -3857,7 +3828,6 @@ dependencies = [
  "nym-name-service-common",
  "nym-network-defaults",
  "nym-service-provider-directory-common",
- "nym-vesting-contract",
  "nym-vesting-contract-common",
  "prost",
  "reqwest",
@@ -3870,24 +3840,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "nym-vesting-contract"
-version = "1.4.0"
-dependencies = [
- "cosmwasm-derive",
- "cosmwasm-std",
- "cw-storage-plus",
- "cw2",
- "nym-contracts-common",
- "nym-mixnet-contract-common",
- "nym-vesting-contract-common",
- "schemars",
- "semver 1.0.17",
- "serde",
- "thiserror",
- "vergen",
-]
-
 [[package]]
 name = "nym-vesting-contract-common"
 version = "0.6.0"

nym-wallet/CHANGELOG.md

@@ -2,12 +2,6 @@
 
 ## [Unreleased]
 
-## [v1.2.3] (2023-05-16)
-
-- Wallet - Allow users to choose validator under the Advanced Settings 🟢 ([#2489])
-
-[#2489]: https://github.com/nymtech/nym/issues/2489
-
 ## [v1.2.2] (2023-05-02)
 
 - Wallet - change "Bond more" action to "Change bond amount" to allow for increasing and decreasing the amount in the same modal ([#2134])

nym-wallet/Cargo.lock

@@ -981,22 +981,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"
@@ -2969,7 +2953,6 @@ dependencies = [
  "cosmwasm-std",
  "cw-utils",
  "cw3",
- "cw3-fixed-multisig",
  "cw4",
  "schemars",
  "serde",
@@ -3089,7 +3072,6 @@ dependencies = [
  "nym-name-service-common",
  "nym-network-defaults",
  "nym-service-provider-directory-common",
- "nym-vesting-contract",
  "nym-vesting-contract-common",
  "prost",
  "reqwest",
@@ -3168,7 +3150,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.2.3"
+version = "1.2.2"
 dependencies = [
  "async-trait",
  "base64 0.13.1",

nym-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymproject/nym-wallet-app",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "main": "index.js",
   "license": "MIT",
   "scripts": {

nym-wallet/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.2.3"
+version = "1.2.2"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""

nym-wallet/src-tauri/src/config/mod.rs

@@ -57,10 +57,6 @@ pub struct NetworkConfig {
 
     // User selected urls
     selected_nyxd_url: Option<Url>,
-    // Default nyxd URL assigned during login, can be used when the user wants
-    // to revert back its selected validator URL
-    default_nyxd_url: Option<Url>,
-
     selected_api_url: Option<Url>,
 
     // Additional user provided validators.
@@ -89,7 +85,6 @@ impl Default for NetworkConfig {
     fn default() -> Self {
         Self {
             version: Some(CURRENT_NETWORK_CONFIG_VERSION),
-            default_nyxd_url: None,
             selected_nyxd_url: None,
             selected_api_url: None,
             nyxd_urls: None,
@@ -246,30 +241,6 @@ impl Config {
             .expect("Wrong format for bandwidth claim contract address")
     }
 
-    pub fn set_default_nyxd_urls(&mut self, urls: &HashMap<WalletNetwork, Url>) {
-        for (network, url) in urls {
-            self.set_default_nyxd_url(url.to_owned(), network);
-        }
-    }
-
-    pub fn set_default_nyxd_url(&mut self, nyxd_url: Url, network: &WalletNetwork) {
-        log::debug!(
-            "set default nyxd URL for {network} {}",
-            nyxd_url.to_string()
-        );
-        if let Some(net) = self.networks.get_mut(&network.as_key()) {
-            net.default_nyxd_url = Some(nyxd_url);
-        } else {
-            self.networks.insert(
-                network.as_key(),
-                NetworkConfig {
-                    default_nyxd_url: Some(nyxd_url),
-                    ..NetworkConfig::default()
-                },
-            );
-        }
-    }
-
     pub fn select_nyxd_url(&mut self, nyxd_url: Url, network: WalletNetwork) {
         if let Some(net) = self.networks.get_mut(&network.as_key()) {
             net.selected_nyxd_url = Some(nyxd_url);
@@ -284,13 +255,6 @@ impl Config {
         }
     }
 
-    pub fn reset_nyxd_url(&mut self, network: WalletNetwork) {
-        match self.networks.get_mut(&network.as_key()) {
-            Some(net) => net.selected_nyxd_url = None,
-            None => log::warn!("reset_nyxd_url: {network} network not found, ignoring"),
-        }
-    }
-
     pub fn select_nym_api_url(&mut self, api_url: Url, network: WalletNetwork) {
         if let Some(net) = self.networks.get_mut(&network.as_key()) {
             net.selected_api_url = Some(api_url);
@@ -298,7 +262,7 @@ impl Config {
             self.networks.insert(
                 network.as_key(),
                 NetworkConfig {
-                    selected_api_url: Some(api_url),
+                    selected_nyxd_url: Some(api_url),
                     ..NetworkConfig::default()
                 },
             );
@@ -306,25 +270,9 @@ impl Config {
     }
 
     pub fn get_selected_validator_nyxd_url(&self, network: WalletNetwork) -> Option<Url> {
-        self.networks.get(&network.as_key()).and_then(|config| {
-            log::debug!(
-                "get selected nyxd url for {} {:?}",
-                network.to_string(),
-                config.selected_nyxd_url,
-            );
-            config.selected_nyxd_url.clone()
-        })
-    }
-
-    pub fn get_default_nyxd_url(&self, network: WalletNetwork) -> Option<Url> {
-        self.networks.get(&network.as_key()).and_then(|config| {
-            log::debug!(
-                "get default nyxd url for {} {:?}",
-                network.to_string(),
-                config.default_nyxd_url,
-            );
-            config.default_nyxd_url.clone()
-        })
+        self.networks
+            .get(&network.as_key())
+            .and_then(|config| config.selected_nyxd_url.clone())
     }
 
     pub fn get_selected_nym_api_url(&self, network: &WalletNetwork) -> Option<Url> {
@@ -625,7 +573,6 @@ api_url = 'https://baz/api'
             r#"{
   "version": 1,
   "selected_nyxd_url": null,
-  "default_nyxd_url": null,
   "selected_api_url": "https://my_api_url.com/",
   "nyxd_urls": [
     {

nym-wallet/src-tauri/src/error.rs

@@ -130,10 +130,6 @@ pub enum BackendError {
     NewWindowError,
     #[error("Failed to check for application update")]
     CheckAppVersionError,
-    #[error("Failed to connect to the provided validator URL")]
-    WalletValidatorConnectionFailed,
-    #[error("No defined default validator URL")]
-    WalletNoDefaultValidator,
 
     #[error(transparent)]
     WalletError {

nym-wallet/src-tauri/src/main.rs

@@ -94,9 +94,6 @@ fn main() {
             network_config::remove_validator,
             network_config::select_nym_api_url,
             network_config::select_nyxd_url,
-            network_config::reset_nyxd_url,
-            network_config::get_default_nyxd_url,
-            network_config::get_selected_nyxd_url,
             network_config::update_nyxd_urls,
             state::load_config_from_files,
             state::save_config_to_files,

nym-wallet/src-tauri/src/network_config.rs

@@ -26,28 +26,6 @@ pub async fn get_nym_api_urls(
     Ok(ValidatorUrls { urls })
 }
 
-#[tauri::command]
-pub async fn get_selected_nyxd_url(
-    network: WalletNetwork,
-    state: tauri::State<'_, WalletState>,
-) -> Result<Option<String>, BackendError> {
-    let state = state.read().await;
-    let url = state.get_selected_nyxd_url(&network).map(String::from);
-    log::info!("Selected nyxd url for {network}: {:?}", url);
-    Ok(url)
-}
-
-#[tauri::command]
-pub async fn get_default_nyxd_url(
-    network: WalletNetwork,
-    state: tauri::State<'_, WalletState>,
-) -> Result<String, BackendError> {
-    let state = state.read().await;
-    let url = state.get_default_nyxd_url(&network).map(String::from);
-    log::info!("Default nyxd url for {network}: {:?}", url);
-    url.ok_or_else(|| BackendError::WalletNoDefaultValidator)
-}
-
 #[tauri::command]
 pub async fn select_nyxd_url(
     url: &str,
@@ -55,19 +33,7 @@ pub async fn select_nyxd_url(
     state: tauri::State<'_, WalletState>,
 ) -> Result<(), BackendError> {
     log::debug!("Selecting new nyxd url for {network}: {url}");
-    state.write().await.select_nyxd_url(url, network).await?;
-    state.read().await.save_config_files()?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn reset_nyxd_url(
-    network: WalletNetwork,
-    state: tauri::State<'_, WalletState>,
-) -> Result<(), BackendError> {
-    log::debug!("Resetting nyxd url for {network} to default");
-    state.write().await.reset_nyxd_url(network)?;
-    state.read().await.save_config_files()?;
+    state.write().await.select_nyxd_url(url, network)?;
     Ok(())
 }
 

nym-wallet/src-tauri/src/operations/mixnet/account.rs

@@ -3,8 +3,8 @@ use crate::error::BackendError;
 use crate::network_config;
 use crate::state::{WalletAccountIds, WalletState};
 use crate::wallet_storage::{self, UserPassword, DEFAULT_LOGIN_ID};
-use bip39::rand::seq::SliceRandom;
-use bip39::{rand, Language, Mnemonic};
+use bip39::rand::{self, seq::SliceRandom};
+use bip39::{Language, Mnemonic};
 use cosmrs::bip32::DerivationPath;
 use itertools::Itertools;
 use nym_config::defaults::{NymNetworkDetails, COSMOS_DERIVATION_PATH};
@@ -118,14 +118,6 @@ async fn _connect_with_mnemonic(
         let state = state.read().await;
         (state.get_all_nyxd_urls(), state.get_all_api_urls())
     };
-
-    let (nyxd_urls, api_urls) = run_connection_test(
-        untested_nyxd_urls.clone(),
-        untested_api_urls.clone(),
-        &config,
-    )
-    .await;
-
     let default_nyxd_urls: HashMap<WalletNetwork, Url> = untested_nyxd_urls
         .iter()
         .map(|(network, urls)| (*network, urls.iter().next().unwrap().clone()))
@@ -135,17 +127,19 @@ async fn _connect_with_mnemonic(
         .map(|(network, urls)| (*network, urls.iter().next().unwrap().clone()))
         .collect();
 
-    let nyxd_urls = pick_good_nyxd_urls(&default_nyxd_urls, &nyxd_urls).await?;
-    let api_urls = pick_good_api_urls(&default_api_urls, &api_urls).await?;
-
-    {
-        let mut w_state = state.write().await;
-        // Save the checked nyxd URLs
-        w_state.set_default_nyxd_urls(&nyxd_urls);
-    }
+    // Run connection tests on all nyxd and nym-api endpoints
+    let (nyxd_urls, api_urls) =
+        run_connection_test(untested_nyxd_urls, untested_api_urls, &config).await;
 
     // Create clients for all networks
-    let clients = create_clients(&nyxd_urls, &api_urls, &config, &mnemonic)?;
+    let clients = create_clients(
+        &nyxd_urls,
+        &api_urls,
+        &default_nyxd_urls,
+        &default_api_urls,
+        &config,
+        &mnemonic,
+    )?;
 
     // Set the default account
     let default_network = WalletNetwork::MAINNET;
@@ -202,51 +196,9 @@ async fn run_connection_test(
     .await
 }
 
-async fn pick_good_nyxd_urls(
-    default_nyxd_urls: &HashMap<WalletNetwork, Url>,
-    nyxd_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
-) -> Result<HashMap<WalletNetwork, Url>, BackendError> {
-    let nyxd_urls: HashMap<WalletNetwork, Url> = WalletNetwork::iter()
-        .map(|network| {
-            let default_nyxd_url = default_nyxd_urls
-                .get(&network)
-                .expect("Expected at least one nyxd_url");
-            let url = select_random_responding_url(nyxd_urls, network).unwrap_or_else(|| {
-                log::warn!(
-                    "No successful nyxd_urls for {network}: using default: {default_nyxd_url}"
-                );
-                default_nyxd_url.clone()
-            });
-            log::info!("Set default nyxd_url for {network}: {url}");
-            (network, url)
-        })
-        .collect();
-
-    Ok(nyxd_urls)
-}
-
-async fn pick_good_api_urls(
-    default_api_urls: &HashMap<WalletNetwork, Url>,
-    api_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
-) -> Result<HashMap<WalletNetwork, Url>, BackendError> {
-    let api_urls: HashMap<WalletNetwork, Url> = WalletNetwork::iter()
-        .map(|network| {
-            let default_api_url = default_api_urls
-                .get(&network)
-                .expect("Expected at least one api_url");
-            let url = select_first_responding_url(api_urls, network).unwrap_or_else(|| {
-                log::warn!("No passing api_urls for {network}: using default: {default_api_url}");
-                default_api_url.clone()
-            });
-            log::info!("Set default api_url for {network}: {url}");
-            (network, url)
-        })
-        .collect();
-
-    Ok(api_urls)
-}
-
 fn create_clients(
+    nyxd_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
+    api_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
     default_nyxd_urls: &HashMap<WalletNetwork, Url>,
     default_api_urls: &HashMap<WalletNetwork, Url>,
     config: &Config,
@@ -258,22 +210,28 @@ fn create_clients(
             log::debug!("Using selected nyxd_url for {network}: {url}");
             url.clone()
         } else {
-            let url = default_nyxd_urls
+            let default_nyxd_url = default_nyxd_urls
                 .get(&network)
                 .expect("Expected at least one nyxd_url");
-            log::debug!("Using default nyxd_url for {network}: {url}");
-            url.to_owned()
+            select_random_responding_url(nyxd_urls, network).unwrap_or_else(|| {
+                log::debug!(
+                    "No successful nyxd_urls for {network}: using default: {default_nyxd_url}"
+                );
+                default_nyxd_url.clone()
+            })
         };
 
         let api_url = if let Some(url) = config.get_selected_nym_api_url(&network) {
             log::debug!("Using selected api_url for {network}: {url}");
             url.clone()
         } else {
-            let url = default_api_urls
+            let default_api_url = default_api_urls
                 .get(&network)
                 .expect("Expected at least one api url");
-            log::debug!("Using default api_url for {network}: {url}");
-            url.to_owned()
+            select_first_responding_url(api_urls, network).unwrap_or_else(|| {
+                log::debug!("No passing api_urls for {network}: using default: {default_api_url}");
+                default_api_url.clone()
+            })
         };
 
         log::info!("Connecting to: nyxd_url: {nyxd_url} for {network}");

nym-wallet/src-tauri/src/state.rs

@@ -437,20 +437,7 @@ impl WalletStateInner {
         }
     }
 
-    pub async fn select_nyxd_url(
-        &mut self,
-        url: &str,
-        network: Network,
-    ) -> Result<(), BackendError> {
-        if !nym_validator_client::connection_tester::test_nyxd_url_connection(
-            network.into(),
-            url.parse()?,
-            self.config.get_mixnet_contract_address(network),
-        )
-        .await?
-        {
-            return Err(BackendError::WalletValidatorConnectionFailed);
-        }
+    pub fn select_nyxd_url(&mut self, url: &str, network: Network) -> Result<(), BackendError> {
         self.config.select_nyxd_url(url.parse()?, network);
         if let Ok(client) = self.client_mut(network) {
             client.change_nyxd(url.parse()?)?;
@@ -458,29 +445,6 @@ impl WalletStateInner {
         Ok(())
     }
 
-    pub fn reset_nyxd_url(&mut self, network: Network) -> Result<(), BackendError> {
-        self.config.reset_nyxd_url(network);
-        let default_nyxd = self.config.get_default_nyxd_url(network);
-        if let Ok(client) = self.client_mut(network) {
-            if let Some(url) = default_nyxd {
-                client.change_nyxd(url)?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn set_default_nyxd_urls(&mut self, urls: &HashMap<Network, Url>) {
-        self.config.set_default_nyxd_urls(urls);
-    }
-
-    pub fn get_selected_nyxd_url(&self, network: &Network) -> Option<Url> {
-        self.config.get_selected_validator_nyxd_url(*network)
-    }
-
-    pub fn get_default_nyxd_url(&self, network: &Network) -> Option<Url> {
-        self.config.get_default_nyxd_url(*network)
-    }
-
     pub fn select_nym_api_url(&mut self, url: &str, network: Network) -> Result<(), BackendError> {
         self.config.select_nym_api_url(url.parse()?, network);
         if let Ok(client) = self.client_mut(network) {

nym-wallet/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.2.3"
+    "version": "1.2.2"
   },
   "build": {
     "distDir": "../dist",

nym-wallet/src/components/Settings/SelectValidator.tsx

@@ -1,185 +0,0 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { Button, FormControl, Grid, Stack, Switch, TextField, Typography } from '@mui/material';
-import { useSnackbar } from 'notistack';
-import {
-  checkMixnodeOwnership,
-  getDefaultValidatorUrl,
-  getSelectedValidatorUrl,
-  resetValidatorUrl,
-  setSelectedValidatorUrl as setSelectedValidatorUrlReq,
-} from '../../requests';
-import { AppContext } from '../../context';
-import { Console } from '../../utils/console';
-import { Network } from '../../types';
-
-const SelectValidator = () => {
-  const [customValidatorEnabled, setCustomValidatorEnabled] = useState<boolean>(false);
-  const [selectedValidatorUrl, setSelectedValidatorUrl] = useState<string | null>();
-  const [defaultValidatorUrl, setDefaultValidatorUrl] = useState<string | null>();
-  const [validatorUrlInput, setValidatorUrlInput] = useState<string>('');
-  const [isLoading, setIsLoading] = useState(false);
-  const { network } = useContext(AppContext);
-
-  const { enqueueSnackbar } = useSnackbar();
-
-  const getDefaultValidator = async (net: Network) => {
-    if (!network) {
-      return;
-    }
-    try {
-      const defaultValidator = await getDefaultValidatorUrl(net);
-      setDefaultValidatorUrl(defaultValidator);
-    } catch (e) {
-      Console.error(`an error occurred while requesting the default validator URL: ${e}`);
-    }
-  };
-
-  const getSelectedValidator = async (net: Network) => {
-    if (!network) {
-      return null;
-    }
-    try {
-      const selectedValidator = await getSelectedValidatorUrl(net);
-      setSelectedValidatorUrl(selectedValidator);
-    } catch (e) {
-      Console.error(`an error occurred while requesting the selected validator URL: ${e}`);
-    }
-    return null;
-  };
-
-  useEffect(() => {
-    if (network) {
-      getDefaultValidator(network);
-      getSelectedValidator(network);
-    }
-  }, [network, customValidatorEnabled]);
-
-  useEffect(() => {
-    // on network change, turn off the custom val switch if there is no selected val
-    // for this network
-    if (!selectedValidatorUrl) {
-      setCustomValidatorEnabled(false);
-      setValidatorUrlInput('');
-    }
-  }, [network, selectedValidatorUrl]);
-
-  useEffect(() => {
-    if (selectedValidatorUrl && selectedValidatorUrl !== defaultValidatorUrl) {
-      setCustomValidatorEnabled(true);
-    }
-
-    if (selectedValidatorUrl) {
-      setValidatorUrlInput(selectedValidatorUrl);
-    }
-  }, [selectedValidatorUrl, defaultValidatorUrl, network]);
-
-  const onToggle = async () => {
-    if (!customValidatorEnabled) {
-      setCustomValidatorEnabled(true);
-      return;
-    }
-    setIsLoading(true);
-    try {
-      await resetValidatorUrl(network as Network);
-      setValidatorUrlInput('');
-      setSelectedValidatorUrl(null);
-      setCustomValidatorEnabled(false);
-    } catch (e) {
-      Console.error(e);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const saveValidator = async () => {
-    if (!network || !validatorUrlInput || validatorUrlInput === defaultValidatorUrl) {
-      return;
-    }
-    setIsLoading(true);
-    try {
-      // this tauri request also does a basic connection check
-      await setSelectedValidatorUrlReq({ network, url: validatorUrlInput });
-    } catch (e) {
-      Console.error(e);
-      enqueueSnackbar(`Invalid validator URL: ${e}`, { variant: 'error' });
-      setIsLoading(false);
-      return;
-    }
-
-    // to enforce the validator URL is valid, try to query the node ownership
-    // if it fails, that means the endpoint is wrong
-    // TODO this check logic should be handled directly in the rust side, `select_nyxd_url` command
-    try {
-      await checkMixnodeOwnership();
-      enqueueSnackbar('Validator URL saved', { variant: 'success' });
-    } catch (e) {
-      Console.error(e);
-      enqueueSnackbar('The given validator URL is not valid for the currently selected network', { variant: 'error' });
-      await resetValidatorUrl(network as Network);
-      setSelectedValidatorUrl(null);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <Grid container spacing={2} padding={3}>
-      <Grid item sm={12} md={7} lg={8}>
-        <Stack direction="column" gap={1}>
-          <Typography variant="h6">Change validator</Typography>
-          <Typography variant="caption" sx={{ color: 'nym.text.muted' }}>
-            You can use the validator of your choice by providing its RPC URL address
-          </Typography>
-          <Stack direction="row" spacing={3} mt={2} alignItems="center">
-            <Typography>Turn Off</Typography>
-            <Switch checked={customValidatorEnabled} onChange={onToggle} inputProps={{ 'aria-label': 'controlled' }} />
-            <Typography>Turn On</Typography>
-          </Stack>
-        </Stack>
-      </Grid>
-      <Grid item sm={12} md={5} lg={4}>
-        <Stack spacing={3} alignItems="flex-end">
-          {customValidatorEnabled ? (
-            <FormControl fullWidth>
-              <Stack spacing={3} mt={2}>
-                <TextField
-                  name="validatorUrl"
-                  label="Validator URL"
-                  value={validatorUrlInput}
-                  onChange={(e) => setValidatorUrlInput(e.target.value)}
-                  error={false}
-                  InputLabelProps={{ shrink: true }}
-                  fullWidth
-                  disabled={!customValidatorEnabled}
-                  autoFocus
-                />
-                <Button
-                  size="large"
-                  variant="contained"
-                  disabled={
-                    !validatorUrlInput ||
-                    validatorUrlInput.length === 0 ||
-                    validatorUrlInput === defaultValidatorUrl ||
-                    validatorUrlInput === selectedValidatorUrl ||
-                    isLoading ||
-                    !customValidatorEnabled
-                  }
-                  onClick={saveValidator}
-                >
-                  Use this validator
-                </Button>
-              </Stack>
-            </FormControl>
-          ) : (
-            <Stack spacing={2} alignItems="end" mt={3} mr={1}>
-              <Typography variant="body2">Default validator address</Typography>
-              <Typography>{defaultValidatorUrl}</Typography>
-            </Stack>
-          )}
-        </Stack>
-      </Grid>
-    </Grid>
-  );
-};
-
-export default SelectValidator;

nym-wallet/src/context/bonding.tsx

@@ -57,8 +57,6 @@ import {
 import { useCheckOwnership } from '../hooks/useCheckOwnership';
 import { AppContext } from './main';
 import {
-  fireRequests,
-  TauriReq,
   attachDefaultOperatingCost,
   decCoinToDisplay,
   toPercentFloatString,
@@ -164,6 +162,12 @@ export const BondingContext = createContext<TBondingContext>({
   isVestingAccount: false,
 });
 
+type TauriReq<Req extends Function & ((a: any, b?: any) => Promise<any>)> = {
+  name: Req['name'];
+  request: () => ReturnType<Req>;
+  onFulfilled: (value: Awaited<ReturnType<Req>>) => void;
+};
+
 export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Element => {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string>();
@@ -188,6 +192,19 @@ export const BondingContextProvider: FCWithChildren = ({ children }): JSX.Elemen
     setBondedNode(undefined);
   };
 
+  const fireRequests = async (reqs: TauriReq<any>[]) => {
+    const promises = await Promise.allSettled(reqs.map((r) => r.request()));
+
+    promises.forEach((res, index) => {
+      if (res.status === 'rejected') {
+        Console.warn(`${reqs[index].name} request fails`, res.reason);
+      }
+      if (res.status === 'fulfilled') {
+        reqs[index].onFulfilled(res.value as any);
+      }
+    });
+  };
+
   /**
    * Fetch mixnode **optional** data.
    * ⚠ The underlying queries are allowed to fail.

nym-wallet/src/pages/settings/AdvancedSettings.tsx

@@ -3,7 +3,6 @@ import { Box, Button, Divider, Stack, Typography } from '@mui/material';
 import { helpLogToggleWindow } from '../../requests';
 import { AppContext } from '../../context';
 import { config } from '../../config';
-import SelectValidator from '../../components/Settings/SelectValidator';
 
 const AdvancedSettings = () => {
   const { handleShowTerminal, appEnv } = useContext(AppContext);
@@ -41,8 +40,6 @@ const AdvancedSettings = () => {
           </Button>
         </Box>
       </Stack>
-      <Divider />
-      <SelectValidator />
     </Box>
   );
 };

nym-wallet/src/requests/network.ts

@@ -3,14 +3,3 @@ import { Network } from 'src/types';
 import { invokeWrapper } from './wrapper';
 
 export const selectNetwork = async (network: Network) => invokeWrapper<Account>('switch_network', { network });
-
-export const getSelectedValidatorUrl = async (network: Network) =>
-  invokeWrapper<string | null>('get_selected_nyxd_url', { network });
-
-export const getDefaultValidatorUrl = async (network: Network) =>
-  invokeWrapper<string | null>('get_default_nyxd_url', { network });
-
-export const setSelectedValidatorUrl = async (args: { network: Network; url: string }) =>
-  invokeWrapper<void>('select_nyxd_url', args);
-
-export const resetValidatorUrl = async (network: Network) => invokeWrapper<void>('reset_nyxd_url', { network });

nym-wallet/src/utils/fireRequests.ts

@@ -1,22 +0,0 @@
-import { Console } from 'src/utils/console';
-
-export type TauriReq<Req extends Function & ((a: any, b?: any) => Promise<any>)> = {
-  name: Req['name'];
-  request: () => ReturnType<Req>;
-  onFulfilled: (value: Awaited<ReturnType<Req>>) => void;
-};
-
-async function fireRequests(requests: TauriReq<any>[]) {
-  const promises = await Promise.allSettled(requests.map((r) => r.request()));
-
-  promises.forEach((res, index) => {
-    if (res.status === 'rejected') {
-      Console.warn(`${requests[index].name} request fails`, res.reason);
-    }
-    if (res.status === 'fulfilled') {
-      requests[index].onFulfilled(res.value as any);
-    }
-  });
-}
-
-export default fireRequests;

nym-wallet/src/utils/index.ts

@@ -228,6 +228,3 @@ export const getIntervalAsDate = async () => {
 
   return { nextEpoch, nextInterval };
 };
-
-export * from './fireRequests';
-export { default as fireRequests } from './fireRequests';

service-providers/network-requester/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-network-requester"
-version = "1.1.19"
+version = "1.1.18"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.65"

service-providers/network-statistics/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-network-statistics"
-version = "1.1.19"
+version = "1.1.18"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

socks5-c/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "socks5-c"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+name = "socks5_c"
+crate-type = ["cdylib"]
+
+[dependencies]
+anyhow = "1.0"
+nym-client-core = { path = "../common/client-core", default-features = false }
+nym-config-common = { path = "../common/config", package = "nym-config" }
+nym-credential-storage = { path = "../common/credential-storage" }
+nym-crypto = { path = "../common/crypto" }
+nym-socks5-client-core = { path = "../common/socks5-client-core", default-features = false }
+openssl = { version = "0.10", features = ["vendored"] }
+tokio = { version = "1.24.1", features = ["sync", "time"] }
+log = "0.4.17"
+android_logger = "0.13.1"
+#reqwest = { version = "0.11", features = ["blocking", "json", "native-tls-vendored"] }
+
+[target.'cfg(target_os="android")'.dependencies]
+jni = { version = "0.21", default-features = false }

socks5-c/Makefile

@@ -0,0 +1,3 @@
+gen-header:
+	cbindgen --lang c --crate socks5-c --output socks5_c.h
+

socks5-c/build.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+export API=33
+export TOOLCHAIN="$NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64"
+export TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android$API-clang"
+export TARGET_AR="$TOOLCHAIN/bin/llvm-ar"
+export TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib"
+export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android$API-clang"
+
+cargo build --lib --target x86_64-linux-android --release

socks5-c/socks5_c.h

@@ -0,0 +1,6 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void run_client(const char* service_provider);

socks5-c/src/lib.rs

@@ -0,0 +1,144 @@
+use anyhow::Result;
+use nym_client_core::client::key_manager::KeyManager;
+use nym_config_common::defaults::setup_env;
+use nym_credential_storage::ephemeral_storage::EphemeralStorage;
+use nym_socks5_client_core::config::Config as Socks5Config;
+use nym_socks5_client_core::NymClient as Socks5NymClient;
+use std::ffi::CStr;
+use std::os::raw::c_char;
+
+static SOCKS5_CONFIG_ID: &str = "mobile-socks5-test";
+
+#[cfg(target_os = "android")]
+#[allow(non_snake_case)]
+pub mod android {
+    extern crate jni;
+
+    use std::ffi::CString;
+
+    use self::jni::objects::{JClass, JString};
+    use self::jni::sys::jstring;
+    use self::jni::JNIEnv;
+    use super::*;
+
+    use android_logger::{Config, FilterBuilder};
+    use log::LevelFilter;
+
+    #[no_mangle]
+    #[allow(non_snake_case)]
+    pub extern "C" fn Java_net_nymtech_nyms5_Socks5_run<'local>(
+        mut env: JNIEnv<'local>,
+        _class: JClass<'local>,
+        input: JString<'local>,
+    ) -> jstring {
+        android_logger::init_once(
+            Config::default()
+                .with_max_level(LevelFilter::Trace)
+                .with_tag("libnyms5")
+                .with_filter(
+                    FilterBuilder::new()
+                        .parse("debug,tungstenite=warn,mio=warn,tokio_tungstenite=warn")
+                        .build(),
+                ),
+        );
+        log::debug!("Logger initialized");
+
+        let input: String = env
+            .get_string(&input)
+            .expect("Couldn't get java string!")
+            .into();
+
+        setup_env(None);
+
+        // TODO: does that leak memory and do we have to have a separate free method?
+        // I'd assume not because the allocation came from the caller
+        // let c_str = unsafe { CStr::from_ptr(service_provider) };
+        let c_str = CString::new("DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh").unwrap();
+        let service_provider = c_str
+            .to_str()
+            .expect("invalid service provider string value provided")
+            .to_string();
+
+        let rt = tokio::runtime::Runtime::new().unwrap();
+
+        rt.block_on(async move {
+            let (config, keys) = init_dummy_socks5_config(service_provider).await.unwrap();
+            let socks5_client = Socks5NymClient::new_with_keys(config, Some(keys));
+            let mut shutdown_handle = socks5_client.start().await?;
+            shutdown_handle.wait_for_shutdown().await;
+
+            Ok::<(), anyhow::Error>(())
+        })
+        .unwrap();
+        log::info!("Done spawning socks5 client");
+
+        let output = env
+            .new_string(format!("Hello, {}!", input))
+            .expect("Couldn't create java string!");
+
+        output.into_raw()
+    }
+}
+
+/// # Safety
+///
+/// TODO
+#[no_mangle]
+pub unsafe extern "C" fn run_client(service_provider: *const c_char) {
+    setup_env(None);
+
+    // TODO: does that leak memory and do we have to have a separate free method?
+    // I'd assume not because the allocation came from the caller
+    let c_str = unsafe { CStr::from_ptr(service_provider) };
+    let service_provider = c_str
+        .to_str()
+        .expect("invalid service provider string value provided")
+        .to_string();
+
+    let rt = tokio::runtime::Runtime::new().unwrap();
+
+    rt.block_on(async move {
+        let (config, keys) = init_dummy_socks5_config(service_provider).await.unwrap();
+        let socks5_client = Socks5NymClient::new_with_keys(config, Some(keys));
+        let mut shutdown_handle = socks5_client.start().await?;
+        shutdown_handle.wait_for_shutdown().await;
+
+        Ok::<(), anyhow::Error>(())
+    })
+    .unwrap();
+}
+
+pub async fn init_dummy_socks5_config(
+    provider_address: String,
+    // chosen_gateway_id: String,
+) -> Result<(Socks5Config, KeyManager)> {
+    let mut config = Socks5Config::new(SOCKS5_CONFIG_ID, &provider_address);
+
+    if let Ok(raw_validators) = std::env::var(nym_config_common::defaults::var_names::NYM_API) {
+        config
+            .get_base_mut()
+            .set_custom_nym_apis(nym_config_common::parse_urls(&raw_validators));
+    }
+
+    let nym_api_endpoints = config.get_base().get_nym_api_endpoints();
+
+    // let _chosen_gateway_id = identity::PublicKey::from_base58_string(chosen_gateway_id)?;
+
+    let mut key_manager = nym_client_core::init::new_client_keys();
+
+    // Setup gateway and register a new key each time
+    let gateway = nym_client_core::init::register_with_gateway::<EphemeralStorage>(
+        &mut key_manager,
+        nym_api_endpoints,
+        //Some(chosen_gateway_id),
+        None,
+        false,
+    )
+    .await?;
+
+    config.get_base_mut().set_gateway_endpoint(gateway);
+
+    // let _address = *key_manager.identity_keypair().public_key();
+
+    Ok((config, key_manager))
+}

tools/nym-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.19"
+version = "1.1.18"
 authors.workspace = true
 edition = "2021"