Ico updates

.gitignore

@@ -248,6 +248,7 @@ ModelManifest.xml
 
 # dependencies
 **/node_modules
+package-lock.json
 
 # IDEs and editors
 /.idea
@@ -285,19 +286,14 @@ Thumbs.db
 # This .gitignore file was automatically created by Microsoft(R) Visual Studio.
 ################################################################################
 
-/Breeze.Api/.vs
-/Breeze.Api/src/Breeze.Api.Tests/bin
-/Breeze.Api/src/Breeze.Api.Tests/obj
-/Breeze.Api/src/Breeze.Api/bin
-/Breeze.Api/src/Breeze.Api/obj
 *.user
-/Breeze.Api/src/Breeze.Api/Wallets
-/Breeze.Api/src/Breeze.Wallet/bin
-/Breeze.Api/src/Breeze.Wallet/obj
 
 # DNX
 project.lock.json
 /Breeze/src/Breeze.Daemon/Wallets
 /Breeze/src/Breeze.Daemon/Logs
 /Breeze.UI/.vscode/.BROWSE.VC.DB-wal
 /Breeze.UI/.vscode/.BROWSE.VC.DB-shm
+/Breeze.UI/daemon
+/Breeze.UI/app-builds
+/Breeze.UI/dist

.travis.yml

@@ -1,18 +1,17 @@
 language: csharp
 mono: none
-dotnet: 1.0.4
+dotnet: 2.1.301
 matrix:
   include:
   - os: linux # Ubuntu 14.04
     dist: trusty
     sudo: required
-    env: os_identifier=ubuntu.14.04
-  - os: osx # OSX 10.11
-    osx_image: xcode7.3
-    env: os_identifier=osx.10.11
   - os: osx # OSX 10.12
-    osx_image: xcode8.1
-    env: os_identifier=osx.10.12
+    osx_image: xcode9
+    before_install:
+    - brew update
+    - ulimit -n 1024
+    - os_platform=darwin
 
 # branches to build 
 branches:
@@ -25,26 +24,39 @@ env:
   - arch=x64
   - configuration=Release  
   - os_platform=linux
-  - TRAVIS_TAG=cd-unstable
-
+  - CSC_IDENTITY_AUTO_DISCOVERY=false 
+
+cache:
+  directories:
+  - ${TRAVIS_BUILD_DIR}/Breeze.UI/node_modules
+  - $HOME/.electron
+  - $HOME/.nuget/packages
+  - /usr/share/dotnet/sdk/ # dotnet path for linux
+  - /Users/travis/.dotnet/sdk/ # dotnet path for mac
+
 # Work around NuGet issue #2163
 # https://github.com/NuGet/Home/issues/2163
 # https://github.com/travis-ci/travis-ci/issues/7728
 
-before_install:
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 1024 ; os_platform=darwin ; fi
-
 install:
 - nvm install 6
+
+before_script:
+- if [ -z "$TRAVIS_TAG" ] ; then TRAVIS_TAG=cd-unstable; fi
+
 script:
 - chmod +x build.sh
 - "./build.sh"
+
 deploy:
   provider: releases
   api_key:
     secure: $secure_github_key # this key is set on the Travis build page 
   file_glob: true
-  file: "$TRAVIS_BUILD_DIR/deploy/*.zip"
+  file: 
+    - "$TRAVIS_BUILD_DIR/Breeze.UI/app-builds/*.deb"
+    - "$TRAVIS_BUILD_DIR/Breeze.UI/app-builds/*.tar.gz"
+    - "$TRAVIS_BUILD_DIR/Breeze.UI/app-builds/*.dmg"
   skip_cleanup: true
   overwrite: true
   prerelease: true

Breeze.Documentation/ApiSpecification.md

@@ -3,9 +3,7 @@
 ## Request/Response
 
 RESPONSE: response code (`200` for all successful requests, `4xx`/`5xx` if error, see later)  
-
-HEADERS
-`Content-Type:application/json`  
+HEADERS: `Content-Type:application/json`  
 
 ## Errors
 
@@ -20,7 +18,7 @@ Depending on the circumstance the API will either return an error at the first e
   "errors": [
     {
       "status": 400,
-      "message": "No wallet file found at Wallets\\myFirstWallet.json",
+      "message": "No wallet file found at Wallets\\testwallet.json",
       "description": "System.ArgumentException: No wallet file found at..."
     }
   ]
@@ -55,7 +53,7 @@ This error message comes at all request if the wallet is not loaded yet, except
 
 ```
 GET /wallet/general-info - Displays general information on the wallet
-GET /wallet/sensitive - Displays sensitive information on the wallet
+GET /wallet/extpubkey - Displays the extpubkey of the specified account
 GET /wallet/status - Displays dynamic information on the wallet
 POST /wallet/create - Creates the wallet
 POST /wallet/load - Loads the wallet and starts syncing
@@ -91,14 +89,12 @@ POST /wallet/send-transaction - Attempts to send a transaction
 ## GET /wallet/mnemonic - Generate a mnemonic
 
 ### Query parameters
-`language`  (optional) - the language for the words in the mnemonic. Options are: English, French, Spanish, Japanese, ChineseSimplified and ChineseTraditional. The default is 'English'.
-
-`wordcount` (optional) - the number of words in the mnemonic. Options are: 12,15,18,21 or 24. the default is 12.
-
+`language`  (optional) - the language for the words in the mnemonic. Options are: English, French, Spanish, Japanese, ChineseSimplified and ChineseTraditional. The default is 'English'.  
+`wordcount` (optional) - the number of words in the mnemonic. Options are: 12,15,18,21 or 24. the default is 12.  
 ### Examples
 request
 ```
