Merge 4478b3d into 0912810

.gitignore

@@ -83,5 +83,6 @@ android
 
 # Temporary build files
 rcc_cgo_*.go
+darwin
 
 

.travis.yml

@@ -1,89 +1,89 @@
 sudo: required
 language: go
 go:
-- 1.12.6
+  - 1.12.6
 services:
-- docker
+  - docker
 go_import_path: github.com/fibercrypto/fibercryptowallet
 matrix:
   include:
-  - stage: RPI
-    if: branch = release*$
-    install:
-    - DEFAULT_ARCH=rpi1 make install-docker-deps
-    - DEFAULT_ARCH=rpi2 make install-docker-deps
-    - DEFAULT_ARCH=rpi3 make install-docker-deps
-    - make install-deps-no-envs
-    - make install-coveralls
-    script:
-    - make clean
-    - DEFAULT_TARGET=rpi1 make build-docker
-    - DEFAULT_TARGET=rpi2 make build-docker
-    - DEFAULT_TARGET=rpi3 make build-docker
-    - make lint
-    - make test
-  - stage: Android
-    if: branch = release*$
-    install:
-    - DEFAULT_ARCH=android make install-docker-deps
-    - make install-deps-no-envs
-    - make install-coveralls
-    script:
-    - make clean
-    - DEFAULT_TARGET=android make build-docker
-    - DEFAULT_TARGET=android-emulator make build-docker
-    - make lint
-    - make test
-    - make test-cover-travis
-  - stage: Linux
-    install:
-    - make install-docker-deps
-    - make install-deps-no-envs
-    - make install-linters
-    - make install-coveralls
-    script:
-    - make clean
-    - DEFAULT_TARGET=linux make build-docker
-    - make test
-    - make lint
-    - make test-cover-travis
-  - stage: Windows
-    os: windows
-    install:
-    - choco install make -y
-    - travis_wait make install-deps-Windows
-    - make install-linters
-    - make install-coveralls
-    script:
-    - make build
-    - make test
-    - make build-icon
-    - make lint
-    - make test-cover-travis
-  - stage: MacOS
-    os: osx
-    osx_image: xcode10.2
-    install:
-    - make install-deps
-    - make install-coveralls
-    script:
-    - make clean
-    - make build
-    - make test
-    - make build-icon
-    - make lint
+    - stage: RPI
+      if: branch = release*$
+      install:
+        - DEFAULT_ARCH=rpi1 make install-docker-deps
+        - DEFAULT_ARCH=rpi2 make install-docker-deps
+        - DEFAULT_ARCH=rpi3 make install-docker-deps
+        - make install-deps-no-envs
+        - make install-coveralls
+      script:
+        - make clean
+        - DEFAULT_TARGET=rpi1 make build-docker
+        - DEFAULT_TARGET=rpi2 make build-docker
+        - DEFAULT_TARGET=rpi3 make build-docker
+        - make lint
+        - make test
+    - stage: Android
+      if: branch = release*$
+      install:
+        - DEFAULT_ARCH=android make install-docker-deps
+        - make install-deps-no-envs
+        - make install-coveralls
+      script:
+        - make clean
+        - DEFAULT_TARGET=android make build-docker
+        - DEFAULT_TARGET=android-emulator make build-docker
+        - make lint
+        - make test
     - make test-cover-travis
+    - stage: Linux
+      install:
+        - make install-docker-deps
+        - make install-deps-no-envs
+        - make install-linters
+        - make install-coveralls
+      script:
+        - make clean
+        - DEFAULT_TARGET=linux make build-docker
+        - make test
+        - make lint
+        - make test-cover-travis
+    - stage: Windows
+      os: windows
+      install:
+        - choco install make -y
+        - travis_wait make install-deps-Windows
+        - make install-linters
+        - make install-coveralls
+      script:
+        - make build
+        - make test
+        - make build-icon
+        - make lint
+        - make test-cover-travis
+    - stage: MacOS
+      os: osx
+      osx_image: xcode10.2
+      install:
+        - make install-deps
+        - make install-coveralls
+      script:
+        - make clean
+        - make build
+        - make test
+        - make build-icon
+        - make lint
+        - make test-cover-travis
 notifications:
   email: false
   webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
 before_deploy:
-   - export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
-   - export ARCH="$(uname -m)"
-   - export OS="$(uname -s)"
-   - make prepare-release
-   - make build
-   - ( cd deploy && tar czf ../fibercryptowallet-${VERSION}-${OS}-${ARCH}.tar.gz ./*  )
-   - pwd && ls -l .
+  - export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
+  - export ARCH="$(uname -m)"
+  - export OS="$(uname -s)"
+  - make prepare-release
+  - make build
+  - ( cd deploy && tar czf ../fibercryptowallet-${VERSION}-${OS}-${ARCH}.tar.gz ./*  )
+  - pwd && ls -l .
 deploy:
   provider: releases
   api_key:

.travis/install-golangci-lint.sh

@@ -384,4 +384,4 @@ CHECKSUM=${PROJECT_NAME}-${VERSION}-checksums.txt
 CHECKSUM_URL=${GITHUB_DOWNLOAD}/${TAG}/${CHECKSUM}
 
 
-execute
+execute

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+- Spend in single transaction coins owned by multiple wallets (same altcoin plugin)
 - Added logger for the app and proper error handling
 - Built-in support for SkyWallet hardware wallet as signer for Skycoin transactions
 - Built-in support iand GUI for applying operations upon SkyWallet hardware devices

Makefile

@@ -232,7 +232,6 @@ clean: clean-test clean-build ## Remove temporary files
 
 gen-mocks: ## Generate mocks for interface types
 	mockery -all -output src/coin/mocks -outpkg mocks -dir src/core
-	find src/coin/mocks/ -name '*.go' -type f -print0
 
 test-sky: ## Run Skycoin plugin test suite
 	go test -cover -timeout 30s github.com/fibercrypto/fibercryptowallet/src/coin/skycoin

README.md

@@ -47,7 +47,7 @@ Project files are organized as follows:
 - `./src/coin/skycoin/models` : Skycoin implementation of golang core interfaces.
 - `./src/coin/skycoin/blockchain` : Skycoin blockchain API.
 - `./src/coin/skycoin/sign` : Skycoin sign API.
-- `vendor` : Project dependencies managed by `dep`.
+- `./vendor` : Project dependencies managed by `dep`.
 
 ### Architecture
 

qtquickcontrols2.conf

@@ -7,4 +7,4 @@ Style = Material
 
 [Material]
 Accent = Blue
-Variant = Dense
+Variant = Dense

resources/fonts/code-new-roman/license.txt

@@ -38,4 +38,4 @@ TERMINATION
 This license becomes null and void if any of the above conditions are not met.
 
 DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.