Merge tag 'v0.5.0-rc.1' into develop

v0.5.0-rc.1

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [Unreleased](https://github.com/nymtech/nym/tree/HEAD)
+
+[Full Changelog](https://github.com/nymtech/nym/compare/v0.4.1...HEAD)
+
+**Closed issues:**
+
+- COMPILE: Could not compile project using Cargo [\#118](https://github.com/nymtech/nym/issues/118)
+- Wherever unbounded mpsc channel is used, prefer unbounded\_send\(\) over send\(\).await [\#90](https://github.com/nymtech/nym/issues/90)
+- Add a `Send` method in nym-client [\#81](https://github.com/nymtech/nym/issues/81)
+- Start on Tendermint integration [\#79](https://github.com/nymtech/nym/issues/79)
+- Ditch DummyKeyPair [\#75](https://github.com/nymtech/nym/issues/75)
+- Replace args with proper config files [\#69](https://github.com/nymtech/nym/issues/69)
+- Fix incorrectly used Arcs [\#47](https://github.com/nymtech/nym/issues/47)
+- nym-mixnode mandatory host option [\#26](https://github.com/nymtech/nym/issues/26)
+- Create config struct for mixnode \(possibly also for client\) [\#21](https://github.com/nymtech/nym/issues/21)
+- Reuse TCP socket connection between client and mixnodes [\#20](https://github.com/nymtech/nym/issues/20)
+- Once implementation is available, wherever appropriate, replace `futures::lock::Mutex` with `futures::lock::RwLock` [\#9](https://github.com/nymtech/nym/issues/9)
+- Check if RwLock on MixProcessingData is still needed [\#8](https://github.com/nymtech/nym/issues/8)
+- Reuse TCP socket connection between mixnodes and providers [\#3](https://github.com/nymtech/nym/issues/3)
+- Persistent socket connection with other mixes [\#2](https://github.com/nymtech/nym/issues/2)
+
+**Merged pull requests:**
+
+- Feature/client refactoring [\#128](https://github.com/nymtech/nym/pull/128) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/provider refactoring [\#125](https://github.com/nymtech/nym/pull/125) ([jstuczyn](https://github.com/jstuczyn))
+- all: fixing mis-spelling [\#123](https://github.com/nymtech/nym/pull/123) ([futurechimp](https://github.com/futurechimp))
+- Feature/further clippy fixes [\#121](https://github.com/nymtech/nym/pull/121) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/tokio tungstenite dependency fix [\#120](https://github.com/nymtech/nym/pull/120) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/config files cleanup [\#119](https://github.com/nymtech/nym/pull/119) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/config files [\#117](https://github.com/nymtech/nym/pull/117) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/un genericize keys [\#111](https://github.com/nymtech/nym/pull/111) ([futurechimp](https://github.com/futurechimp))
+- Feature/abci [\#110](https://github.com/nymtech/nym/pull/110) ([futurechimp](https://github.com/futurechimp))
+- Simplified the use of generics on identity keypair by using output types [\#109](https://github.com/nymtech/nym/pull/109) ([jstuczyn](https://github.com/jstuczyn))
+
 ## [v0.4.1](https://github.com/nymtech/nym/tree/v0.4.1) (2020-01-29)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/v0.4.0...v0.4.1)
@@ -94,6 +128,10 @@ This release also integrates a health-checker and network topology refresh into
 
 [Full Changelog](https://github.com/nymtech/nym/compare/v0.3.1...v0.3.2)
 
+**Merged pull requests:**
+
+- Feature/separate presence address [\#59](https://github.com/nymtech/nym/pull/59) ([jstuczyn](https://github.com/jstuczyn))
+
 ## [v0.3.1](https://github.com/nymtech/nym/tree/v0.3.1) (2020-01-16)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/v0.3.0...v0.3.1)
@@ -120,7 +158,6 @@ This release also integrates a health-checker and network topology refresh into
 
 **Merged pull requests:**
 
-- Feature/separate presence address [\#59](https://github.com/nymtech/nym/pull/59) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/client topology filtering [\#54](https://github.com/nymtech/nym/pull/54) ([jstuczyn](https://github.com/jstuczyn))
 - print public key for nym client tools [\#53](https://github.com/nymtech/nym/pull/53) ([mileschet](https://github.com/mileschet))
 - Showing binding warning on binding to localhost, 0.0.0.0 or 127.0.0.1 [\#52](https://github.com/nymtech/nym/pull/52) ([jstuczyn](https://github.com/jstuczyn))

Cargo.lock

@@ -1448,7 +1448,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 dependencies = [
  "addressing",
  "bs58",
@@ -1482,7 +1482,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 dependencies = [
  "addressing",
  "bs58",
@@ -1507,7 +1507,7 @@ dependencies = [
 
 [[package]]
 name = "nym-sfw-provider"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 dependencies = [
  "bs58",
  "built",
@@ -1535,7 +1535,7 @@ dependencies = [
 
 [[package]]
 name = "nym-validator"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 dependencies = [
  "abci",
  "built",

mixnode/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "nym-mixnode"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
 

nym-client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "nym-client"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
 

scripts/run_local_network.sh

@@ -21,24 +21,32 @@ killall nym-mixnode
 killall nym-sfw-provider
 
 echo "Press CTRL-C to stop."
+echo "Make sure you have started nym-directory !"
 
-cargo build
+cargo build --release --manifest-path nym-client/Cargo.toml --features=local
+cargo build --release --manifest-path mixnode/Cargo.toml --features=local
+cargo build --release --manifest-path sfw-provider/Cargo.toml --features=local
 
 MAX_LAYERS=3
 NUMMIXES=${1:-3} # Set $NUMMIXES to default of 3, but allow the user to set other values if desired
 
+
+$PWD/target/release/nym-sfw-provider init --id provider-local --clients-host 127.0.0.1 --mix-host 127.0.0.1 --mix-port 4000 --mix-announce-port 4000
+$PWD/target/release/nym-sfw-provider run --id provider-local &
+
+sleep 1
+
 for (( j=0; j<$NUMMIXES; j++ ))
 
 # Note: to disable logging (or direct it to another output) modify the constant on top of mixnode or provider;
 # Will make it later either configurable by flags or config file.
 do
     let layer=j%MAX_LAYERS+1
-    $PWD/target/debug/nym-mixnode run --port $((9980+$j)) --host "localhost" --layer $layer --directory http://localhost:8080 &
+    $PWD/target/release/nym-mixnode init --id mix-local$j --host 127.0.0.1 --port $((9980+$j)) --layer $layer --announce-host 127.0.0.1:$((9980+$j))
+    $PWD/target/release/nym-mixnode run --id mix-local$j &
     sleep 1
 done
 
-sleep 1
-$PWD/target/debug/nym-sfw-provider run --clientHost "localhost" --mixHost "localhost" --mixPort 9997 --clientPort 9998 --directory http://localhost:8080
 
 # trap call ctrl_c()
 trap ctrl_c SIGINT SIGTERM SIGTSTP

sfw-provider/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "nym-sfw-provider"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2018"
 

validator/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 build = "build.rs"
 name = "nym-validator"
-version = "0.4.1"
+version = "0.5.0-rc.1"
 authors = ["Jedrzej Stuczynski <andrew@nymtech.net>"]
 edition = "2018"