Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nucleo y maestro fusion segura #553

Open
wants to merge 76 commits into
base: core-extrapolation
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
e8cddd1
replaced internals with externals
nsjames Aug 27, 2019
d2c76b5
revamp of communications
nsjames Aug 30, 2019
c568d28
signers
nsjames Sep 1, 2019
28fb976
work
nsjames Sep 6, 2019
ad99cca
fixes
nsjames Sep 6, 2019
7db9b5e
updates
nsjames Sep 18, 2019
7e81278
cleanup connections
nsjames Sep 25, 2019
a41de09
removing vuejs
nsjames Sep 26, 2019
d952695
work
nsjames Sep 28, 2019
90ec411
buffer data save fix
Sep 28, 2019
45bae31
fixes
Sep 28, 2019
ed64edc
ledger fixes
nsjames Sep 28, 2019
6ca5bb5
embed hash checks
nsjames Sep 28, 2019
6619e91
minor cleanup
nsjames Sep 28, 2019
82d6918
minor cleanup
nsjames Sep 28, 2019
6bc3232
readme and fuckit env
nsjames Sep 28, 2019
00ab2ec
loaders and cachers
nsjames Oct 2, 2019
654128b
minor fixes
nsjames Oct 3, 2019
db222fa
feed blockchain support
nsjames Oct 3, 2019
bbafbb4
local file caches
nsjames Oct 7, 2019
48ad349
allowing fallback to locally cached version
nsjames Oct 7, 2019
e05323d
better hash and signature checking
nsjames Oct 7, 2019
a31fd9d
better hash and signature checking
nsjames Oct 7, 2019
3d3e22a
Windows EV code signing
nsjames Oct 8, 2019
e373ca4
custom prompts and key export locking
nsjames Oct 12, 2019
3cc1798
prompt cleanup
nsjames Oct 12, 2019
6379bc4
regeneration of files fix
nsjames Oct 13, 2019
212e5c7
version and testing off
nsjames Oct 13, 2019
b2a1215
removing old api
nsjames Oct 13, 2019
6330241
define walletpack versions
Oct 13, 2019
55bed75
define walletpack versions
Oct 13, 2019
7261f44
env file fix for builds
nsjames Oct 13, 2019
ead0ce4
aligning embed
nsjames Oct 27, 2019
466937f
storage, wallet, and tron fix
nsjames Oct 31, 2019
2436bd5
version locking, id key signing, and css injection fixes
nsjames Nov 12, 2019
00502f3
simple mode
nsjames Nov 14, 2019
2590213
non local packages
nsjames Nov 14, 2019
3284e5d
language support
nsjames Nov 21, 2019
7646721
prod
nsjames Nov 21, 2019
5b403a5
Merge pull request #467 from GetScatter/gutting
nsjames Nov 21, 2019
5128c4c
macos
Nov 21, 2019
8f3ff89
Updated icons
ramijames Nov 24, 2019
ebe51ea
release scripts and console for updater
nsjames Nov 27, 2019
d52c995
flash/focus window
nsjames Nov 28, 2019
7a3092b
Merge branch 'master' of https://github.com/GetScatter/ScatterDesktop
nsjames Nov 28, 2019
9c49abe
dynamic general settings
nsjames Dec 1, 2019
99a05c4
dynamic staging env
nsjames Dec 1, 2019
ae4fb5a
release script
nsjames Dec 1, 2019
1913a1c
loading window console fix
nsjames Dec 1, 2019
b4b2073
removing default popout sizes
nsjames Dec 1, 2019
73e16d9
icns file
nsjames Dec 1, 2019
7a2f18e
macos build script
Dec 1, 2019
9e6d5c1
macos icns
Dec 1, 2019
2db338e
win ico
nsjames Dec 1, 2019
d7995e6
reverting icons
nsjames Dec 1, 2019
575d6ef
macos ledger fixes
Dec 3, 2019
7cab9e3
load from zip, and load from zip manually
nsjames Feb 9, 2020
e384390
Merge branch 'master' of https://github.com/GetScatter/ScatterDesktop
nsjames Feb 9, 2020
229a8ab
manual update
nsjames Feb 13, 2020
6b7c1de
bug fixes and cleanup
nsjames Feb 19, 2020
1a4687c
load zips, and default to simple mode
nsjames Mar 30, 2020
1749eae
set repo
nsjames Mar 30, 2020
6100a5f
small font change
nsjames Mar 30, 2020
1cf4ee0
circle
nsjames Mar 30, 2020
1288286
rename yaml
nsjames Mar 30, 2020
6d92433
testing circle ci
nsjames Mar 30, 2020
4e0e0d0
remove circle from master
nsjames Mar 30, 2020
ed2e936
circle test
nsjames Mar 30, 2020
9219e4f
update lockfile
nsjames Mar 31, 2020
31b83c2
mac target as pkg
nsjames Apr 1, 2020
140f17e
mac target as pkg
nsjames Apr 1, 2020
0d1fe73
fio signing
nsjames Apr 8, 2020
8540791
shared secrets
nsjames Apr 20, 2020
19b5999
version bump
nsjames Apr 23, 2020
1cd5b1c
embedder update
nsjames Apr 23, 2020
63701f4
mac ledger fix
nsjames Apr 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .babelrc