-http://localhost:5000/api/wallet/mnemonic?wordcount=15&language=French
+http://localhost:37220/api/wallet/mnemonic?wordcount=15&language=French
 ```
 response
 ```
@@ -107,7 +103,7 @@ response
 
 request
 ```
-http://localhost:5000/api/wallet/mnemonic?wordcount=12&language=english
+http://localhost:37220/api/wallet/mnemonic?wordcount=12&language=english
 ```
 response
 ```
@@ -118,33 +114,43 @@ response
 ## GET /wallet/general-info - Displays general information on the wallet
 
 ### Query parameters
-`walletName` (required) - the name of the wallet.
+`name` (required) - the name of the wallet.
 
-### Responses
+### Examples
+
+#### Request
 ```
-{
-   "walletFilePath":"path to the wallet file",
-   "network":"main", //"testnet", "stratismain", "stratistest"
-   "creationTime":"2017-03-21",
-   "isDecrypted":true,
-   "lastBlockHeight":123234,
-   "chainTip": 173721,         
-   "connectedNodes": 5
-}
+http://localhost:37220/api/wallet/general-info?name=testwallet
 ```
-## GET /wallet/sensitive - Displays sensitive information on the wallet
-### Parameters
+
+#### Response
 ```
 {
-  "password": "password"  
+  "walletFilePath":null,
+  "network":"testnet", //"main", "testnet", "stratismain", "stratistest"
+  "creationTime":"1511169493",
+  "isDecrypted":true,
+  "lastBlockSyncedHeight":1231116,
+  "chainTip":1231116,
+  "isChainSynced":true,
+  "connectedNodes":8
 }
 ```
-### Responses
+
+## GET /wallet/extpubkey - Displays the extpubkey of the specified account
+### Query parameters
+`walletName` (required) - the name of the wallet.
+
+### Examples
+#### Request
 ```
