From 32bff3e0d02f38379e39a5fdd30933ed6b8548f9 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Mon, 20 Feb 2023 16:37:22 +0100 Subject: [PATCH 1/2] Disable button clicks before getting the new EIP-191 data, not after --- src_bagl/ui_flow_signMessage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_bagl/ui_flow_signMessage.c b/src_bagl/ui_flow_signMessage.c index e1eed03..3c2a75a 100644 --- a/src_bagl/ui_flow_signMessage.c +++ b/src_bagl/ui_flow_signMessage.c @@ -18,10 +18,10 @@ static void dummy_pre_cb(void) { static void dummy_post_cb(void) { if (ui_pos == UI_191_POS_QUESTION) { - continue_displaying_message(); // temporarily disable button clicks, they will be re-enabled as soon as new data // is received and the page is redrawn with ux_flow_init() G_ux.stack[0].button_push_callback = NULL; + continue_displaying_message(); } else // UI_191_END { ui_191_switch_to_message_end(); From 1cf39711b8ec6996deaa450e39f4980a18e87827 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Mon, 20 Feb 2023 16:49:02 +0100 Subject: [PATCH 2/2] Fix Speculos tests --- .github/workflows/ci-workflow.yml | 4 ++-- tests/speculos/conftest.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 23b1679..b66a5fa 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -72,10 +72,10 @@ jobs: - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev - - name: Install node + - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: "14.4.0" + node-version: "16" - name: Install yarn run: npm install -g yarn diff --git a/tests/speculos/conftest.py b/tests/speculos/conftest.py index b10f7a6..4d68fc6 100644 --- a/tests/speculos/conftest.py +++ b/tests/speculos/conftest.py @@ -9,8 +9,6 @@ from ethereum_client.ethereum_cmd import EthereumCommand SCRIPT_DIR = Path(__file__).absolute().parent API_URL = "http://127.0.0.1:5000" -VERSION = {"nanos": "2.1", "nanox": "2.0.2", "nanosp": "1.0.3"} - def pytest_addoption(parser): # nanos, nanox, nanosp @@ -27,7 +25,7 @@ def client(pytestconfig): file_path = pytestconfig.getoption("path") model = pytestconfig.getoption("model") - args = ['--log-level', 'speculos:DEBUG','--model', model, '--display', pytestconfig.getoption("display"), '--sdk', VERSION[model]] + args = ['--log-level', 'speculos:DEBUG','--model', model, '--display', pytestconfig.getoption("display")] with SpeculosClient(app=str(file_path), args=args) as client: yield client