diff --git a/app/src/main/java/com/tari/android/wallet/application/baseNodes/BaseNodesManager.kt b/app/src/main/java/com/tari/android/wallet/application/baseNodes/BaseNodesManager.kt index 60985375f..b29b91e09 100644 --- a/app/src/main/java/com/tari/android/wallet/application/baseNodes/BaseNodesManager.kt +++ b/app/src/main/java/com/tari/android/wallet/application/baseNodes/BaseNodesManager.kt @@ -24,10 +24,10 @@ import org.apache.commons.io.IOUtils import javax.inject.Inject import javax.inject.Singleton -private const val REGEX_ONION_WITH_NAME = "(.+::[A-Za-z0-9 ]{64}::/onion3/[A-Za-z0-9]+:[\\d]+)" -private const val REGEX_IPV4_WITH_NAME = "(.+::[A-Za-z0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})" -private const val REGEX_ONION = "([A-Za-z0-9 ]{64}::/onion3/[A-Za-z0-9]+:[\\d]+)" -private const val REGEX_IPV4 = "([A-Za-z0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})" +private const val REGEX_ONION_WITH_NAME = "(.+::[A-Fa-f0-9 ]{64}::/onion3/[A-Fa-f0-9]+:[\\d]+)" +private const val REGEX_IPV4_WITH_NAME = "(.+::[A-Fa-f0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})" +private const val REGEX_ONION = "([A-Fa-f0-9 ]{64}::/onion3/[A-Fa-f0-9]+:[\\d]+)" +private const val REGEX_IPV4 = "([A-Fa-f0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})" @Singleton class BaseNodesManager @Inject constructor( diff --git a/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt b/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt index 6091b88cf..236392e31 100644 --- a/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt +++ b/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt @@ -50,7 +50,6 @@ object DebugConfig { private const val _useYatSandbox = false val yatEnvironment = if (_useYatSandbox && isDebug()) YatEnvironment.SANDBOX else YatEnvironment.PRODUCTION - // Needed for testing resetting wallet on the network changed private const val _mockNetwork = false val mockNetwork = _mockNetwork && isDebug() diff --git a/app/src/main/res/raw/nextnet_base_nodes.txt b/app/src/main/res/raw/nextnet_base_nodes.txt index dd4490ce8..785d25cae 100644 --- a/app/src/main/res/raw/nextnet_base_nodes.txt +++ b/app/src/main/res/raw/nextnet_base_nodes.txt @@ -1,3 +1,6 @@ -NextNet 01::0cff11dff44458bfea3e39444d440e54260746ff2a5ce6a6c3f7355decff2167::/ip4/54.195.217.107/tcp/18189 -NextNet 02::0cff11dff44458bfea3e39444d440e54260746ff2a5ce6a6c3f7355decff2167::/onion3/h6oj2cusgtaxo63zbfw2wjir4mltkqzz4jquoak2i5mvgyszaieowwad:18141 -NextNet 03::4c236de788e803ef9615f72a4d973cf3f8a9b83c9d2fb176cbaf65c1b0442572::/onion3/3jtk3e2ud3zqtbrq36sw6ata6u5epkjmqgr5tfuemcfpyhisrzkgbtyd:18141 \ No newline at end of file +NextNet 1::0cff11dff44458bfea3e39444d440e54260746ff2a5ce6a6c3f7355decff2167::/ip4/54.195.217.107/tcp/18189 +NextNet 2::0cff11dff44458bfea3e39444d440e54260746ff2a5ce6a6c3f7355decff2167::/onion3/cmdlunlzessyz7snnat6ktxwmcl7bubvfzneb7ljva4w4izcmlqyc2id:18141 +NextNet 3::2caf4be53523ecf2b71ca23db33f7df590fd41792b2d14c2bb0bbebe1b2c4b52::/ip4/34.254.114.227/tcp/18189 +NextNet 4::2caf4be53523ecf2b71ca23db33f7df590fd41792b2d14c2bb0bbebe1b2c4b52::/onion3/wi2teiwyyq33jwblcuy7anmja6d7iyuciyrzbwumvldeiw73d6ce5ryd:18141 +NextNet 5::4c236de788e803ef9615f72a4d973cf3f8a9b83c9d2fb176cbaf65c1b0442572::/ip4/52.210.35.123/tcp/18189 +NextNet 6::4c236de788e803ef9615f72a4d973cf3f8a9b83c9d2fb176cbaf65c1b0442572::/onion3/7gwfakr7ko5uo3fl3yz3fsjc7elccbzter5botggodrmmwi2exm3vbid:18141 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 511dc024d..ac1e5d3f6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { ext.lifecycle_version = '2.6.2' // build & version - ext.buildNumber = 288 - ext.versionNumber = "0.25.2" + ext.buildNumber = 290 + ext.versionNumber = "0.25.3" // JNI libs ext.libwalletHostURL = "https://github.com/tari-project/tari/releases/download/"