-{
-  "extkey": "sadwqdpqoijedqcdoijsadoijsadisa",
-  "extpubkey": "dalkdsaklkjdlkjdsaljlkjdsalkjdsalk",
-}
+http://localhost:37220/api/wallet/extpubkey?walletName=testwallet&accountName=account%200
+```
+
+#### Response
+Returns the public key hash of the account.
+```
+"tpubDDVB7J4oNpyWFUVp91UcQnxUVJExWPV5NecBFTzQVH6d3A9pcrYCvu8jGzCHVAzyD99Sk3g3kLYMx6MocpzmtusmDgpbx27Msc5iCKefMUm"
 ```
 ## GET /wallet/status - Displays dynamic information on the wallet
 ### Responses
@@ -163,15 +169,18 @@ response
 
 ## POST /wallet/create - Creates the wallet
 ### Parameters
+`name` - case-sensitive name of the wallet to be created.  
+`password` - password for the wallet to be created.  
+`mnemonic` (optional) - the user's mnemonic for the wallet.  
 ```
 {
-  "network": "main", // "main" or "testnet"
-  "password": "password",
-  "name": "wallet-btc",
-  "mnemonic": "gravity sock glove cage divert creek mountain connect small banana depend thunder" // optional
+  "name": "testwallet",
+  "password": "testpassword",
+  "mnemonic": "gravity sock glove cage divert creek mountain connect small banana depend thunder"
 }
 ```
 ### Responses
+Returns the mnemonic for the wallet. If there was no mnemonic defined as input then a newly generated word list will be returned.  
 ```
 {
   "mnemonic": "gravity sock glove cage divert creek mountain connect small banana depend thunder",
@@ -181,9 +190,9 @@ response
 ### Parameters
 ```
 { 
-	"password": "123456",
 	"folderPath": "Wallets", // optional, if the folder path is not the default one
-	"name": "myWallet"
+	"name": "testwallet",
+	"password": "testpassword"	
 }
 ```
 
@@ -196,11 +205,11 @@ response
 ### Parameters
 ```
 {
-  "network": "main", // "main" or "testnet"
-  "password": "password",  
-  "mnemonic": "foo bar buz",
-  "name": "testwallet-recovered",
+  "network": "testnet", // "main" or "testnet"
   "folderPath": "Wallets", // optional, if the folder path is not the default one
+  "name": "testwallet-recovered",
+  "password": "testpassword",  
+  "mnemonic": "gravity sock glove cage divert creek mountain connect small banana depend thunder",
   "creationTime": "2017-02-25 16:20:33" // date from which to start looking for transactions
 }
 ```
@@ -218,9 +227,9 @@ This endpoint will get the first account containing no transaction or will creat
 ### Parameters
 ```
 {
-    "walletName": "myFirstWallet",    
-    "password": "123456",
-    "coinType": 105
+    "walletName": "testwallet",    
+    "password": "testpassword",
+    "coinType": 105 // 0 - Bitcoin, 105 - Stratis
 }
 ```
 ### Responses
@@ -232,11 +241,9 @@ This endpoint will get the first account containing no transaction or will creat
 
 This endpoint will get the last address containing no transaction or will create a new address.
 ### Query parameters
-`walletName` (required) - the name of the wallet in which this address is contained.
-
-`coinType` (required) - the type of coin for which to get the address, e.g 0 for bitcoin, 105 for stratis.
-
-`accountName` (required) - the name of the account in which this address is contained.
+`walletName` (required) - the name of the wallet in which this address is contained.  
+`coinType` (required) - the type of coin for which to get the address, e.g 0 for bitcoin, 105 for stratis.  
+`accountName` (required) - the name of the account in which this address is contained.  
 ### Responses
 ```
   "1HDypWxXWZC5KXK259EHMnrWaa2youy7Mj"
@@ -261,10 +268,8 @@ This endpoint will get the last address containing no transaction or will create
 
 ## GET /wallet/history - Displays the history of the specified wallet account
 ### Query parameters
-`walletName` (required) - the name of the wallet.
-
-`coinType` (required) - the type of coin, e.g 0 for bitcoin, 105 for stratis.
-
+`walletName` (required) - the name of the wallet.  
+`coinType` (required) - the type of coin, e.g 0 for bitcoin, 105 for stratis.  
 ### Responses
 ```
 {
@@ -297,11 +302,15 @@ This endpoint will get the last address containing no transaction or will create
 
 ## GET /wallet/balance - Displays the balances of the specified wallet account
 ### Query parameters
-`walletName` (required) - the name of the wallet.
-
-`coinType` (required) - the type of coin, e.g 0 for bitcoin, 105 for stratis.
+`walletName` (required) - the name of the wallet.  
+`coinType` (required) - the type of coin, e.g 0 for bitcoin, 105 for stratis.  
 
-### Responses
+### Examples
+#### Request
+```
+http://localhost:37220/api/wallet/balance?walletName=testwallet
+```
+#### Response
 ```
 {
   "balances": [
@@ -322,7 +331,7 @@ Unconfirmed balance is the difference of unconfirmed incoming and outgoing trans
 ### Parameters
 ```
 {
-  "walletName": "myFirstWallet",    
+  "walletName": "testwallet",    
   "accountName": "account 0",      
   "coinType": 0,
   "password": "password",

Breeze.UI/.angular-cli.json

@@ -1,6 +1,6 @@
 {
   "project": {
-    "name": "breeze-ui",
+    "name": "Breeze",
     "ejected": true
   },
   "apps": [
@@ -18,7 +18,7 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "../node_modules/bootstrap/dist/css/bootstrap.min.css",
+        "./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
         "styles.css"
       ],
       "scripts": [],

Breeze.UI/README.md

@@ -1,4 +1,4 @@
-# Breeze-UI
+# Breeze.UI
 
 Graphical User Interface for Stratis Breeze Wallet.
 
@@ -27,24 +27,23 @@ From within Breeze.UI directory run:
 npm install
 ```
 
-There is an issue with `yarn` and `node_modules` that are only used in electron on the backend when the application is built by the packager. Please use `npm` as dependencies manager.
+There is an issue with `yarn` and `node_modules` that are only used in electron on the backend when the application is built by the packager. Please use `npm` as dependency manager.
 
-If you want to generate Angular components with Angular-cli , you **MUST** install `@angular/cli` in npm global context.  
-Please follow [Angular-cli documentation](https://github.com/angular/angular-cli) if you had installed a previous version of `angular-cli`.
-
-``` bash
-sudo npm install -g @angular/cli
-```
+If you want to generate Angular components with Angular-cli, you **MUST** install `@angular/cli` in npm global context.  
+If you have already installed a previous version of `angular-cli`, follow [Angular-cli documentation](https://github.com/angular/angular-cli), otherwise execute `sudo npm install -g @angular/cli` command.
 
 ## To build for development
 
-- **in a terminal window** -> npm start
+#### Terminal Window 1
+[Run the daemon](https://github.com/stratisproject/Breeze/blob/master/README.md#daemon-build)  
+
+#### Terminal Window 2
+`npm start`  
 This will compile the Angular code and spawn the Electron process in parallel.
 After compilation has completed the Electron UI will refresh.
 
-If you want to seperate the build process from the Electron process you can use:
-- **in a terminal window** -> `npm run start:webpack`
-- **in another terminal window** -> `npm run electron:serve`
+#### Terminal Window 3, 4
+If you want to seperate the build process from the Electron process you can use `npm run start:webpack` and `npm run electron:serve`.
 
 ## To build for production