d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #407 from LedgerHQ/bugfix/apa/eip191_regression_freeze

Browse Source 
Fix EIP-191 regression
This commit is contained in:
apaillier-ledger
2023-02-20 18:18:03 +01:00
committed by GitHub
parent f6717ae30c 1cf39711b8
commit e8c44fce83
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci-workflow.yml vendored
View File

@@ -72,10 +72,10 @@ jobs:
- run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev - 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 uses: actions/setup-node@v3
with: with:
node-version: "14.4.0" node-version: "16"
- name: Install yarn - name: Install yarn
run: npm install -g yarn run: npm install -g yarn

2
src_bagl/ui_flow_signMessage.c
View File

@@ -18,10 +18,10 @@ static void dummy_pre_cb(void) {
static void dummy_post_cb(void) { static void dummy_post_cb(void) {
if (ui_pos == UI_191_POS_QUESTION) { if (ui_pos == UI_191_POS_QUESTION) {
continue_displaying_message();
// temporarily disable button clicks, they will be re-enabled as soon as new data // 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() // is received and the page is redrawn with ux_flow_init()
G_ux.stack[0].button_push_callback = NULL; G_ux.stack[0].button_push_callback = NULL;
continue_displaying_message();
} else // UI_191_END } else // UI_191_END
{ {
ui_191_switch_to_message_end(); ui_191_switch_to_message_end();

4
tests/speculos/conftest.py
View File

@@ -9,8 +9,6 @@ from ethereum_client.ethereum_cmd import EthereumCommand
SCRIPT_DIR = Path(__file__).absolute().parent SCRIPT_DIR = Path(__file__).absolute().parent
API_URL = "http://127.0.0.1:5000" API_URL = "http://127.0.0.1:5000"
VERSION = {"nanos": "2.1", "nanox": "2.0.2", "nanosp": "1.0.3"}
def pytest_addoption(parser): def pytest_addoption(parser):
# nanos, nanox, nanosp # nanos, nanox, nanosp
@@ -27,7 +25,7 @@ def client(pytestconfig):
file_path = pytestconfig.getoption("path") file_path = pytestconfig.getoption("path")
model = pytestconfig.getoption("model") 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: with SpeculosClient(app=str(file_path), args=args) as client:
yield client yield client