From 61d8e0569b5802f1d8693b1d6c0e545f0005513d Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Sun, 26 Jun 2022 09:59:39 +0200 Subject: [PATCH 1/5] update deps --- app/rust/Cargo.lock | 118 ++++++++++++++++++++------------------ deps/ledger-zxlib | 2 +- deps/nanos-secure-sdk | 2 +- deps/nanosplus-secure-sdk | 2 +- deps/nanox-secure-sdk | 2 +- 5 files changed, 67 insertions(+), 59 deletions(-) diff --git a/app/rust/Cargo.lock b/app/rust/Cargo.lock index 7a143ef..460951a 100644 --- a/app/rust/Cargo.lock +++ b/app/rust/Cargo.lock @@ -1,10 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -73,9 +75,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "curve25519-dalek" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e1720189a637d44fe464f4df1e6eb900b4835255b14354497c78af37d9bb8" +checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" dependencies = [ "byteorder", "digest 0.8.1", @@ -86,9 +88,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" dependencies = [ "byteorder", "digest 0.9.0", @@ -112,7 +114,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -145,9 +147,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -166,9 +168,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -181,9 +183,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-literal" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961de220ec9a91af2e1e5bd80d02109155695e516771762381ef8581317066e0" +checksum = "d70693199b3cf4552f3fa720b54163927a3ebed2aef240efaf556033ab336a11" dependencies = [ "hex-literal-impl", "proc-macro-hack", @@ -191,9 +193,9 @@ dependencies = [ [[package]] name = "hex-literal-impl" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853f769599eb31de176303197b7ba4973299c38c7a7604a6bc88c3eef05b9b46" +checksum = "59448fc2f82a5fb6907f78c3d69d843e82ff5b051923313cc4438cb0c7b745a8" dependencies = [ "proc-macro-hack", ] @@ -209,30 +211,30 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "libc" -version = "0.2.93" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] [[package]] name = "memchr" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "merlin" @@ -260,9 +262,9 @@ checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-hack" @@ -272,11 +274,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -287,9 +289,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -332,9 +334,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -343,15 +345,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "rslib" version = "0.1.0" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.1", "env_logger", "getrandom", "hex", @@ -372,7 +374,7 @@ checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" dependencies = [ "arrayref", "arrayvec", - "curve25519-dalek 2.1.2", + "curve25519-dalek 2.1.3", "merlin", "rand_core", "sha2", @@ -394,26 +396,26 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.69" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -423,30 +425,36 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-ident" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" @@ -487,18 +495,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "zeroize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.0.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib index 10d6842..2f4d80a 160000 --- a/deps/ledger-zxlib +++ b/deps/ledger-zxlib @@ -1 +1 @@ -Subproject commit 10d684224e2df18231ad423d3e8a6262d8ad1580 +Subproject commit 2f4d80a8b6485bfba8219ecf550cb22d8297f6c9 diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk index 86a3ae0..026a1f5 160000 --- a/deps/nanos-secure-sdk +++ b/deps/nanos-secure-sdk @@ -1 +1 @@ -Subproject commit 86a3ae00e54c626d86b1f6aff0ac8f22ba1dafe6 +Subproject commit 026a1f5cf55e68f74062cb2795804f9b4554ea15 diff --git a/deps/nanosplus-secure-sdk b/deps/nanosplus-secure-sdk index 21f284b..c2a17eb 160000 --- a/deps/nanosplus-secure-sdk +++ b/deps/nanosplus-secure-sdk @@ -1 +1 @@ -Subproject commit 21f284bf7999ac5233b46a3a21f9176b1fc68478 +Subproject commit c2a17ebe62395d7a7a36658bf4bec952c08d0df3 diff --git a/deps/nanox-secure-sdk b/deps/nanox-secure-sdk index 1f7a79e..86324f6 160000 --- a/deps/nanox-secure-sdk +++ b/deps/nanox-secure-sdk @@ -1 +1 @@ -Subproject commit 1f7a79e88ecaf27f7338fa25d9cd4922b1017af4 +Subproject commit 86324f6a73e269c04f6a3e3cf41f6569a8cc6c6b From 3fc8dec0d1d77ce66464025c3992d38b23280377 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Sun, 26 Jun 2022 10:00:30 +0200 Subject: [PATCH 2/5] fix small error --- app/src/parser_impl.h | 1 + app/src/parser_impl_common.c | 12 +++++++++--- app/src/substrate/substrate_types.c | 4 ++-- app/src/substrate/substrate_types_V1.c | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/parser_impl.h b/app/src/parser_impl.h index fca14c1..b5436f2 100644 --- a/app/src/parser_impl.h +++ b/app/src/parser_impl.h @@ -183,6 +183,7 @@ parser_error_t _readCompactIndex(parser_context_t *c, pd_CompactIndex_t *v); uint16_t _detectAddressType(const parser_context_t *c); parser_error_t _toStringCompactInt(const compactInt_t *c, uint8_t decimalPlaces, + bool trimTrailingZeros, char postfix[], char prefix[], char *outValue, uint16_t outValueLen, diff --git a/app/src/parser_impl_common.c b/app/src/parser_impl_common.c index b6ff8de..91206b5 100644 --- a/app/src/parser_impl_common.c +++ b/app/src/parser_impl_common.c @@ -90,6 +90,8 @@ const char *parser_getErrorDescription(parser_error_t err) { return "Max nested calls reached"; case parser_tx_call_vec_too_large: return "Call vector exceeds limit"; + case parser_junction_limit: + return "Max junctions reached"; default: return "Unrecognized error code"; } @@ -189,6 +191,7 @@ parser_error_t _getValue(const compactInt_t *c, uint64_t *v) { parser_error_t _toStringCompactInt(const compactInt_t *c, uint8_t decimalPlaces, + bool trimTrailingZeros, char postfix[], char prefix[], char *outValue, uint16_t outValueLen, @@ -223,6 +226,10 @@ parser_error_t _toStringCompactInt(const compactInt_t *c, return parser_unexpected_buffer_end; } + if(trimTrailingZeros) { + number_inplace_trimming(bufferUI, 1); + } + pageString(outValue, outValueLen, bufferUI, pageIdx, pageCount); return parser_ok; @@ -293,7 +300,7 @@ parser_error_t _readCompactBalance(parser_context_t *c, pd_CompactBalance_t *v) parser_error_t _toStringCompactIndex(const pd_CompactIndex_t *v, char *outValue, uint16_t outValueLen, uint8_t pageIdx, uint8_t *pageCount) { - return _toStringCompactInt(&v->index, 0, "", "", outValue, outValueLen, pageIdx, pageCount); + return _toStringCompactInt(&v->index, 0, false, "", "", outValue, outValueLen, pageIdx, pageCount); } parser_error_t _toStringCompactBalance(const pd_CompactBalance_t *v, @@ -301,9 +308,8 @@ parser_error_t _toStringCompactBalance(const pd_CompactBalance_t *v, uint8_t pageIdx, uint8_t *pageCount) { CHECK_ERROR(_toStringCompactInt( &v->value, - COIN_AMOUNT_DECIMAL_PLACES, "", COIN_TICKER, + COIN_AMOUNT_DECIMAL_PLACES, true, "", COIN_TICKER, outValue, outValueLen, pageIdx, pageCount)) - number_inplace_trimming(outValue, 1); return parser_ok; } diff --git a/app/src/substrate/substrate_types.c b/app/src/substrate/substrate_types.c index 633a166..92e6e4f 100644 --- a/app/src/substrate/substrate_types.c +++ b/app/src/substrate/substrate_types.c @@ -305,7 +305,7 @@ parser_error_t _toStringCompactu32( uint8_t pageIdx, uint8_t* pageCount) { - return _toStringCompactInt(v, 0, "", "", outValue, outValueLen, pageIdx, pageCount); + return _toStringCompactInt(v, 0, false, "", "", outValue, outValueLen, pageIdx, pageCount); } parser_error_t _toStringCompactu64( @@ -315,7 +315,7 @@ parser_error_t _toStringCompactu64( uint8_t pageIdx, uint8_t* pageCount) { - return _toStringCompactInt(v, 0, "", "", outValue, outValueLen, pageIdx, pageCount); + return _toStringCompactInt(v, 0, false, "", "", outValue, outValueLen, pageIdx, pageCount); } /////////////////////////////////// diff --git a/app/src/substrate/substrate_types_V1.c b/app/src/substrate/substrate_types_V1.c index e090faa..e3b5e11 100644 --- a/app/src/substrate/substrate_types_V1.c +++ b/app/src/substrate/substrate_types_V1.c @@ -312,7 +312,7 @@ parser_error_t _toStringCompactAccountIndex_V1( uint8_t pageIdx, uint8_t* pageCount) { - return _toStringCompactInt(&v->value, 0, "", "", outValue, outValueLen, pageIdx, pageCount); + return _toStringCompactInt(&v->value, 0, false, "", "", outValue, outValueLen, pageIdx, pageCount); } parser_error_t _toStringDestroyWitness_V1( From 4fc7818c7cb9307480a5181396783528c3fc710a Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Sun, 26 Jun 2022 10:00:42 +0200 Subject: [PATCH 3/5] remove unused code --- app/src/common/parser_common.h | 1 + app/src/substrate/substrate_coin.h | 1 - app/src/substrate/substrate_functions.h | 16 -- app/src/substrate/substrate_functions_V1.h | 88 ---------- app/src/substrate/substrate_types.c | 29 ---- app/src/substrate/substrate_types.h | 11 -- app/src/substrate/substrate_types_V1.c | 186 --------------------- app/src/substrate/substrate_types_V1.h | 55 ------ 8 files changed, 1 insertion(+), 386 deletions(-) diff --git a/app/src/common/parser_common.h b/app/src/common/parser_common.h index c4d6cb2..db95ac3 100644 --- a/app/src/common/parser_common.h +++ b/app/src/common/parser_common.h @@ -53,6 +53,7 @@ typedef enum { parser_tx_nesting_not_supported, parser_tx_nesting_limit_reached, parser_tx_call_vec_too_large, + parser_junction_limit, } parser_error_t; typedef struct { diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h index 35400d9..17c1880 100644 --- a/app/src/substrate/substrate_coin.h +++ b/app/src/substrate/substrate_coin.h @@ -63,7 +63,6 @@ typedef enum { #define MENU_MAIN_APP_LINE1 "Nodle" #define MENU_MAIN_APP_LINE2 "Ready" -#define MENU_MAIN_APP_LINE2_SECRET "NODL RECOVERY" #define APPVERSION_LINE1 "Nodle" #define APPVERSION_LINE2 "v" APPVERSION diff --git a/app/src/substrate/substrate_functions.h b/app/src/substrate/substrate_functions.h index e02fb96..11451ad 100644 --- a/app/src/substrate/substrate_functions.h +++ b/app/src/substrate/substrate_functions.h @@ -37,13 +37,11 @@ parser_error_t _readCallImpl(parser_context_t* c, pd_Call_t* v, pd_MethodNested_ parser_error_t _readBalance(parser_context_t* c, pd_Balance_t* v); parser_error_t _readBytes(parser_context_t* c, pd_Bytes_t* v); parser_error_t _readCall(parser_context_t* c, pd_Call_t* v); -parser_error_t _readHeader(parser_context_t* c, pd_Header_t* v); parser_error_t _readBalanceOf(parser_context_t* c, pd_BalanceOf_t* v); parser_error_t _readProposal(parser_context_t* c, pd_Proposal_t* v); parser_error_t _readVecCall(parser_context_t* c, pd_VecCall_t* v); parser_error_t _readH256(parser_context_t* c, pd_H256_t* v); parser_error_t _readHash(parser_context_t* c, pd_Hash_t* v); -parser_error_t _readVecHeader(parser_context_t* c, pd_VecHeader_t* v); parser_error_t _readVecu8(parser_context_t* c, pd_Vecu8_t* v); // Common toString functions @@ -125,13 +123,6 @@ parser_error_t _toStringCall( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringHeader( - const pd_Header_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringBalanceOf( const pd_BalanceOf_t* v, char* outValue, @@ -167,13 +158,6 @@ parser_error_t _toStringHash( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringVecHeader( - const pd_VecHeader_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringVecu8( const pd_Vecu8_t* v, char* outValue, diff --git a/app/src/substrate/substrate_functions_V1.h b/app/src/substrate/substrate_functions_V1.h index 15f9988..5c65c41 100644 --- a/app/src/substrate/substrate_functions_V1.h +++ b/app/src/substrate/substrate_functions_V1.h @@ -28,14 +28,10 @@ extern "C" { // Read functions parser_error_t _readAccountId_V1(parser_context_t* c, pd_AccountId_V1_t* v); parser_error_t _readBoundedVecu8_V1(parser_context_t* c, pd_BoundedVecu8_V1_t* v); -parser_error_t _readBoxCallOrHashOfT_V1(parser_context_t* c, pd_BoxCallOrHashOfT_V1_t* v); -parser_error_t _readBoxPalletsOrigin_V1(parser_context_t* c, pd_BoxPalletsOrigin_V1_t* v); parser_error_t _readClassId_V1(parser_context_t* c, pd_ClassId_V1_t* v); parser_error_t _readCompactAccountIndex_V1(parser_context_t* c, pd_CompactAccountIndex_V1_t* v); parser_error_t _readDestroyWitness_V1(parser_context_t* c, pd_DestroyWitness_V1_t* v); parser_error_t _readInstanceId_V1(parser_context_t* c, pd_InstanceId_V1_t* v); -parser_error_t _readKeyValue_V1(parser_context_t* c, pd_KeyValue_V1_t* v); -parser_error_t _readKey_V1(parser_context_t* c, pd_Key_V1_t* v); parser_error_t _readKeys_V1(parser_context_t* c, pd_Keys_V1_t* v); parser_error_t _readLookupasStaticLookupSource_V1(parser_context_t* c, pd_LookupasStaticLookupSource_V1_t* v); parser_error_t _readMemberCount_V1(parser_context_t* c, pd_MemberCount_V1_t* v); @@ -45,20 +41,13 @@ parser_error_t _readOptionClassId_V1(parser_context_t* c, pd_OptionClassId_V1_t* parser_error_t _readOptionInstanceId_V1(parser_context_t* c, pd_OptionInstanceId_V1_t* v); parser_error_t _readOptionLookupasStaticLookupSource_V1(parser_context_t* c, pd_OptionLookupasStaticLookupSource_V1_t* v); parser_error_t _readOptionTimepoint_V1(parser_context_t* c, pd_OptionTimepoint_V1_t* v); -parser_error_t _readOptionschedulePeriodBlockNumber_V1(parser_context_t* c, pd_OptionschedulePeriodBlockNumber_V1_t* v); -parser_error_t _readParachainInherentData_V1(parser_context_t* c, pd_ParachainInherentData_V1_t* v); parser_error_t _readPerbill_V1(parser_context_t* c, pd_Perbill_V1_t* v); parser_error_t _readTimepoint_V1(parser_context_t* c, pd_Timepoint_V1_t* v); -parser_error_t _readUpwardMessage_V1(parser_context_t* c, pd_UpwardMessage_V1_t* v); parser_error_t _readVecAccountId_V1(parser_context_t* c, pd_VecAccountId_V1_t* v); parser_error_t _readVecInstanceId_V1(parser_context_t* c, pd_VecInstanceId_V1_t* v); -parser_error_t _readVecKeyValue_V1(parser_context_t* c, pd_VecKeyValue_V1_t* v); -parser_error_t _readVecKey_V1(parser_context_t* c, pd_VecKey_V1_t* v); parser_error_t _readVecVestingScheduleOf_V1(parser_context_t* c, pd_VecVestingScheduleOf_V1_t* v); parser_error_t _readVestingScheduleOf_V1(parser_context_t* c, pd_VestingScheduleOf_V1_t* v); parser_error_t _readWeight_V1(parser_context_t* c, pd_Weight_V1_t* v); -parser_error_t _readschedulePeriodBlockNumber_V1(parser_context_t* c, pd_schedulePeriodBlockNumber_V1_t* v); -parser_error_t _readschedulePriority_V1(parser_context_t* c, pd_schedulePriority_V1_t* v); // toString functions parser_error_t _toStringAccountId_V1( @@ -75,20 +64,6 @@ parser_error_t _toStringBoundedVecu8_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringBoxCallOrHashOfT_V1( - const pd_BoxCallOrHashOfT_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - -parser_error_t _toStringBoxPalletsOrigin_V1( - const pd_BoxPalletsOrigin_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringClassId_V1( const pd_ClassId_V1_t* v, char* outValue, @@ -117,20 +92,6 @@ parser_error_t _toStringInstanceId_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringKeyValue_V1( - const pd_KeyValue_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - -parser_error_t _toStringKey_V1( - const pd_Key_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringKeys_V1( const pd_Keys_V1_t* v, char* outValue, @@ -194,20 +155,6 @@ parser_error_t _toStringOptionTimepoint_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringOptionschedulePeriodBlockNumber_V1( - const pd_OptionschedulePeriodBlockNumber_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - -parser_error_t _toStringParachainInherentData_V1( - const pd_ParachainInherentData_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringPerbill_V1( const pd_Perbill_V1_t* v, char* outValue, @@ -222,13 +169,6 @@ parser_error_t _toStringTimepoint_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringUpwardMessage_V1( - const pd_UpwardMessage_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringVecAccountId_V1( const pd_VecAccountId_V1_t* v, char* outValue, @@ -243,20 +183,6 @@ parser_error_t _toStringVecInstanceId_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringVecKeyValue_V1( - const pd_VecKeyValue_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - -parser_error_t _toStringVecKey_V1( - const pd_VecKey_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - parser_error_t _toStringVecVestingScheduleOf_V1( const pd_VecVestingScheduleOf_V1_t* v, char* outValue, @@ -278,20 +204,6 @@ parser_error_t _toStringWeight_V1( uint8_t pageIdx, uint8_t* pageCount); -parser_error_t _toStringschedulePeriodBlockNumber_V1( - const pd_schedulePeriodBlockNumber_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - -parser_error_t _toStringschedulePriority_V1( - const pd_schedulePriority_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount); - #ifdef __cplusplus } #endif diff --git a/app/src/substrate/substrate_types.c b/app/src/substrate/substrate_types.c index 92e6e4f..d4ba7c5 100644 --- a/app/src/substrate/substrate_types.c +++ b/app/src/substrate/substrate_types.c @@ -144,11 +144,6 @@ parser_error_t _readCall(parser_context_t* c, pd_Call_t* v) return parser_ok; } -parser_error_t _readHeader(parser_context_t* c, pd_Header_t* v) -{ - return parser_not_supported; -} - parser_error_t _readBalanceOf(parser_context_t* c, pd_BalanceOf_t* v) { return _readBalance(c, &v->value); @@ -194,10 +189,6 @@ parser_error_t _readHash(parser_context_t* c, pd_Hash_t* v) { GEN_DEF_READARRAY(32) } -parser_error_t _readVecHeader(parser_context_t* c, pd_VecHeader_t* v) { - GEN_DEF_READVECTOR(Header) -} - parser_error_t _readVecu8(parser_context_t* c, pd_Vecu8_t* v) { GEN_DEF_READVECTOR(u8) } @@ -449,17 +440,6 @@ parser_error_t _toStringCall( return parser_display_idx_out_of_range; } -parser_error_t _toStringHeader( - const pd_Header_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - parser_error_t _toStringBalanceOf( const pd_BalanceOf_t* v, char* outValue, @@ -559,15 +539,6 @@ parser_error_t _toStringHash( GEN_DEF_TOSTRING_ARRAY(32) } -parser_error_t _toStringVecHeader( - const pd_VecHeader_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) { - GEN_DEF_TOSTRING_VECTOR(Header) -} - parser_error_t _toStringVecu8( const pd_Vecu8_t* v, char* outValue, diff --git a/app/src/substrate/substrate_types.h b/app/src/substrate/substrate_types.h index 8901341..09e28d7 100644 --- a/app/src/substrate/substrate_types.h +++ b/app/src/substrate/substrate_types.h @@ -95,11 +95,6 @@ typedef struct { pd_NestCallIdx_t nestCallIdx; } pd_Call_t; -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_Header_t; - typedef struct { pd_Balance_t value; } pd_BalanceOf_t; @@ -123,12 +118,6 @@ typedef struct { const uint8_t* _ptr; } pd_Hash_t; -typedef struct { - uint64_t _len; - const uint8_t* _ptr; - uint64_t _lenBuffer; -} pd_VecHeader_t; - typedef struct { uint64_t _len; const uint8_t* _ptr; diff --git a/app/src/substrate/substrate_types_V1.c b/app/src/substrate/substrate_types_V1.c index e3b5e11..920e04f 100644 --- a/app/src/substrate/substrate_types_V1.c +++ b/app/src/substrate/substrate_types_V1.c @@ -32,16 +32,6 @@ parser_error_t _readBoundedVecu8_V1(parser_context_t* c, pd_BoundedVecu8_V1_t* v GEN_DEF_READVECTOR(u8) } -parser_error_t _readBoxCallOrHashOfT_V1(parser_context_t* c, pd_BoxCallOrHashOfT_V1_t* v) -{ - return parser_not_supported; -} - -parser_error_t _readBoxPalletsOrigin_V1(parser_context_t* c, pd_BoxPalletsOrigin_V1_t* v) -{ - return parser_not_supported; -} - parser_error_t _readClassId_V1(parser_context_t* c, pd_ClassId_V1_t* v) { CHECK_INPUT() @@ -69,14 +59,6 @@ parser_error_t _readInstanceId_V1(parser_context_t* c, pd_InstanceId_V1_t* v) return parser_ok; } -parser_error_t _readKeyValue_V1(parser_context_t* c, pd_KeyValue_V1_t* v) { - GEN_DEF_READARRAY(32) -} - -parser_error_t _readKey_V1(parser_context_t* c, pd_Key_V1_t* v) { - GEN_DEF_READARRAY(32) -} - parser_error_t _readKeys_V1(parser_context_t* c, pd_Keys_V1_t* v) { GEN_DEF_READARRAY(32) } @@ -123,11 +105,6 @@ parser_error_t _readOpaqueCall_V1(parser_context_t* c, pd_OpaqueCall_V1_t* v) return _readCall(c, &v->call); } -parser_error_t _readParachainInherentData_V1(parser_context_t* c, pd_ParachainInherentData_V1_t* v) -{ - return parser_not_supported; -} - parser_error_t _readPerbill_V1(parser_context_t* c, pd_Perbill_V1_t* v) { CHECK_INPUT() @@ -142,11 +119,6 @@ parser_error_t _readTimepoint_V1(parser_context_t* c, pd_Timepoint_V1_t* v) return parser_ok; } -parser_error_t _readUpwardMessage_V1(parser_context_t* c, pd_UpwardMessage_V1_t* v) -{ - return parser_not_supported; -} - parser_error_t _readVestingScheduleOf_V1(parser_context_t* c, pd_VestingScheduleOf_V1_t* v) { CHECK_INPUT() @@ -164,16 +136,6 @@ parser_error_t _readWeight_V1(parser_context_t* c, pd_Weight_V1_t* v) return parser_ok; } -parser_error_t _readschedulePeriodBlockNumber_V1(parser_context_t* c, pd_schedulePeriodBlockNumber_V1_t* v) -{ - return parser_not_supported; -} - -parser_error_t _readschedulePriority_V1(parser_context_t* c, pd_schedulePriority_V1_t* v) -{ - return parser_not_supported; -} - parser_error_t _readVecAccountId_V1(parser_context_t* c, pd_VecAccountId_V1_t* v) { GEN_DEF_READVECTOR(AccountId_V1) } @@ -182,14 +144,6 @@ parser_error_t _readVecInstanceId_V1(parser_context_t* c, pd_VecInstanceId_V1_t* GEN_DEF_READVECTOR(InstanceId_V1) } -parser_error_t _readVecKeyValue_V1(parser_context_t* c, pd_VecKeyValue_V1_t* v) { - GEN_DEF_READVECTOR(KeyValue_V1) -} - -parser_error_t _readVecKey_V1(parser_context_t* c, pd_VecKey_V1_t* v) { - GEN_DEF_READVECTOR(Key_V1) -} - parser_error_t _readVecVestingScheduleOf_V1(parser_context_t* c, pd_VecVestingScheduleOf_V1_t* v) { GEN_DEF_READVECTOR(VestingScheduleOf_V1) } @@ -239,15 +193,6 @@ parser_error_t _readOptionTimepoint_V1(parser_context_t* c, pd_OptionTimepoint_V return parser_ok; } -parser_error_t _readOptionschedulePeriodBlockNumber_V1(parser_context_t* c, pd_OptionschedulePeriodBlockNumber_V1_t* v) -{ - CHECK_ERROR(_readUInt8(c, &v->some)) - if (v->some > 0) { - CHECK_ERROR(_readschedulePeriodBlockNumber_V1(c, &v->contained)) - } - return parser_ok; -} - /////////////////////////////////// /////////////////////////////////// /////////////////////////////////// @@ -271,28 +216,6 @@ parser_error_t _toStringBoundedVecu8_V1( GEN_DEF_TOSTRING_VECTOR(u8) } -parser_error_t _toStringBoxCallOrHashOfT_V1( - const pd_BoxCallOrHashOfT_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - -parser_error_t _toStringBoxPalletsOrigin_V1( - const pd_BoxPalletsOrigin_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - parser_error_t _toStringClassId_V1( const pd_ClassId_V1_t* v, char* outValue, @@ -371,30 +294,6 @@ parser_error_t _toStringInstanceId_V1( return parser_ok; } -parser_error_t _toStringKeyValue_V1( - const pd_KeyValue_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - - return parser_print_not_supported; -} - -parser_error_t _toStringKey_V1( - const pd_Key_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - - return parser_print_not_supported; -} - parser_error_t _toStringKeys_V1( const pd_Keys_V1_t* v, char* outValue, @@ -457,17 +356,6 @@ parser_error_t _toStringOpaqueCall_V1( return _toStringCall(&v->call, outValue, outValueLen, pageIdx, pageCount); } -parser_error_t _toStringParachainInherentData_V1( - const pd_ParachainInherentData_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - parser_error_t _toStringPerbill_V1( const pd_Perbill_V1_t* v, char* outValue, @@ -528,17 +416,6 @@ parser_error_t _toStringTimepoint_V1( return parser_display_idx_out_of_range; } -parser_error_t _toStringUpwardMessage_V1( - const pd_UpwardMessage_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - parser_error_t _toStringVestingScheduleOf_V1( const pd_VestingScheduleOf_V1_t* v, char* outValue, @@ -600,28 +477,6 @@ parser_error_t _toStringWeight_V1( return _toStringu64(&v->value, outValue, outValueLen, pageIdx, pageCount); } -parser_error_t _toStringschedulePeriodBlockNumber_V1( - const pd_schedulePeriodBlockNumber_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - -parser_error_t _toStringschedulePriority_V1( - const pd_schedulePriority_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - return parser_print_not_supported; -} - parser_error_t _toStringVecAccountId_V1( const pd_VecAccountId_V1_t* v, char* outValue, @@ -642,26 +497,6 @@ parser_error_t _toStringVecInstanceId_V1( GEN_DEF_TOSTRING_VECTOR(InstanceId_V1); } -parser_error_t _toStringVecKeyValue_V1( - const pd_VecKeyValue_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - GEN_DEF_TOSTRING_VECTOR(KeyValue_V1); -} - -parser_error_t _toStringVecKey_V1( - const pd_VecKey_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - GEN_DEF_TOSTRING_VECTOR(Key_V1); -} - parser_error_t _toStringVecVestingScheduleOf_V1( const pd_VecVestingScheduleOf_V1_t* v, char* outValue, @@ -776,24 +611,3 @@ parser_error_t _toStringOptionTimepoint_V1( } return parser_ok; } - -parser_error_t _toStringOptionschedulePeriodBlockNumber_V1( - const pd_OptionschedulePeriodBlockNumber_V1_t* v, - char* outValue, - uint16_t outValueLen, - uint8_t pageIdx, - uint8_t* pageCount) -{ - CLEAN_AND_CHECK() - - *pageCount = 1; - if (v->some > 0) { - CHECK_ERROR(_toStringschedulePeriodBlockNumber_V1( - &v->contained, - outValue, outValueLen, - pageIdx, pageCount)); - } else { - snprintf(outValue, outValueLen, "None"); - } - return parser_ok; -} diff --git a/app/src/substrate/substrate_types_V1.h b/app/src/substrate/substrate_types_V1.h index 68ccb2c..fc25f54 100644 --- a/app/src/substrate/substrate_types_V1.h +++ b/app/src/substrate/substrate_types_V1.h @@ -42,14 +42,6 @@ typedef struct { uint32_t value; } pd_InstanceId_V1_t; -typedef struct { - const uint8_t* _ptr; -} pd_KeyValue_V1_t; - -typedef struct { - const uint8_t* _ptr; -} pd_Key_V1_t; - typedef struct { uint8_t value; union { @@ -72,11 +64,6 @@ typedef struct { pd_Balance_t balance; } pd_VestingScheduleOf_V1_t; -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_schedulePeriodBlockNumber_V1_t; - typedef struct { pd_Compactu32_t accounts; pd_Compactu32_t sufficients; @@ -109,16 +96,6 @@ typedef struct { const uint8_t* _ptr; } pd_BoundedVecu8_V1_t; -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_BoxCallOrHashOfT_V1_t; - -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_BoxPalletsOrigin_V1_t; - typedef struct { const uint8_t* _ptr; } pd_Keys_V1_t; @@ -142,25 +119,10 @@ typedef struct { pd_InstanceId_V1_t contained; } pd_OptionInstanceId_V1_t; -typedef struct { - uint8_t some; - pd_schedulePeriodBlockNumber_V1_t contained; -} pd_OptionschedulePeriodBlockNumber_V1_t; - -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_ParachainInherentData_V1_t; - typedef struct { uint32_t value; } pd_Perbill_V1_t; -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_UpwardMessage_V1_t; - typedef struct { uint64_t _len; const uint8_t* _ptr; @@ -173,27 +135,10 @@ typedef struct { uint64_t _lenBuffer; } pd_VecInstanceId_V1_t; -typedef struct { - uint64_t _len; - const uint8_t* _ptr; - uint64_t _lenBuffer; -} pd_VecKeyValue_V1_t; - -typedef struct { - uint64_t _len; - const uint8_t* _ptr; - uint64_t _lenBuffer; -} pd_VecKey_V1_t; - typedef struct { uint64_t value; } pd_Weight_V1_t; -typedef struct { - // TODO: Not implemented - uint8_t _NOT_IMPLEMENTED__DO_NOT_USE; -} pd_schedulePriority_V1_t; - #ifdef __cplusplus } #endif From 041ad27ec5ed5d7f504ba15847c40abcea2b705c Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Sun, 26 Jun 2022 10:00:54 +0200 Subject: [PATCH 4/5] small makefile changes --- app/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Makefile b/app/Makefile index f7bd068..161548b 100755 --- a/app/Makefile +++ b/app/Makefile @@ -27,8 +27,8 @@ all: bin/app.elf @echo "APPNAME=\"${APPNAME}\"" >> $(OUTPUT_INSTALLER) @echo "APPVERSION=\"${APPVERSION}\"" >> $(OUTPUT_INSTALLER) @echo "APPPATH=\""${APPPATH}"\"" >> $(OUTPUT_INSTALLER) - @echo "LOAD_PARAMS=\"${APP_LOAD_PARAMS}\"" >> $(OUTPUT_INSTALLER) - @echo "DELETE_PARAMS=\"${APP_DELETE_PARAMS}\"" >> $(OUTPUT_INSTALLER) + @echo "LOAD_PARAMS=($$(echo "${APP_LOAD_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER) + @echo "DELETE_PARAMS=($$(echo "${COMMON_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER) @echo "APPHEX=\"" >> $(OUTPUT_INSTALLER) @cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER) @echo "\"" >> $(OUTPUT_INSTALLER) @@ -95,8 +95,7 @@ endef $(error "$(error_message)") endif -APP_LOAD_PARAMS = --curve ed25519 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH) -APP_DELETE_PARAMS = $(COMMON_DELETE_PARAMS) +APP_LOAD_PARAMS = --curve ed25519 $(COMMON_LOAD_PARAMS) --path $(APPPATH) ifeq ($(TARGET_NAME),TARGET_NANOS) APP_LOAD_PARAMS += --appFlags 0x000 From 8767e8d65c46e074cff43d457fc34e17a19489a5 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Sun, 26 Jun 2022 10:05:18 +0200 Subject: [PATCH 5/5] update tests --- app/Makefile.version | 2 +- tests/printing_compact.cpp | 2 +- tests_tools/Cargo.lock | 130 ++--- tests_tools/neon/native/Cargo.lock | 137 ----- tests_tools/neon/native/Cargo.toml | 4 +- tests_tools/neon/package.json | 2 +- tests_tools/neon/yarn.lock | 578 --------------------- tests_zemu/package.json | 4 +- tests_zemu/snapshots/s-mainmenu/00005.png | Bin 397 -> 399 bytes tests_zemu/snapshots/s-mainmenu/00011.png | Bin 397 -> 399 bytes tests_zemu/snapshots/sp-mainmenu/00005.png | Bin 335 -> 335 bytes tests_zemu/snapshots/sp-mainmenu/00011.png | Bin 335 -> 335 bytes tests_zemu/snapshots/x-mainmenu/00005.png | Bin 335 -> 335 bytes tests_zemu/snapshots/x-mainmenu/00011.png | Bin 335 -> 335 bytes yarn.lock | 4 - 15 files changed, 75 insertions(+), 788 deletions(-) delete mode 100644 tests_tools/neon/native/Cargo.lock delete mode 100644 tests_tools/neon/yarn.lock delete mode 100644 yarn.lock diff --git a/app/Makefile.version b/app/Makefile.version index 164c72d..9181b6d 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -3,4 +3,4 @@ APPVERSION_M=1 # This is the `spec_version` field of `Runtime` APPVERSION_N=10 # This is the patch version of this release -APPVERSION_P=0 +APPVERSION_P=1 diff --git a/tests/printing_compact.cpp b/tests/printing_compact.cpp index 81bc626..9aef31a 100644 --- a/tests/printing_compact.cpp +++ b/tests/printing_compact.cpp @@ -96,7 +96,7 @@ TEST_P(CompactPrintTests, CompactPrinting) { char tmpOut[100]; char prefix[0]; uint8_t dummy; - err = _toStringCompactInt(&cvalue, GetParam().decimals, 0, prefix, tmpOut, 100, 0, &dummy); + err = _toStringCompactInt(&cvalue, GetParam().decimals, false, 0, prefix, tmpOut, 100, 0, &dummy); EXPECT_EQ(err, parser_ok) << parser_getErrorDescription(err); EXPECT_EQ(std::string(tmpOut), GetParam().expected); diff --git a/tests_tools/Cargo.lock b/tests_tools/Cargo.lock index f6c985a..89f3cb0 100644 --- a/tests_tools/Cargo.lock +++ b/tests_tools/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -19,9 +19,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "block-buffer" @@ -40,9 +40,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cfg-if" @@ -52,9 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", "libc", @@ -104,21 +104,21 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "libc" -version = "0.2.104" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "memchr" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "merlin" @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "neon" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544694d02bbff81f78dba5ef7d29341cc6d256edcae4fbb2d684491d5755c748" +checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" dependencies = [ "neon-build", "neon-runtime", @@ -146,18 +146,18 @@ dependencies = [ [[package]] name = "neon-build" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4ec682b1a7837c84d9866c342ac6ffe2ce9712e844e4015f31d01bdeb73608" +checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" dependencies = [ "neon-sys", ] [[package]] name = "neon-runtime" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4b1a7f8f569b4e43feff04931924cebe40a630fa258d2a28147525d247defe" +checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" dependencies = [ "cfg-if", "neon-sys", @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "neon-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c376c75ccf632a20d2f18fd2bde0b10f36a9cc5c8c7c4921f629147ebf59aeb6" +checksum = "a5ebc923308ac557184455b4aaa749470554cbac70eb4daa8b18cdc16bef7df6" dependencies = [ "cc", "regex", @@ -182,36 +182,36 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom", ] [[package]] name = "regex" -version = "1.4.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" [[package]] name = "schnorrkel" @@ -258,24 +258,24 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", "cfg-if", @@ -286,9 +286,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" [[package]] name = "subtle-ng" @@ -298,20 +298,20 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.69" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -330,42 +330,48 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-ident" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "zeroize" -version = "1.4.2" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.0.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", diff --git a/tests_tools/neon/native/Cargo.lock b/tests_tools/neon/native/Cargo.lock deleted file mode 100644 index 6eb1204..0000000 --- a/tests_tools/neon/native/Cargo.lock +++ /dev/null @@ -1,137 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cslice" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697c714f50560202b1f4e2e09cd50a421881c83e9025db75d15f276616f04f40" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "neon" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cac4691701b686e6c07b2eb5b51a9f26f5c11179c5d7924b78100dd387fc99d" -dependencies = [ - "cslice", - "neon-build", - "neon-runtime", - "semver", -] - -[[package]] -name = "neon-build" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ed332afd4711b84f4f83d334428a1fd9ce53620b62b87595934297c5ede2ed" -dependencies = [ - "cfg-if", - "neon-sys", -] - -[[package]] -name = "neon-runtime" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2beea093a60c08463f65e1da4cda68149986f60d8d2177489b44589463c782a6" -dependencies = [ - "cfg-if", - "neon-sys", -] - -[[package]] -name = "neon-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a6c1ba6b926746f4d3f596de18ce49d062d78fd9f35f636080232aa77a0e16" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", -] - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "zcashlib" -version = "0.1.0" - -[[package]] -name = "zcashtool" -version = "0.1.0" -dependencies = [ - "neon", - "neon-build", - "zcashlib", -] diff --git a/tests_tools/neon/native/Cargo.toml b/tests_tools/neon/native/Cargo.toml index ef3cc94..86d6536 100644 --- a/tests_tools/neon/native/Cargo.toml +++ b/tests_tools/neon/native/Cargo.toml @@ -12,8 +12,8 @@ name = "teststools" crate-type = ["cdylib"] [build-dependencies] -neon-build = "0.10.0" +neon-build = "0.10.1" [dependencies] -neon = "0.10.0" +neon = "0.10.1" schnorrkel = "0.10.2" diff --git a/tests_tools/neon/package.json b/tests_tools/neon/package.json index a81115c..2af1400 100644 --- a/tests_tools/neon/package.json +++ b/tests_tools/neon/package.json @@ -7,7 +7,7 @@ "license": "Apache-2.0", "private": true, "dependencies": { - "neon-cli": "0.10.0" + "neon-cli": "^0.10.1" }, "scripts": { "install": "node_modules/.bin/neon build", diff --git a/tests_tools/neon/yarn.lock b/tests_tools/neon/yarn.lock deleted file mode 100644 index afb18d3..0000000 --- a/tests_tools/neon/yarn.lock +++ /dev/null @@ -1,578 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -array-back@^3.0.1, array-back@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" - integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== - -array-back@^4.0.1, array-back@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e" - integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -builtins@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" - integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== - -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -command-line-args@^5.1.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e" - integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg== - dependencies: - array-back "^3.1.0" - find-replace "^3.0.0" - lodash.camelcase "^4.3.0" - typical "^4.0.0" - -command-line-commands@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/command-line-commands/-/command-line-commands-3.0.2.tgz#53872a1181db837f21906b1228e260a4eeb42ee4" - integrity sha512-ac6PdCtdR6q7S3HN+JiVLIWGHY30PRYIEl2qPo+FuEuzwAUk0UYyimrngrg7FvF/mCr4Jgoqv5ZnHZgads50rw== - dependencies: - array-back "^4.0.1" - -command-line-usage@^6.1.0: - version "6.1.3" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.3.tgz#428fa5acde6a838779dfa30e44686f4b6761d957" - integrity sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw== - dependencies: - array-back "^4.0.2" - chalk "^2.4.2" - table-layout "^1.0.2" - typical "^5.2.0" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -deep-extend@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -find-replace@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" - integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== - dependencies: - array-back "^3.0.1" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -git-config@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/git-config/-/git-config-0.0.7.tgz#a9c8a3ef07a776c3d72261356d8b727b62202b28" - integrity sha512-LidZlYZXWzVjS+M3TEwhtYBaYwLeOZrXci1tBgqp/vDdZTBMl02atvwb6G35L64ibscYoPnxfbwwUS+VZAISLA== - dependencies: - iniparser "~1.0.5" - -glob@^7.1.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -handlebars@^4.7.6: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -iconv-lite@^0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -iniparser@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/iniparser/-/iniparser-1.0.5.tgz#836d6befe6dfbfcee0bccf1cf9f2acc7027f783d" - integrity sha512-i40MWqgTU6h/70NtMsDVVDLjDYWwcIR1yIEVDPfxZIJno9z9L4s83p/V7vAu2i48Vj0gpByrkGFub7ko9XvPrw== - -inquirer@^7.3.3: - version "7.3.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" - integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.19" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== - -lodash@^4.17.19: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -make-promises-safe@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/make-promises-safe/-/make-promises-safe-5.1.0.tgz#dd9d311f555bcaa144f12e225b3d37785f0aa8f2" - integrity sha512-AfdZ49rtyhQR/6cqVKGoH7y4ql7XkS5HJI1lZm0/5N6CQosy1eYbBJ/qbhkKHzo17UH7M918Bysf6XB9f3kS1g== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.2.5: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== - -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -neon-cli@0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/neon-cli/-/neon-cli-0.10.0.tgz#b588fceb0d5c0a5c1b140381f38511fc3be5f431" - integrity sha512-eiyn+XDlZEauVcPZkGSW+Iw2RwidrEoPrW0LfLntOkUecLHZgfm9dOainQI074ZMi75825VV/GCSTrv4J70TpA== - dependencies: - chalk "^4.1.0" - command-line-args "^5.1.1" - command-line-commands "^3.0.1" - command-line-usage "^6.1.0" - git-config "0.0.7" - handlebars "^4.7.6" - inquirer "^7.3.3" - make-promises-safe "^5.1.0" - rimraf "^3.0.2" - semver "^7.3.2" - toml "^3.0.0" - ts-typed-json "^0.3.2" - validate-npm-package-license "^3.0.4" - validate-npm-package-name "^3.0.0" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -reduce-flatten@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" - integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - -rxjs@^6.6.0: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -semver@^7.3.2: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - -signal-exit@^3.0.2: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.11" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" - integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== - -string-width@^4.1.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -table-layout@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" - integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== - dependencies: - array-back "^4.0.1" - deep-extend "~0.6.0" - typical "^5.2.0" - wordwrapjs "^4.0.0" - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -toml@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" - integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== - -ts-typed-json@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/ts-typed-json/-/ts-typed-json-0.3.2.tgz#f4f20f45950bae0a383857f7b0a94187eca1b56a" - integrity sha512-Tdu3BWzaer7R5RvBIJcg9r8HrTZgpJmsX+1meXMJzYypbkj8NK2oJN0yvm4Dp/Iv6tzFa/L5jKRmEVTga6K3nA== - -tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -typical@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" - integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== - -typical@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" - integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== - -uglify-js@^3.1.4: - version "3.15.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.5.tgz#2b10f9e0bfb3f5c15a8e8404393b6361eaeb33b3" - integrity sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ== - -validate-npm-package-license@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -validate-npm-package-name@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" - integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= - dependencies: - builtins "^1.0.3" - -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - -wordwrapjs@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f" - integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA== - dependencies: - reduce-flatten "^2.0.0" - typical "^5.2.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/tests_zemu/package.json b/tests_zemu/package.json index aa29b3f..fce8c82 100644 --- a/tests_zemu/package.json +++ b/tests_zemu/package.json @@ -18,8 +18,8 @@ "testSR25519": "jest --runInBand tests/sr25519.test.ts" }, "dependencies": { - "@zondax/ledger-substrate": "^0.30.0", - "@zondax/zemu": "^0.30.0" + "@zondax/ledger-substrate": "^0.31.0", + "@zondax/zemu": "^0.32.0" }, "devDependencies": { "@types/jest": "^27.0.1", diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png index d4aa5c35dfebc2a72061f95172f2c4627a8ef78a..a06dfd52c5fe75122d0c7ba6f2adab9cc8815734 100644 GIT binary patch delta 372 zcmV-)0gL{P1CIlcB!5;(L_t(|ob8#x5`!QNM6px<|ARf)1Je`}3V|pkb>H+*tw?7{ z)(}Gg003}TmO=CE+k3+Ga~QvC2DXm!!{gU~;O;y}Pq=TH5N7$oP8M!OxJ`=*GC-P4 zP`C|Uzy^9_Yz8cA*tdgNQaFv2Y@Iwa+=9-)+*GXGPj9VZ*MPw%#AfuknG^vm9|3=PNbXCx$=2Pf8u%9%|A8#GguAT6S z&Edk*W<4-1|7|T#scC30L;GT!^?%3^3qv|)aY*|DRJD_&8IuNbq3fV&NZ5x=fNlZg z!#R5%w4=^|Y}X8!X?X}+6i?p-XkN4E@mBUQCU_&JB&~mfW5odg0000$2;l`SIHBZR Si1pC`0000~)ag0f`g`E=|LEUqCYH{!!+iG-csrlo58T#B3bXoP7ZbN4%$CIf6(CK< zDcptzu!+{_TLIJJwsj|#6iy>0i<4!#ThO_fbsnPGf_z5PD}M`)C0riziX`5^nf8LUxwD@IP3qAAtt80gYp1mwUdMu6Xt26>!4{!JOW(+qQx$+ zgL2dr5bc_QW=j5qTNDpZ0yM`gdW;_w4{#!;BwXIOH+*tw?7{ z)(}Gg003}TmO=CE+k3+Ga~QvC2DXm!!{gU~;O;y}Pq=TH5N7$oP8M!OxJ`=*GC-P4 zP`C|Uzy^9_Yz8cA*tdgNQaFv2Y@Iwa+=9-)+*GXGPj9VZ*MPw%#AfuknG^vm9|3=PNbXCx$=2Pf8u%9%|A8#GguAT6S z&Edk*W<4-1|7|T#scC30L;GT!^?%3^3qv|)aY*|DRJD_&8IuNbq3fV&NZ5x=fNlZg z!#R5%w4=^|Y}X8!X?X}+6i?p-XkN4E@mBUQCU_&JB&~mfW5odg0000$2;l`SIHBZR Si1pC`0000~)ag0f`g`E=|LEUqCYH{!!+iG-csrlo58T#B3bXoP7ZbN4%$CIf6(CK< zDcptzu!+{_TLIJJwsj|#6iy>0i<4!#ThO_fbsnPGf_z5PD}M`)C0riziX`5^nf8LUxwD@IP3qAAtt80gYp1mwUdMu6Xt26>!4{!JOW(+qQx$+ zgL2dr5bc_QW=j5qTNDpZ0yM`gdW;_w4{#!;BwXIO(^b z00000;7@$49zd^@QX4tv_OrInym&UEBPN@>5<``EFZ^PmmcO= z4cTVk##@tvheR_)%NCD^uH7+0q-OMi^V#QZdK?d y^(Q@X2FwpW>m^#V>AQfedT+&is?g5-CrHrp|H$S>BCy#3FXw%}8 zX24iv(n7Uq9l9HX2s#6D&ZU&U!5Ra%63Q-50R>IK(?zR1O@G`H)P-z}V5=(Y4+*GG zK-j68PL`OLmA!T7YT6bT1K2*kJ2(xp=)cWDs73$H0000(^b z00000;7@$49zd^@QX4tv_OrInym&UEBPN@>5<``EFZ^PmmcO= z4cTVk##@tvheR_)%NCD^uH7+0q-OMi^V#QZdK?d y^(Q@X2FwpW>m^#V>AQfedT+&is?g5-CrHrp|H$S>BCy#3FXw%}8 zX24iv(n7Uq9l9HX2s#6D&ZU&U!5Ra%63Q-50R>IK(?zR1O@G`H)P-z}V5=(Y4+*GG zK-j68PL`OLmA!T7YT6bT1K2*kJ2(xp=)cWDs73$H0000(^b z00000;7@$49zd^@QX4tv_OrInym&UEBPN@>5<``EFZ^PmmcO= z4cTVk##@tvheR_)%NCD^uH7+0q-OMi^V#QZdK?d y^(Q@X2FwpW>m^#V>AQfedT+&is?g5-CrHrp|H$S>BCy#3FXw%}8 zX24iv(n7Uq9l9HX2s#6D&ZU&U!5Ra%63Q-50R>IK(?zR1O@G`H)P-z}V5=(Y4+*GG zK-j68PL`OLmA!T7YT6bT1K2*kJ2(xp=)cWDs73$H0000(^b z00000;7@$49zd^@QX4tv_OrInym&UEBPN@>5<``EFZ^PmmcO= z4cTVk##@tvheR_)%NCD^uH7+0q-OMi^V#QZdK?d y^(Q@X2FwpW>m^#V>AQfedT+&is?g5-CrHrp|H$S>BCy#3FXw%}8 zX24iv(n7Uq9l9HX2s#6D&ZU&U!5Ra%63Q-50R>IK(?zR1O@G`H)P-z}V5=(Y4+*GG zK-j68PL`OLmA!T7YT6bT1K2*kJ2(xp=)cWDs73$H0000