Skip to content

Commit

Permalink
Merge 116fe88 into 2ca5e85
Browse files Browse the repository at this point in the history
  • Loading branch information
stdevAlDen committed Feb 27, 2020
2 parents 2ca5e85 + 116fe88 commit e3e979b
Show file tree
Hide file tree
Showing 1,966 changed files with 471,273 additions and 53,299 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.so

# Distribution / packaging
vendor/github.com/therecipe/qt/

# Configuration
*.vscode
Expand Down Expand Up @@ -37,6 +38,7 @@ nosetests.xml
coverage.xml
coverage.html
coverage.out
coverage.tmp.out
*.cover
.hypothesis/

Expand Down Expand Up @@ -86,3 +88,8 @@ rcc_cgo_*.go
darwin


# Auto-generates go files.

*.pb.go
!vendor/github.com/golang/protobuf/**/*.pb.go
*.log
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

48 changes: 41 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ go:
- 1.12.6
services:
- docker
- xvfb
go_import_path: github.com/fibercrypto/fibercryptowallet
cache:
directories:
- $GOPATH/src/github.com/therecipe
- $GOPATH/bin
directories:
- $GOPATH/src/github.com/therecipe
- $GOPATH/bin
env:
global:
- XARGS="-screen 0 1024x768x24"

matrix:
include:
- stage: RPI
Expand Down Expand Up @@ -36,16 +41,31 @@ matrix:
- DEFAULT_TARGET=android-emulator make build-docker
- make lint
- make run-docker CMD='make test'
- make test-cover-travis
- make run-docker CMD='make install coveralls ; make test-cover-travis'
- stage: Linux
before_install:
- source ./ci-scripts/install-$TRAVIS_OS_NAME.sh
install:
- make install-docker-deps
- make install-deps-no-envs
- make install-linters
before_script:
- echo "PATH=$PATH";
- echo "PIP=$PIP";
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet clean
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob install-deps-nanopb
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob/nanopb/vendor/nanopb/generator/proto
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet emulator
- make -C ./tmp/hardware-wallet run-emulator & true;
# Run self-tests
- ps aux | grep emulator

script:
- make clean
- DEFAULT_TARGET=linux make build-docker
- make clean
- make run-docker CMD='make test-skyhw'
- make run-docker CMD='make test'
- make lint
- make run-docker CMD='make install-coveralls ; make test-cover-travis'
Expand Down Expand Up @@ -78,22 +98,37 @@ matrix:
- stage: MacOS
os: osx
osx_image: xcode10.2
before_install:
- source ./ci-scripts/install-$TRAVIS_OS_NAME.sh
install:
- make install-deps
- make install-coveralls
before_script:
- echo "PATH=$PATH";
- echo "PIP=$PIP";
# Start Xvfb on osx
- ( sudo Xvfb :99 -ac ${XARGS}; echo "Xvfb ok" )& export DISPLAY=:99
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet clean
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob install-deps-nanopb
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob/nanopb/vendor/nanopb/generator/proto
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet emulator
- make -C ./tmp/hardware-wallet run-emulator & true;
# Run self-tests
- ps aux | grep emulator
script:
- make clean
- make build
- make test
- make test-skyhw
- make build-icon
- make lint
- make test-cover-travis
notifications:
email: false
webhooks:
urls:
- https://fathomless-fjord-24024.herokuapp.com/notify
- https://coveralls.io/webhook
- https://fathomless-fjord-24024.herokuapp.com/notify
- https://coveralls.io/webhook

before_deploy:
- export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
Expand All @@ -112,6 +147,5 @@ deploy:
draft: true
overwrite: true
on:
repo: fibercrypto/FiberCryptoWallet
repo: fibercrypto/fibercryptowallet
tags: true

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Added

- Use sky-wallet as signer.
- 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
Expand Down Expand Up @@ -63,4 +64,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- QR code images are buttons
- GUI to add wallets
- GUI to generate new addresses for a wallet

- Added Address Book
26 changes: 16 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# Contributing to FiberCrypto projects

We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:

- Submitting a [bug report](https://github.com/fibercrypto/FiberCryptoWallet/issues/new?labels=bug&template=bug_report.md)
- Submitting a [bug report](https://github.com/fibercrypto/fibercryptowallet/issues/new?labels=bug&template=bug_report.md)
- Discussing the current state of the code on [Blockchain Cuba channel](https://t.me/BlockchainCuba)
- Submitting a [new Github pull request](https://github.com/fibercrypto/FiberCryptoWallet/pull/new) with a fix
- Proposing new [features requests](https://github.com/fibercrypto/FiberCryptoWallet/issues/new?labels=feature&template=feature_request.md)
- Submitting a [new Github pull request](https://github.com/fibercrypto/fibercryptowallet/pull/new) with a fix
- Proposing new [features requests](https://github.com/fibercrypto/fibercryptowallet/issues/new?labels=feature&template=feature_request.md)
- Becoming a maintainer

## We Develop with Github

We use github to host code, to track issues and feature requests, as well as accept pull requests.

## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests

Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:

1. Fork the repo and create your branch from `master`.
* Branch name should follow the pattern `<USER>_t<ISSUE>_<DESC>` e.g. `olemis_t256_readme_badges` for @olemis to submit a patch to fix issue #256 by adding project badges in `README.md` file.
- Branch name should follow the pattern `<USER>_t<ISSUE>_<DESC>` e.g. `olemis_t256_readme_badges` for @olemis to submit a patch to fix issue #256 by adding project badges in `README.md` file.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. If contributions add a relevant feature, describe changes in CHANGELOG.md
Expand All @@ -24,33 +27,36 @@ Pull requests are the best way to propose changes to the codebase (we use [Githu
8. Issue that pull request!

## Any contributions you make will be under the GPLv3 Software License

In short, when you submit code changes, your submissions are understood to be under the same [GPLv3 License](https://choosealicense.com/licenses/gpl-3.0/) that covers the project. Feel free to contact the maintainers if that's a concern.

## Report bugs using Github's [issues](https://github.com/fibercrypto/FiberCryptoWallet/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/fibercrypto/FiberCryptoWallet/issues/new/choose); it's that easy!
## Report bugs using Github's [issues](https://github.com/fibercrypto/fibercryptowallet/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/fibercrypto/fibercryptowallet/issues/new/choose); it's that easy!

## Write bug reports with detail, background, and sample code

[This is an example](http://stackoverflow.com/q/12488905/180626) of a bug report that we think it's not a bad model. Here's [another example from Craig Hockenberry](http://www.openradar.me/11905408), an app developer whom we greatly respect.

**Great Bug Reports** tend to have:

- A quick summary and/or background
- Steps to reproduce
- Be specific!
- Give sample code if you can. [This stackoverflow question](http://stackoverflow.com/q/12488905/180626) includes sample code that *anyone* with a base R setup can run to reproduce what reporter was seeing
- Give sample code if you can. [This stackoverflow question](http://stackoverflow.com/q/12488905/180626) includes sample code that _anyone_ with a base R setup can run to reproduce what reporter was seeing
- What you expected would happen
- What actually happens
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)

People *love* thorough bug reports. I'm not even kidding.
People _love_ thorough bug reports. I'm not even kidding.

## Use a Consistent Coding Style

Code style shall respect golang standards and is checked by a number of linters after running `make lint` from the command line.

## License

By contributing, you agree that your contributions will be licensed under its GPLv3 License.

## References
This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md).


This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md).
Loading

0 comments on commit e3e979b

Please sign in to comment.