Skip to content

Commit ac9fcfe

Browse files
authored
Merge pull request #4 from Zondax/dev
Dev
2 parents 0e6bbed + 71194ed commit ac9fcfe

File tree

122 files changed

+18
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+18
-30
lines changed

.gitmodules

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
[submodule "deps/nanosplus-secure-sdk"]
2-
path = deps/nanosplus-secure-sdk
3-
url = https://github.com/LedgerHQ/ledger-secure-sdk
4-
[submodule "deps/nanox-secure-sdk"]
5-
path = deps/nanox-secure-sdk
6-
url = https://github.com/LedgerHQ/ledger-secure-sdk
71
[submodule "deps/ledger-zxlib"]
82
path = deps/ledger-zxlib
93
url = https://github.com/Zondax/ledger-zxlib.git
10-
[submodule "deps/stax-secure-sdk"]
4+
[submodule "deps/ledger-secure-sdk"]
115
path = deps/stax-secure-sdk
126
url = https://github.com/LedgerHQ/ledger-secure-sdk
13-
[submodule "deps/nanos-secure-sdk"]
14-
path = deps/nanos-secure-sdk
15-
url = https://github.com/LedgerHQ/ledger-secure-sdk
167
[submodule "js"]
178
path = js
189
url = https://github.com/Zondax/ledger-sei-js

app/Makefile.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ APPVERSION_M=0
33
# This is the minor version
44
APPVERSION_N=0
55
# This is the patch version
6-
APPVERSION_P=5
6+
APPVERSION_P=6

app/src/evm/evm_addr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ zxerr_t eth_addr_getItem(int8_t displayIdx, char *outKey, uint16_t outKeyLen, ch
5151

5252
switch (displayIdx) {
5353
case 0:
54-
snprintf(outKey, outKeyLen, "Eth Address");
54+
snprintf(outKey, outKeyLen, "EVM Address");
5555
pageString(outVal, outValLen, buffer, pageIdx, pageCount);
5656
return zxerr_ok;
5757
case 1: {

app/src/evm/parser_impl_evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static parser_error_t printEthHash(const parser_context_t *ctx, char *outKey, ui
236236
char hex[65] = {0};
237237
array_to_hexstr(hex, 65, hash, 32);
238238

239-
snprintf(outKey, outKeyLen, "Eth-Hash");
239+
snprintf(outKey, outKeyLen, "EVM Hash");
240240

241241
pageString(outVal, outValLen, hex, pageIdx, pageCount);
242242

deps/nanos-secure-sdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/nanosplus-secure-sdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/nanox-secure-sdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

js

Submodule js updated 1 file

tests/expected_output.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ std::vector<std::string> EVMGenerateExpectedUIOutput(const Json::Value &json, bo
119119
addTo(answer, "{} | Data : {}", idx, data);
120120

121121
idx++;
122-
auto hash = FormatEthAddress("Eth-Hash", idx, txhash);
122+
auto hash = FormatEthAddress("EVM Hash", idx, txhash);
123123
answer.insert(answer.end(), hash.begin(), hash.end());
124124

125125
return answer;

tests_zemu/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@
2525
},
2626
"dependencies": {
2727
"@zondax/ledger-sei": "../js",
28-
"@zondax/zemu": "^0.50.2"
28+
"@zondax/zemu": "^0.50.3"
2929
},
3030
"devDependencies": {
3131
"@types/elliptic": "^6.4.14",
32-
"@types/jest": "^29.5.12",
32+
"@types/jest": "^29.5.13",
3333
"@types/ledgerhq__hw-transport": "^4.21.8",
3434
"@types/secp256k1": "^4.0.6",
35-
"@typescript-eslint/eslint-plugin": "^7.17.0",
36-
"@typescript-eslint/parser": "^7.17.0",
35+
"@typescript-eslint/eslint-plugin": "^8.6.0",
36+
"@typescript-eslint/parser": "^8.6.0",
3737
"blakejs": "^1.1.1",
3838
"crypto-js": "4.2.0",
3939
"ed25519-supercop": "^2.0.1",
40-
"eslint": "^9.8.0",
40+
"eslint": "^9.10.0",
4141
"eslint-config-prettier": "^9.1.0",
42-
"eslint-plugin-import": "^2.29.1",
43-
"eslint-plugin-jest": "^28.5.0",
42+
"eslint-plugin-import": "^2.30.0",
43+
"eslint-plugin-jest": "^28.8.3",
4444
"eslint-plugin-prettier": "^5.2.1",
45-
"eslint-plugin-promise": "^7.0.0",
45+
"eslint-plugin-promise": "^7.1.0",
4646
"eslint-plugin-tsdoc": "^0.3.0",
47-
"eslint-plugin-unused-imports": "^4.0.1",
47+
"eslint-plugin-unused-imports": "^4.1.4",
4848
"jest": "29.7.0",
4949
"jssha": "^3.2.0",
5050
"prettier": "^3.3.3",
51-
"ts-jest": "^29.2.3",
51+
"ts-jest": "^29.2.5",
5252
"ts-node": "^10.9.2",
53-
"typescript": "^5.5.4"
53+
"typescript": "^5.6.2"
5454
}
5555
}
333 Bytes
-9 Bytes
8 Bytes
8 Bytes
-5 Bytes
-3 Bytes
-3 Bytes
222 Bytes
39 Bytes
-3 Bytes
-3 Bytes

0 commit comments

Comments
 (0)