This file was deleted.

5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#LOCAL_TESTING=http://localhost:8081/

SIMPLE_BY_DEFAULT=1

PROOF_KEYS=EOS57fs1Mi7RrMChZ9GsxsCYqG22y9PjnmCnakLMALuA8qM3qKcwG,EOS6LrPgvoncmV8azzm16s4cT3tawiZsTpkDZy7Yeivdqtppgronh,EOS88H35pzmYqi2AAeXbnYbXwCzZUkYRji9wmSncKvbYxMDBSU8PU,EOS8ic3RkEmn1KFsAFrHq2662fawiQasmxjN24XLHVV77S2odfBu4,EOS6b63XTiiuZ8YE7Yd5yqpTzsd9CqThV7M2Qn1DMPkPaiYwvo9e2,EOS6jreFpkGLNMMPpwkkJ2x8weNQozqUxEB8BoCanRCHaLnPM7i8X,EOS8gNGX6xPqo9qdWRWf3wi7ixCUetFZgWq43hNXfht2CdHWJ8NCz,EOS69ccoRaQ19ibtiSsyDVWsajfCQjXK3pGP53YUXaqfPeHWEaRwj,EOS6tpa7TJ5JCeDQrnFk6stZYhEHSw92nCkXzoZQ1pHDdukL6Eo2t,EOS7jpensVjpvKDLPmVa7JMuv6X8o6PxrthkqBMLP4zfpAYQkc8dm,EOS6bctfcYDzxo8HvngwxuPrepcTrcftnGLF31ebRiq8Ji2FyfUWi,EOS7BSUXLdoreHYusGpWiBmUJELkHaEDiQ7NR1HApbEgavKSC4nwJ,EOS6QgW56mNXTMKGiVyV68Qi5E4GBDVFF3fhP5sGR93Hmn5pCM4iA,EOS7R9PD5xMUSPCWXTzF4NoQD6ivCUFKHaix9P4DD5BsRzuMzsPff,EOS76KSWE2zQcuUWNLox3xVtQzJDSggusbvW7gTh9Fa9eXUqpC95y,EOS6jCUTQudKK8CiKxTiXPgrM61UAodxEDzmWG7AUy4SZxPApK8qh,EOS5pxccDZrjQJpJbjihKG9Dejjy2ejdcZSeUZ85ZRZ1dT5JBSZiP,EOS5Je9YXCGrrfqdB7k6trvKEaCfNFeJbGi2JhnRJyCnRNEKWD6Sm,EOS7CQMi5gu6BU99eyWoEmegevE2HVXXn6D422mnoTkdegh8JmkBN,EOS7KpdNqJCJg4eGksxqdvnrRpFRqkEph98vTJ5v7kDUuG6gcgjx5,EOS5repNL375YX1coUEv3bqeX5Q4YWspbCEvcrtgvTDFRydjYjs4C,EOS85VAaCWWSa8p68abyPyYzsHeiTCijSfDm5cGUyStEjcstSbSMw
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ selenium-debug.log

dist/
release/
test/exports/*

macos/.env
10 changes: 0 additions & 10 deletions .postcssrc.js

This file was deleted.

20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
# Scatter Desktop

## Installation
Scatter desktop is a cutting-egde wallet for blockchain as well as a global local-machine authentication provider.

**None of these package are signed yet.** Make sure you only download
Scatter Desktop from this GitHub, and **NOWHERE ELSE**.
## Installation

#### [CLICK HERE AND GRAB THE LATEST RELEASE](https://github.com/GetScatter/ScatterDesktop/releases)
Once you have a release build just install it and away you go.



### Running in development mode

This runs best with `node v10.15.3` and `electron v5.0.1`

- clone the repo
- run `yarn install` to install the dependencies. **Important: You can only use yarn to install right now as there's two versions of eosjs being pulled in and only yarn supports aliasing**.
- run `npm start` to start the local server with hot-reloading
- run `yarn install` to install the dependencies.
- run `electron .` or `./node_modules/.bin/electron .` from the directory to start electron.

You will also need [ScatterEmbed](https://github.com/GetScatter/ScatterEmbed) running locally as this desktop client simply runs the wallet
software that protects keys and controls encryption.

Edit the `.env` file to point to your locally running version of Scatter Embed, or leave it as-is to run it with our live version.



### Building

- `npm run build`
- `npm run release-mac` or `npm run release-windows` or `npm run release-linux` ( you must build from the target machine )


## Creating Apps for Scatter
### Check out the [Documentation](https://get-scatter.com/docs/examples-interaction-flow)


5 changes: 0 additions & 5 deletions build/build.js

This file was deleted.

14 changes: 0 additions & 14 deletions build/utils.js

This file was deleted.

90 changes: 0 additions & 90 deletions build/webpack.config.base.js

This file was deleted.

50 changes: 0 additions & 50 deletions build/webpack.config.dev.js

This file was deleted.

67 changes: 0 additions & 67 deletions build/webpack.config.prod.js

This file was deleted.

Loading