Skip to content

Commit

Permalink
Merge pull request #401 from Zondax/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosala authored Apr 12, 2024
2 parents 459f63c + dbd0ab9 commit 898c540
Show file tree
Hide file tree
Showing 6 changed files with 1,144 additions and 1,072 deletions.
672 changes: 336 additions & 336 deletions .yarn/releases/yarn-4.0.2.cjs → .yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"url": "https://github.com/zondax/zemu/issues"
},
"dependencies": {
"@grpc/grpc-js": "^1.10.1",
"@grpc/proto-loader": "^0.7.10",
"@ledgerhq/hw-transport-http": "^6.29.4",
"axios": "^1.6.7",
"axios-retry": "^4.0.0",
"@grpc/grpc-js": "^1.10.6",
"@grpc/proto-loader": "^0.7.12",
"@ledgerhq/hw-transport-http": "^6.29.5",
"axios": "^1.6.8",
"axios-retry": "^4.1.0",
"dockerode": "^4.0.2",
"elfy": "^1.0.0",
"fs-extra": "^11.2.0",
Expand All @@ -44,16 +44,16 @@
"randomstring": "^1.3.0"
},
"devDependencies": {
"@ledgerhq/hw-transport": "^6.30.4",
"@types/dockerode": "^3.3.23",
"@ledgerhq/hw-transport": "^6.30.5",
"@types/dockerode": "^3.3.28",
"@types/fs-extra": "^11.0.4",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.19",
"@types/node": "^20.12.7",
"@types/pngjs": "^6.0.4",
"@types/randomstring": "^1.1.11",
"@types/randomstring": "^1.3.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@zondax/ledger-substrate": "^0.41.3",
"@zondax/ledger-substrate": "^0.41.4",
"copyfiles": "^2.4.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -71,5 +71,5 @@
"files": [
"dist/**/*"
],
"packageManager": "yarn@4.0.2"
"packageManager": "yarn@4.1.1"
}
4 changes: 2 additions & 2 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
******************************************************************************* */
import { ButtonKind, type IDeviceWindow, type IStartOptions } from "./types";

export const DEFAULT_EMU_IMG = "zondax/builder-zemu:speculos-3a3439f6b45eca7f56395673caaf434c202e7005";
export const DEFAULT_EMU_IMG = "zondax/builder-zemu:speculos-a5db17018a180cbd4277dfc7a1a247f427a3d81b";

export const DEFAULT_MODEL = "nanos";
export const DEFAULT_NANO_START_TEXT = "Ready";
export const DEFAULT_STAX_START_TEXT = "This application enables";
export const DEFAULT_PENDING_REVIEW_TEXT = "Ledger review"
export const DEFAULT_PENDING_REVIEW_TEXT = "Ledger review";
export const DEFAULT_START_DELAY = 20000;
export const DEFAULT_KEY_DELAY = 250;
export const DEFAULT_HOST = "127.0.0.1";
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"declaration": true,
"forceConsistentCasingInFileNames": true,
"skipLibCheck": true,
"outDir": "./dist",
"outDir": "./dist"
},
"include": ["src"],
"include": ["src"]
}
Loading

0 comments on commit 898c540

Please sign in to comment.