Skip to content

Commit

Permalink
Merge branch 'release-candidate' of https://github.com/keepkey/keepke…
Browse files Browse the repository at this point in the history
…y-desktop into develop
  • Loading branch information
BitHighlander committed Nov 12, 2023
2 parents 93e5c51 + 939ffee commit c8e1edf
Show file tree
Hide file tree
Showing 28 changed files with 427 additions and 1,399 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}
- name: Yarn Install
run: yarn install --immutable --immutable-cache
run: yarn install
- name: Yarn Build
run: yarn build
- name: Upload Built App
Expand Down
731 changes: 193 additions & 538 deletions .pnp.cjs

Large diffs are not rendered by default.

This file was deleted.

Git LFS file not shown

This file was deleted.

Git LFS file not shown

This file was deleted.

This file was deleted.

This file was deleted.

Git LFS file not shown
Git LFS file not shown
Git LFS file not shown

This file was deleted.

Git LFS file not shown

This file was deleted.

This file was deleted.

Git LFS file not shown
Git LFS file not shown

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions .yarn/cache/axios-npm-1.2.0-ad83373c57-f08ce214e9.zip

This file was deleted.

3 changes: 3 additions & 0 deletions .yarn/cache/axios-npm-1.6.0-b0f6015a96-c7c9f2ae9e.zip
Git LFS file not shown
3 changes: 3 additions & 0 deletions .yarn/cache/bs58check-npm-2.0.2-047bb1f54b-fe3c9b8d50.zip
Git LFS file not shown
42 changes: 35 additions & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,39 @@ packageExtensions:
'@sentry/electron@4.1.2':
dependencies:
electron: 22.0.0
'@shapeshiftoss/caip@8.4.4':
'@shapeshiftoss-investor-idle@*':
dependencies:
axios: ^1.6.0
'@shapeshiftoss/caip@*':
dependencies:
lodash: 4.17.21
'@shapeshiftoss/chain-adapters@10.14.0':
axios: ^1.6.0
fs: npm:noist@1.0.0
'bs58check@3.0.1':
dependencies:
bs58: ^4.0.1
'bs58check@2.1.2':
dependencies:
bs58: ^4.0.1
'@shapeshiftoss/chain-adapters@10.2.1':
dependencies:
'@ethersproject/contracts': ^5.7.0
'@shapeshiftoss/logger': ^1.1.3
bs58check: ^2.1.2
'@shapeshiftoss/chain-adapters@10.2.1':
bs58check: ^3.0.1
'@shapeshiftoss/chain-adapters@11.2.2':
dependencies:
'@ethersproject/contracts': ^5.7.0
'@shapeshiftoss/caip': ^8.15.0
'@shapeshiftoss/hdwallet-native': ^1.52.11
'@shapeshiftoss/logger': ^1.1.3
bs58check: ^2.1.2
'@shapeshiftoss/types': ^8.6.0
'@shapeshiftoss/unchained-client': ^10.14.0
bs58check: ^3.0.1
'@shapeshiftoss/hdwallet-core@*':
dependencies:
'@ethersproject/bytes': ^5.7.0
'@types/google-protobuf': ^3.15.1
'@types/node': ^18
'@shapeshiftoss/hdwallet-core@1.50.3':
dependencies:
'@ethersproject/bytes': ^5.7.0
Expand All @@ -73,7 +93,12 @@ packageExtensions:
long: ^4.0.0
url: ^0.11.0
util: ^0.12.5
'@shapeshiftoss/market-service@7.1.3':
'@shapeshiftoss/investor-idle@2.7.0':
dependencies:
'@shapeshiftoss/investor': 3.1.3
'@shapeshiftoss/logger': ^1.1.3
axios: 1.6.0
'@shapeshiftoss/market-service@*':
dependencies:
'@ethersproject/abi': ^5.7.0
'@ethersproject/address': ^5.7.0
Expand All @@ -86,7 +111,7 @@ packageExtensions:
dependencies:
long: ^4.0.0
protobufjs: ^7.1.2
'@shapeshiftoss/unchained-client@10.3.0':
'@shapeshiftoss/unchained-client@*':
dependencies:
'@ethersproject/abi': ^5.7.0
'@ethersproject/address': ^5.7.0
Expand Down Expand Up @@ -225,6 +250,9 @@ packageExtensions:
jsprim@1.4.2:
dependencies:
util: ^0.12.5
lodash@4.17.21:
dependencies:
url: ^0.11.0
micro-ftch@0.3.1:
dependencies:
url: ^0.11.0
Expand Down
23 changes: 12 additions & 11 deletions packages/keepkey-desktop-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,22 +113,24 @@
"@pioneer-platform/pioneer-client": "^9.0.18",
"@react-spring/web": "^9.5.2",
"@reduxjs/toolkit": "^1.8.2",
"@shapeshiftoss/asset-service": "^8.1.2",
"@shapeshiftoss/caip": "^8.4.2",
"@shapeshiftoss/chain-adapters": "^10.1.0",
"@shapeshiftoss/asset-service": "^8.12.0",
"@shapeshiftoss/caip": "^8.15.0",
"@shapeshiftoss/chain-adapters": "^11.2.2",
"@shapeshiftoss/errors": "^1.1.3",
"@shapeshiftoss/hdwallet-core": "^1.52.11",
"@shapeshiftoss/hdwallet-keepkey": "1.52.11",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.52.11",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.52.11",
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.52.11",
"@shapeshiftoss/hdwallet-native": "^1.41.0",
"@shapeshiftoss/hdwallet-native": "^1.52.11",
"@shapeshiftoss/hdwallet-walletconnect": "^1.41.0",
"@shapeshiftoss/investor-foxy": "^7.0.1",
"@shapeshiftoss/investor": "^3.1.3",
"@shapeshiftoss/investor-foxy": "^8.0.1",
"@shapeshiftoss/investor-idle": "^2.7.0",
"@shapeshiftoss/logger": "^1.1.3",
"@shapeshiftoss/market-service": "^7.1.1",
"@shapeshiftoss/types": "^8.3.1",
"@shapeshiftoss/unchained-client": "^10.1.2",
"@shapeshiftoss/market-service": "^7.8.0",
"@shapeshiftoss/types": "^8.6.0",
"@shapeshiftoss/unchained-client": "^10.14.0",
"@tsoa/runtime": "^4.1.3",
"@uniswap/sdk": "^3.0.3",
"@uniswap/v2-core": "^1.0.1",
Expand All @@ -153,13 +155,12 @@
"allsettled-polyfill": "^1.0.4",
"assert": "^2.0.0",
"auto-launch": "^5.0.5",
"axios": "^1.2.0",
"axios": "^1.6.0",
"bignumber.js": "^9.0.2",
"bip39": "^3.0.4",
"body-parser": "^1.20.1",
"browserify-zlib": "^0.2.0",
"bs58": "^5.0.0",
"bs58check": "^3.0.1",
"bs58check": "2.0.2",
"buffer": "^6.0.3",
"chakra-ui-steps": "^1.7.3",
"comlink": "^4.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/keepkey-desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "keepkey-desktop",
"version": "2.1.27",
"version": "2.1.28",
"author": {
"name": "KeepKey",
"email": "support@keepkey.com"
Expand Down
Loading

0 comments on commit c8e1edf

Please sign in to comment.