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

Feature: add Satochip hardware wallet support #3494

Closed
wants to merge 10,000 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
5c00fb1
catch more errors for coolwallet, fix the computer pairing bug
gamalielhere Mar 3, 2021
78e9800
fix loading issue
gamalielhere Mar 3, 2021
5e48c1b
Merge branch 'patch-1' of git://github.com/theqp/MyEtherWallet into b…
gamalielhere Mar 3, 2021
192d86a
Merge branch 'patch-2' of git://github.com/theqp/MyEtherWallet into b…
gamalielhere Mar 3, 2021
8bfd8f3
update package for snyk
gamalielhere Mar 3, 2021
30af0ef
update license and trademark to 2021
gamalielhere Mar 3, 2021
a11e45a
Merge pull request #2864 from MyEtherWallet/bug/coolwallet
gamalielhere Mar 3, 2021
1675daf
Merge branch 'develop' into bug/aug
gamalielhere Mar 3, 2021
9d3a719
Merge branch '25-remove-from-purchase-a-hardware-wallet' of git://git…
gamalielhere Mar 3, 2021
4ea36e2
git push; \Merge branch 'bug/aug' of github.com:MyEtherWallet/MyEther…
gamalielhere Mar 3, 2021
093e21d
New translations en_US.json (Spanish)
kvhnuke Mar 3, 2021
f6eabb6
New translations en_US.json (Japanese)
kvhnuke Mar 3, 2021
7c78eb6
New translations en_US.json (Korean)
kvhnuke Mar 3, 2021
9477738
New translations en_US.json (Russian)
kvhnuke Mar 3, 2021
af8cc88
New translations en_US.json (Chinese Simplified)
kvhnuke Mar 3, 2021
1ec664a
update version
gamalielhere Mar 3, 2021
76737cb
Merge pull request #2872 from MyEtherWallet/bug/aug
gamalielhere Mar 3, 2021
c64852b
fix gas check bypass for from non ETH currency
SteveMieskoski Mar 3, 2021
31ffb25
New translations en_US.json (Russian)
kvhnuke Mar 3, 2021
179ade2
New translations en_US.json (Russian)
kvhnuke Mar 3, 2021
8c72c07
New translations en_US.json (Russian)
kvhnuke Mar 3, 2021
e2f94e1
New translations en_US.json (Chinese Simplified)
kvhnuke Mar 3, 2021
91d0b2b
New translations en_US.json (Chinese Simplified)
kvhnuke Mar 3, 2021
e0c7647
New translations en_US.json (Spanish)
kvhnuke Mar 3, 2021
756cc4f
New translations en_US.json (Spanish)
kvhnuke Mar 3, 2021
5af99c1
New translations en_US.json (Japanese)
kvhnuke Mar 3, 2021
6156a31
New translations en_US.json (Korean)
kvhnuke Mar 3, 2021
f91ceb3
New translations en_US.json (Japanese)
kvhnuke Mar 3, 2021
1bc9ff6
New translations en_US.json (Korean)
kvhnuke Mar 3, 2021
15a8cc2
Merge pull request #2873 from MyEtherWallet/develop
gamalielhere Mar 3, 2021
d5791c5
update packages
gamalielhere Mar 4, 2021
32c95f1
Merge branch 'master' of github.com:MyEtherWallet/MyEtherWallet into …
gamalielhere Mar 4, 2021
13541a9
Merge remote-tracking branch 'origin/develop' into bug/no-gas-check-s…
SteveMieskoski Mar 8, 2021
39a9834
merge in latest develop, fox conflicts
SteveMieskoski Mar 8, 2021
3273c68
update packages
gamalielhere Mar 8, 2021
1d17cc7
Merge remote-tracking branch 'origin/develop' into devop/address-no-d…
SteveMieskoski Mar 8, 2021
b67e321
merge in latest develop, fix conflicts
SteveMieskoski Mar 8, 2021
fc8e056
update packages
gamalielhere Mar 8, 2021
9803394
update CHANGELOG.md
SteveMieskoski Mar 8, 2021
a7121e7
Merge pull request #2878 from MyEtherWallet/devop/update-packages
gamalielhere Mar 8, 2021
9f97e52
Merge branch 'avalanche' of git://github.com/ang-st/MyEtherWallet int…
gamalielhere Mar 8, 2021
d004b4e
Merge branch 'patch-2' of git://github.com/creaz79/MyEtherWallet into…
gamalielhere Mar 8, 2021
d25f6aa
Merge branch 'patch-1' of git://github.com/creaz79/MyEtherWallet into…
gamalielhere Mar 8, 2021
85f611a
consolidate node prs
gamalielhere Mar 9, 2021
d2911cc
Merge pull request #2783 from MyEtherWallet/devop/address-no-decimals…
gamalielhere Mar 9, 2021
f1c7190
Merge branch 'develop' into devop/consolidate-node-prs
gamalielhere Mar 9, 2021
3204a3f
Merge branch 'develop' of github.com:MyEtherWallet/MyEtherWallet into…
gamalielhere Mar 9, 2021
55f9e34
fix conflicts
gamalielhere Mar 9, 2021
85946ce
Merge pull request #2756 from MyEtherWallet/l10n_develop
gamalielhere Mar 9, 2021
8f7a60a
Merge pull request #2883 from MyEtherWallet/devop/consolidate-node-prs
gamalielhere Mar 9, 2021
a9241fb
Merge pull request #2879 from MyEtherWallet/bug/no-gas-check-swap-fro…
gamalielhere Mar 9, 2021
8e4c043
update packages and version
gamalielhere Mar 9, 2021
fbef08b
fix conflicts
gamalielhere Mar 9, 2021
aa27698
remove tokens with no balance in favor of api
gamalielhere Mar 10, 2021
a929328
Merge pull request #2892 from MyEtherWallet/bug/remove-no-balance-tokens
gamalielhere Mar 10, 2021
cf07ee6
devop: change the way we are checking lend balance
gesseekur Mar 10, 2021
0374e26
devop: update changelog
gesseekur Mar 10, 2021
e389c13
Merge pull request #2893 from MyEtherWallet/devop/lend-balance
gamalielhere Mar 10, 2021
8d9c51d
Merge pull request #2887 from MyEtherWallet/develop
gamalielhere Mar 10, 2021
a8e2ec1
fix weird issue with token symbols and balance with waay too long of …
gamalielhere Mar 11, 2021
01ce335
update package version
gamalielhere Mar 11, 2021
b8556f3
Merge pull request #2894 from MyEtherWallet/hotfix/token-sizing-issue
kvhnuke Mar 11, 2021
55914bd
Fix Avalanche derivation path
jpop32 Mar 11, 2021
a6c158f
Fix Avalanche ledger derivation paths
jpop32 Mar 11, 2021
991509a
add refresh token for all tokens with balance
gamalielhere Mar 15, 2021
0250c5c
update package
gamalielhere Mar 15, 2021
4f39683
pull master and fix conflicts
gamalielhere Mar 15, 2021
125d39b
update changelog
gamalielhere Mar 15, 2021
0b1cc55
add more space for ledger paths
gamalielhere Mar 15, 2021
ee39348
Merge branch 'master' of github.com:MyEtherWallet/MyEtherWallet into …
gamalielhere Mar 15, 2021
b1c72eb
update changelog
gamalielhere Mar 15, 2021
e8d4569
add check before passing 0x to bignumber lib
gamalielhere Mar 15, 2021
fc476b7
fix conflicts from master
gamalielhere Mar 15, 2021
0e7d740
update with the corerct number
gamalielhere Mar 15, 2021
3fccd88
Merge pull request #2904 from MyEtherWallet/bug/token-values
gamalielhere Mar 15, 2021
e87cbb4
Merge branch 'develop' into bug/ledger-paths
gamalielhere Mar 15, 2021
1f4355a
Merge branch 'develop' into bug/send-offline-nonce
gamalielhere Mar 15, 2021
38f3c3a
Merge pull request #2905 from MyEtherWallet/bug/ledger-paths
gamalielhere Mar 16, 2021
edc8b5f
Merge branch 'develop' into bug/send-offline-nonce
gamalielhere Mar 16, 2021
7e87a37
fix build, and update package version
gamalielhere Mar 16, 2021
223fffe
add manual load for custom tokens
gamalielhere Mar 16, 2021
61f0625
fix lint issue
gamalielhere Mar 16, 2021
bb73257
Merge pull request #2907 from MyEtherWallet/bug/send-offline-nonce
gamalielhere Mar 16, 2021
1e76e24
Merge pull request #2909 from MyEtherWallet/develop
gamalielhere Mar 17, 2021
eab7489
update packages and pull master
gamalielhere Mar 22, 2021
0dc65fd
reinstall packages
gamalielhere Mar 22, 2021
e195fc1
fix 53 bit issue
gamalielhere Mar 25, 2021
f47ecca
Merge pull request #2930 from MyEtherWallet/bug/send-offline
gamalielhere Mar 25, 2021
d9f0fc7
Merge pull request #2931 from MyEtherWallet/develop
gamalielhere Mar 25, 2021
46f3c39
add alchemy affiliate link
gamalielhere Mar 29, 2021
ce8bbfb
update changelog
gamalielhere Mar 29, 2021
517800f
fix bsc data on send offline
gamalielhere Mar 29, 2021
fd744d9
devop: exclude unstoppable
gamalielhere Mar 29, 2021
7898dcd
add y18n to audit exception
gamalielhere Mar 29, 2021
df52c65
Merge branch 'master' of github.com:MyEtherWallet/MyEtherWallet into …
gamalielhere Mar 29, 2021
de133bf
add aqua.js
aerth Mar 29, 2021
1262843
code: update component
gesseekur Mar 30, 2021
0c664d5
Add changelog
gesseekur Mar 30, 2021
f121290
Remove unused variable
gesseekur Mar 30, 2021
e9d6126
Reinstall and update
gesseekur Mar 30, 2021
15f39dd
add package to ignore
gesseekur Mar 30, 2021
91c31c7
Add package to audit exclusions
gesseekur Mar 30, 2021
c6060b3
remove console
gesseekur Mar 30, 2021
04bd631
Add to home
gesseekur Mar 30, 2021
b808e17
add update
gesseekur Mar 31, 2021
3892eb3
refactor
gesseekur Mar 31, 2021
8d763fc
Add more time
gesseekur Mar 31, 2021
60ea9a4
add welcome modal
gesseekur Mar 31, 2021
cabe86d
hide component
gesseekur Mar 31, 2021
a72cb29
Update app.vue
iluvboba Mar 31, 2021
7f6fc30
Update HomeLayout.vue
iluvboba Mar 31, 2021
d846e71
devop: fix lint
gesseekur Mar 31, 2021
28194cc
Merge pull request #2940 from MyEtherWallet/devop/alchemy-link
gamalielhere Mar 31, 2021
40de978
Merge branch 'develop' into devop/update-component
gamalielhere Mar 31, 2021
0cf1e0f
fix conflicts
gamalielhere Mar 31, 2021
854a8da
Merge branch 'aqua' of git://github.com/aerth/MyEtherWallet into bug/…
gamalielhere Mar 31, 2021
99d080f
update packages
gamalielhere Mar 31, 2021
ce4eacb
Merge pull request #2946 from MyEtherWallet/devop/update-component
gamalielhere Mar 31, 2021
d41c071
run update
gamalielhere Mar 31, 2021
b892253
update versions
gamalielhere Mar 31, 2021
3f4565e
run linter
gamalielhere Mar 31, 2021
ca4d3c1
Merge pull request #2941 from MyEtherWallet/bug/bsc-chain-data-send-o…
gamalielhere Mar 31, 2021
2036a5f
Merge pull request #2954 from MyEtherWallet/develop
gamalielhere Apr 1, 2021
c33f4df
update version, and connections
gamalielhere Apr 2, 2021
db5a5a6
Merge pull request #2983 from MyEtherWallet/devop/update-package-version
gamalielhere Apr 2, 2021
ee1f119
revert
gamalielhere Apr 2, 2021
2ef9860
Merge pull request #2986 from MyEtherWallet/devop/update-package-version
gamalielhere Apr 2, 2021
57bf4fd
devop: update packages
gamalielhere Apr 5, 2021
abd2aa0
update packages
gamalielhere Apr 6, 2021
e7de41b
Merge pull request #2995 from MyEtherWallet/devop/update-packages
gamalielhere Apr 6, 2021
b14fe9d
Merge pull request #2984 from MyEtherWallet/develop
gamalielhere Apr 6, 2021
713e3c9
fix mnemomnic import issue with extra word
gamalielhere Apr 6, 2021
0527e8c
check whether password exists or is not empty
gamalielhere Apr 6, 2021
3be8381
update changelog
gamalielhere Apr 6, 2021
c9bbd16
re-check estimateGas after estimateGas failure
SteveMieskoski Apr 7, 2021
cea6734
chore: update CHANGELOG.md
SteveMieskoski Apr 7, 2021
73c4ed8
Merge branch 'master' into bug-re-check-gasLimit
SteveMieskoski Apr 7, 2021
77bb426
Merge branch 'master' of git://github.com/jpop32/MyEtherWallet into b…
gamalielhere Apr 7, 2021
92a28f7
setup for release
gamalielhere Apr 7, 2021
d70da9a
add -1 as valid input within logic, but not on ui
gamalielhere Apr 7, 2021
7d6bff4
use is valid gas limit
gamalielhere Apr 7, 2021
2e0a6d1
add address watch
gamalielhere Apr 7, 2021
55ec73a
Merge pull request #3005 from MyEtherWallet/bug-re-check-gasLimit
gamalielhere Apr 7, 2021
2aa055a
fix conflicts
gamalielhere Apr 7, 2021
5e0728b
Merge pull request #3002 from MyEtherWallet/bug/mewcx-fixes
gamalielhere Apr 7, 2021
7d90d02
Merge pull request #3007 from MyEtherWallet/develop
gamalielhere Apr 7, 2021
bd191a8
Fix UD 2.0 version upgrade
sudoryan Apr 19, 2021
fb4c09b
update packages, add matic network
gamalielhere Apr 20, 2021
53acf20
update changelog
gamalielhere Apr 20, 2021
dc26db5
Merge branch 'develop' of git://github.com/unstoppabledomains/MyEther…
gamalielhere Apr 20, 2021
3aa017b
Merge pull request #3035 from MyEtherWallet/devop/update-packages
gamalielhere Apr 20, 2021
f0ee976
update changelog
gamalielhere Apr 20, 2021
74945c2
update versions for release
gamalielhere Apr 21, 2021
2e4cb86
update version for release
gamalielhere Apr 21, 2021
0e5a7e0
Merge pull request #3036 from MyEtherWallet/devop/unstoppable
gamalielhere Apr 21, 2021
e2fe0c1
get ledger to work
gamalielhere Apr 21, 2021
d045702
remove console
gamalielhere Apr 21, 2021
2ee1fc2
devop: update changelly handling to account for api and response changes
SteveMieskoski Apr 22, 2021
9c9059f
chore: clean console logs
SteveMieskoski Apr 22, 2021
03f4f4a
chore: update CHANGELOG.md
SteveMieskoski Apr 22, 2021
2637ec4
update package
gamalielhere Apr 22, 2021
01aa130
update packages
gamalielhere Apr 22, 2021
7d1991b
Merge branch 'master' of github.com:MyEtherWallet/MyEtherWallet into …
gamalielhere Apr 22, 2021
1bbfb0a
Merge pull request #3045 from MyEtherWallet/devop/avalanche-access
gamalielhere Apr 22, 2021
bd8416a
Merge pull request #3044 from MyEtherWallet/develop
gamalielhere Apr 22, 2021
9d69dc9
chore: update package.json
SteveMieskoski Apr 22, 2021
1c0123f
chore: lint
SteveMieskoski Apr 22, 2021
ca09af6
devop: add one inch as an option
SteveMieskoski Apr 28, 2021
1fed118
lint: clean console.logs
SteveMieskoski Apr 29, 2021
a55330d
lint: update package.json
SteveMieskoski Apr 30, 2021
b81b6d2
lint: update CHANGELOG.md
SteveMieskoski Apr 30, 2021
c2c890d
fix: fix paper wallet blockie color issue
hsurf22 May 4, 2021
a848c3b
update changelog
hsurf22 May 4, 2021
a5909f9
add catch for send offline address
gamalielhere May 4, 2021
a2ae980
temp fix for the swap options
gamalielhere May 4, 2021
ba1872e
add exception for library
gamalielhere May 4, 2021
05b5c9c
run linter
gamalielhere May 4, 2021
fafbc89
Merge branch 'master' of github.com:MyEtherWallet/MyEtherWallet into …
gamalielhere May 4, 2021
d30a977
Merge pull request #3065 from MyEtherWallet/bug/signing-address-send-…
gamalielhere May 5, 2021
582b03d
Merge branch 'develop' into devop/include-one-inch
gamalielhere May 5, 2021
da2e2c3
Merge branch 'develop' into fix-blockie-color-issue
gamalielhere May 6, 2021
aece143
fix packages
gamalielhere May 6, 2021
34aa414
add audit exclusion
gamalielhere May 6, 2021
cb889d3
exclude packages on audit
gamalielhere May 6, 2021
161beeb
Merge pull request #3064 from MyEtherWallet/fix-blockie-color-issue
gamalielhere May 6, 2021
2f4ef03
lint: update package.json
SteveMieskoski May 11, 2021
3f7ba7c
lint: update linter and package-audit.js to enable mewbuilds build
SteveMieskoski May 11, 2021
fea9ebd
pull in develop
gamalielhere May 11, 2021
31bd8d5
wait half a sec to fetch next coin info
gamalielhere May 11, 2021
3e54b2d
remove console
gamalielhere May 11, 2021
e1cc261
remove console.log
gamalielhere May 11, 2021
7e22808
update packages from snyk
gamalielhere May 11, 2021
041ed61
devop: add logo and tag line for one inch
SteveMieskoski May 11, 2021
a57eb9f
Merge remote-tracking branch 'origin/devop/include-one-inch' into dev…
SteveMieskoski May 11, 2021
d7a4ae0
devop: show or hide one inch in the not available provider list
SteveMieskoski May 11, 2021
c328085
devop: add security policy link in footer
gesseekur May 12, 2021
654fcb6
devop: add changelog
gesseekur May 12, 2021
05f7dd6
devop: move changelog under correct v
gesseekur May 12, 2021
3fce8c0
bug: add check for toLowerCase()
gesseekur May 12, 2021
d9c1a2e
devop: add changelog
gesseekur May 12, 2021
8eba791
devop: fix build
gesseekur May 12, 2021
5478f33
devop: fix build
gesseekur May 12, 2021
8108dba
lint: run tests, remove console
SteveMieskoski May 12, 2021
fc337f3
devop: commit images
SteveMieskoski May 12, 2021
e5a3b28
devop: fix one inch logo display, catch cannot estimate gas error
SteveMieskoski May 12, 2021
e2482ad
Merge pull request #3085 from MyEtherWallet/devop/security-policy
gamalielhere May 13, 2021
f352ef1
chore: lint
SteveMieskoski May 13, 2021
2b09426
chore: lint
SteveMieskoski May 13, 2021
e69cac9
chore: lint
SteveMieskoski May 13, 2021
7080862
chore: lint
kvhnuke May 13, 2021
abc9336
Merge branch 'devop/include-one-inch' of github.com:MyEtherWallet/MyE…
kvhnuke May 13, 2021
b40e412
Merge branch 'develop' into devop/include-one-inch
kvhnuke May 13, 2021
2c03997
chore: lint
kvhnuke May 13, 2021
87d6ec4
Merge pull request #3086 from MyEtherWallet/bug/network-error
gamalielhere May 13, 2021
481619a
Merge pull request #3061 from MyEtherWallet/devop/include-one-inch
gamalielhere May 13, 2021
5f5b68f
Merge pull request #3090 from MyEtherWallet/develop
gamalielhere May 13, 2021
6f913b3
add checksum for send oflfine address checker
gamalielhere May 14, 2021
3423a69
bug: fix address property checks for one inch
SteveMieskoski May 14, 2021
f0cceec
chore: update CHANGELOG.md
SteveMieskoski May 14, 2021
1c4cfb5
Merge pull request #3094 from MyEtherWallet/bug/fix-tokenAddress-retr…
gamalielhere May 14, 2021
69448f9
fix conflicts
gamalielhere May 14, 2021
4b795a8
Merge pull request #3093 from MyEtherWallet/bug/send-offline
gamalielhere May 14, 2021
115947f
Merge pull request #3096 from MyEtherWallet/develop
gamalielhere May 14, 2021
1d1ecb9
Initial draft for Satochip support
Toporin May 26, 2021
f645c68
Satochip support: remove unused code
Toporin May 26, 2021
687f20b
Satochip support: clean code
Toporin May 28, 2021
07c6cd5
update package-lock.json
Toporin Jun 17, 2021
7ecdd68
Add satochip logo in src/assets/images/icons/HardwareWallet/
Toporin Jun 17, 2021
e694cea
Add dist folder to repo
Toporin Jun 17, 2021
06b3989
Ignore ./dist/ folder
Toporin Jun 17, 2021
4136924
Add ./dist/ folder to repo
Toporin Jun 17, 2021
306bee2
Remove ./dist/ folder from repo
Toporin Jun 18, 2021
962e19a
remove cached ./dist/ folder from repo
Toporin Jun 18, 2021
a42cacc
Update package-lock.json file
Toporin Jun 22, 2021
9d35ca2
MyEtherWallet-Satochip v5.7.31 with support for Satochip-2FA
Toporin Jun 22, 2021
6f427fb
Improved error handling
Toporin Aug 18, 2021
7fc05ae
Update package.json
Toporin Oct 6, 2021
56433a7
Add Satochip logos
Toporin Oct 6, 2021
d87c841
Add Satochip support in hardware wallets
Toporin Oct 6, 2021
4bd9dee
Add Satochip in translations
Toporin Oct 6, 2021
0897502
Add Satochip reference in various layouts
Toporin Oct 6, 2021
99de356
Satochip hw: clean code
Toporin Oct 6, 2021
1bd07dd
Satochip hw: remove unused reject promises
Toporin Oct 6, 2021
fe83a51
remove unused displayAddress() function
Toporin Oct 6, 2021
9c9518f
Remove console logs
Toporin Oct 6, 2021
03c5324
(minor) Satochip hw: correct typos & unused var
Toporin Oct 6, 2021
ceebdcf
(minor) linting code
Toporin Oct 6, 2021
fd4b957
Merge branch 'mew-satochip-v6.3.0' into satochip
Toporin Oct 6, 2021
8dca7c0
update babel-jest module in package.json
Toporin Oct 6, 2021
ed89e21
Correct missing </div> tag in ModuleAccessWalletHardware.vue
Toporin Oct 6, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions connections.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = [
'wss://bridge.walletconnect.org:443',
'http://localhost:8178',
'ws://127.0.0.1:8178',
'ws://localhost:8397', // satochip hw
'https://unstoppabledomains.com:443',
'https://o382951.ingest.sentry.io:443',
'https://s3.us-west-2.amazonaws.com:443/mew-ipfs-bucket',
Expand Down
1,341 changes: 951 additions & 390 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"walletlink": "2.1.11"
},
"devDependencies": {
"@commitlint/config-conventional": "13.1.0",
"@commitlint/config-conventional": "13.2.0",
"@ledgerhq/hw-app-eth": "6.6.0",
"@ledgerhq/hw-transport-u2f": "5.36.0-deprecated",
"@ledgerhq/hw-transport-webusb": "6.7.0",
Expand All @@ -98,12 +98,12 @@
"axios": "0.21.4",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.1.0",
"babel-jest": "27.1.0",
"babel-jest": "27.2.4",
"bc-vault-js": "2.1.1",
"bignumber.js": "9.0.1",
"bip39": "3.0.4",
"codecov": "3.8.3",
"commitlint": "13.1.0",
"commitlint": "13.2.0",
"copy-webpack-plugin": "6.3.2",
"eslint": "7.32.0",
"eslint-plugin-prettier": "4.0.0",
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/hardware-wallets/satochip.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/images/icons/hardware-wallets/icon-satochip.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/images/icons/wallets/satochip.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/partners/satochip.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/core/components/AppPartnersBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ export default {
img: require('@/assets/images/partners/secalot.png'),
link: 'https://www.secalot.com/'
},
{
img: require('@/assets/images/partners/satochip.png'),
link: 'https://satochip.io/shop/'
},
{
img: require('@/assets/images/partners/bity.png'),
link: 'https://bity.com/af/jshkb37v'
Expand Down
1 change: 1 addition & 0 deletions src/core/router/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const accessRouteGuard = (to, from, next) => {
'keepkey',
'coolwallet',
'xwallet',
'satochip',
'bitbox',
'trezor',
'bcvault'
Expand Down
46 changes: 43 additions & 3 deletions src/modules/access-wallet/ModuleAccessWalletHardware.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,32 @@
:handler-loaded="loaded"
@setPath="setPath"
/>
<!--
=====================================================================================
Satochip
=====================================================================================
-->
<span v-if="onSatochip">
<div class="d-flex flex-column align-center">
<div class="titlePrimary-text">
Follow the instructions in the Satochip connection tab. If it did
not open automatically, click below.
</div>
<div>
<mew-button
class="mt-7"
title="Connect Satochip"
icon="mdi-open-in-new"
icon-type="mdi"
@click.native="satochipUnlock"
/>
</div>
<div class="primary--text my-8 cursor--pointer" @click="reset">
<v-icon small class="primary--text">mdi-arrow-left</v-icon>
Connect a different wallet
</div>
</div>
</span>
<!--
=====================================================================================
Cool Wallet
Expand Down Expand Up @@ -194,8 +220,8 @@
<v-icon small class="primary--text">mdi-arrow-left</v-icon>
Connect a different wallet
</div>
</div></span
>
</div>
</span>
</div>
<!--
=====================================================================================
Expand Down Expand Up @@ -304,6 +330,11 @@ export default {
label: 'CoolWallet',
icon: require('@/assets/images/icons/hardware-wallets/icon-coolwallet.svg'),
type: WALLET_TYPES.COOL_WALLET
},
{
label: 'Satochip',
icon: require('@/assets/images/icons/hardware-wallets/icon-satochip.svg'),
type: WALLET_TYPES.SATOCHIP
}
],
ledgerApps: appPaths.map(item => {
Expand Down Expand Up @@ -407,6 +438,12 @@ export default {
onKeepkey() {
return this.walletType === WALLET_TYPES.KEEPKEY;
},
/**
* On Satochip
*/
onSatochip() {
return this.walletType === WALLET_TYPES.SATOCHIP;
},
/**
* On Trezor
*/
Expand Down Expand Up @@ -592,6 +629,9 @@ export default {
keepkeyUnlock() {
this.unlockPathOnly();
},
satochipUnlock() {
this.unlockPathOnly();
},
coolWalletUnlock() {
this.unlockPathAndPassword(null, this.password);
},
Expand All @@ -605,7 +645,7 @@ export default {
this.loaded = true;
this.hwWalletInstance = _hwWallet;
if (this.onLedger) this.ledgerConnected = true;
if (this.onKeepkey || this.onTrezor) this.step++;
if (this.onKeepkey || this.onTrezor || this.onSatochip) this.step++;
if (this.onBitbox2) {
_hwWallet
.init(this.hasPath)
Expand Down
2 changes: 2 additions & 0 deletions src/modules/access-wallet/common/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
BitBox02Wallet,
KeepkeyWallet,
BCVaultWallet,
SatochipWallet,
CoolWallet
} from '@/modules/access-wallet/hardware/handlers';
import WalletInterface from './WalletInterface';
Expand All @@ -19,6 +20,7 @@ export {
TrezorWallet,
BitBox02Wallet,
KeepkeyWallet,
SatochipWallet,
CoolWallet,
MewConnectWallet,
WalletConnectWallet,
Expand Down
1 change: 1 addition & 0 deletions src/modules/access-wallet/common/walletTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const WALLET_TYPES = {
XWALLET: 'xwallet',
BCVAULT: 'bcVault',
COOL_WALLET: 'coolWallet',
SATOCHIP: 'satochip',
WALLET_LINK: 'walletLink',
MEW_WALLET: 'mewWallet'
};
Expand Down
2 changes: 2 additions & 0 deletions src/modules/access-wallet/hardware/handlers/bip44/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import bitbox02Paths from './bitbox02Paths';
import keepkeyPaths from './keepkeyPaths';
import mnemonicPaths from './mnemonicPaths';
import coolWalletPaths from './coolWalletPaths';
import satochipPaths from './satochipPaths';

export default {
[WALLET_TYPES.LEDGER]: ledgerPaths,
Expand All @@ -14,5 +15,6 @@ export default {
[WALLET_TYPES.BITBOX2]: bitbox02Paths,
[WALLET_TYPES.KEEPKEY]: keepkeyPaths,
[WALLET_TYPES.MNEMONIC]: mnemonicPaths,
[WALLET_TYPES.SATOCHIP]: satochipPaths,
[WALLET_TYPES.COOL_WALLET]: coolWalletPaths
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import {
ethereum,
ethereumClassic,
ropsten,
singularDTV,
expanse,
ubiq,
ellaism,
etherGem,
callisto,
ethereumSocial,
musicoin,
goChain,
eosClassic,
akroma,
etherSocialNetwork,
pirl,
ether1,
atheios,
tomoChain,
mixBlockchain,
iolite,
rskMainnet,
rskTestnet,
lightstreamsNetwork,
ethercore
} from '../configs/configPaths';
export default [
ethereum,
ethereumClassic,
ropsten,
singularDTV,
expanse,
ubiq,
ellaism,
etherGem,
callisto,
ethereumSocial,
musicoin,
goChain,
eosClassic,
akroma,
etherSocialNetwork,
pirl,
ether1,
atheios,
tomoChain,
mixBlockchain,
iolite,
rskMainnet,
rskTestnet,
lightstreamsNetwork,
ethercore
];
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
BitBox02Wallet,
KeepkeyWallet,
BCVaultWallet,
SatochipWallet,
CoolWallet
} from '@/modules/access-wallet/common';

Expand Down Expand Up @@ -53,6 +54,14 @@ export default {
accountOnly: true,
title: 'Connect your BC Vault'
},
[WALLET_TYPES.SATOCHIP]: {
create: SatochipWallet,
when: 2,
hasPaths: false,
requiresPassword: false,
accountOnly: false,
title: 'Connect your Satochip'
},
[WALLET_TYPES.COOL_WALLET]: {
create: CoolWallet,
when: 2,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import WalletErrorHandler from '@/modules/access-wallet/common/WalletErrorHandler';

const ERRORS = {
'Popup closed': 'satochipError.popup-closed',
'Device disconnected': 'satochipError.device-disconnect',
'device disconnected during action': 'satochipError.device-disconnect-action',
'Action cancelled by user': 'satochipError.user-cancelled-action',
'Permissions not granted': 'satochipError.no-permission',
'Device call in progress': 'satochipError.call-in-progress',
Cancelled: 'satochipError.cancelled',
'Iframe timeout': 'satochipError.iframe-timeout',
'popup failed to open': 'satochipError.popup-failed-to-open',
'Satochip: error while connecting to Satochip-Bridge':
'satochipError.connect-error',
'No response received from 2FA': 'satochipError.noresponse-2FA',
'Signing request rejected by user': 'satochipError.rejected-2FA',
'No card found': 'satochipError.no-card-found',
'message is undefined': 'satochipError.no-card-found'
};

const WARNINGS = {};

export default WalletErrorHandler(ERRORS, WARNINGS);