From c84e32a6cde246b8c5ebed4fdbd7d6e951893a57 Mon Sep 17 00:00:00 2001 From: n4l5u0r <59141606+n4l5u0r@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:36:47 +0100 Subject: [PATCH] fix: gdb issue --- .vscode/settings.json | 3 ++- docker-compose.yml | 4 ++-- gdb.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a487dfe5..03ba06bc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,7 +19,7 @@ "python.terminal.activateEnvironment": false, "git.ignoreLimitWarning": true, "ledgerDevTools.appSettings": { - "selectedUseCase": "release", + "selectedUseCase": "debug", "selectedVariant": "CCD", "selectedDevice": "Nano S Plus" }, @@ -44,4 +44,5 @@ "titleBar.inactiveForeground": "#15202b99" }, "peacock.color": "#47A2AF", + "codeQL.githubDatabase.update": "never", } diff --git a/docker-compose.yml b/docker-compose.yml index 71cb4e6e..c1a0e319 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: nanosp: - image: ghcr.io/blooo-io/speculos:latest-aarch64 + image: ghcr.io/blooo-io/speculos:latest volumes: - ./bin:/speculos/apps - ./src:/speculos/sources @@ -12,5 +12,5 @@ services: - "40000:40000" # apdu environment: - GDB_DIRECTORY_LIST="/speculos/sources:/speculos/sources/apdu:/speculos/sources/handler:/speculos/sources/helper:/speculos/sources/transaction:/speculos/sources/ui" - command: "-d --model nanox build/nanox/bin/app.elf --display headless --apdu-port 40000 " + command: "-d --model nanosp build/nanos2/bin/app.elf --display headless --apdu-port 40000" # Add `--vnc-password ""` for macos users to use built-in vnc client. \ No newline at end of file diff --git a/gdb.sh b/gdb.sh index 9176d645..009941c3 100755 --- a/gdb.sh +++ b/gdb.sh @@ -1,6 +1,6 @@ #!/bin/bash -docker-compose up -d +docker compose up -d # Wait for the container to start until docker inspect -f '{{.State.Status}}' concordium-ledger-app-nanosp-1 | grep -q "running"; do @@ -9,4 +9,4 @@ done docker exec -it concordium-ledger-app-nanosp-1 ./tools/debug.sh apps/app.elf -docker-compose down \ No newline at end of file +docker compose down \ No newline at end of file