Skip to content

Commit

Permalink
Merge pull request #351 from Zondax/container
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosala authored Jan 11, 2024
2 parents 0d2e7a3 + 21c7d05 commit 0d18cdc
Show file tree
Hide file tree
Showing 7 changed files with 216 additions and 182 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
- run: npm install -g yarn
- run: yarn install
- run: yarn format
Expand All @@ -26,11 +26,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
- run: npm install -g yarn
- run: yarn install
- run: yarn build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
- run: npm install -g yarn
- run: yarn install
- run: yarn build
Expand All @@ -30,11 +30,11 @@ jobs:
needs: [build-test]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
registry-url: "https://registry.npmjs.org"
scope: "@zondax"
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@
"url": "https://github.com/zondax/zemu/issues"
},
"dependencies": {
"@grpc/grpc-js": "^1.9.12",
"@grpc/grpc-js": "^1.9.13",
"@grpc/proto-loader": "^0.7.10",
"@ledgerhq/hw-transport-http": "^6.29.0",
"axios": "^1.6.2",
"@ledgerhq/hw-transport-http": "^6.29.1",
"axios": "^1.6.5",
"axios-retry": "^4.0.0",
"dockerode": "^4.0.0",
"dockerode": "^4.0.2",
"elfy": "^1.0.0",
"fs-extra": "^11.2.0",
"get-port": "^5.1.1",
"pngjs": "^7.0.0",
"randomstring": "^1.3.0"
},
"devDependencies": {
"@ledgerhq/hw-transport": "^6.30.0",
"@ledgerhq/hw-transport": "^6.30.1",
"@types/dockerode": "^3.3.23",
"@types/fs-extra": "^11.0.4",
"@types/jest": "^29.5.11",
"@types/node": "^20.10.4",
"@types/node": "^20.11.0",
"@types/pngjs": "^6.0.4",
"@types/randomstring": "^1.1.11",
"@typescript-eslint/eslint-plugin": "^6.13.2",
"@typescript-eslint/parser": "^6.13.2",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@zondax/ledger-substrate": "^0.41.3",
"copyfiles": "^2.4.1",
"eslint": "^8.55.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard-with-typescript": "^40.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-n": "^16.3.1",
"eslint-config-standard-with-typescript": "^43.0.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"jest": "^29.7.0",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"rimraf": "^5.0.5",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.2",
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
******************************************************************************* */
import { ButtonKind, type IDeviceWindow, type IStartOptions } from "./types";

export const DEFAULT_EMU_IMG = "zondax/builder-zemu:speculos-f9dfe878f4934d5dac9fb49a298a136d494c465c";
export const DEFAULT_EMU_IMG = "zondax/builder-zemu:speculos-e262a0ca9d2b37810d0339b37c50ce0d7171c9a2";

export const DEFAULT_MODEL = "nanos";
export const DEFAULT_NANO_START_TEXT = "Ready";
Expand Down
1 change: 1 addition & 0 deletions src/emulator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export default class EmuContainer {
throw err;
}

// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
docker.modem.followProgress(stream, onFinished, onProgress);
});
});
Expand Down
2 changes: 2 additions & 0 deletions src/grpc/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ export default class GRPCRouter {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const self = this;
// @ts-expect-error types are missing
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
this.server.addService(rpcDefinition.ledger_go.ZemuCommand.service, {
Exchange(call: any, callback: any, ctx = self) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
void ctx.httpTransport.exchange(call.request.command).then((response: Buffer) => {
callback(null, { reply: response });
});
Expand Down
Loading

0 comments on commit 0d18cdc

Please sign in to comment.