Include the memo section hash in the signature if its there. Updated …

…the signing test vectors.

app/src/crypto.c

@@ -370,7 +370,15 @@ zxerr_t crypto_sign(const parser_tx_t *txObj, uint8_t *output, uint16_t outputLe
     CHECK_ZXERR(crypto_hashDataSection(data, dataHash, HASH_LEN))
     section_hashes.hashesLen += 2;
     signature_section.hashes.hashesLen += 2;
-
+    // Include the memo seection hash in the siggnature if it's there
+    if (txObj->transaction.header.memoSection) {
+      const section_t *memo = txObj->transaction.header.memoSection;
+      uint8_t *memoHash = section_hashes.hashes.ptr + (section_hashes.hashesLen * HASH_LEN);
+      section_hashes.indices.ptr[section_hashes.hashesLen] = memo->idx;
+      CHECK_ZXERR(crypto_hashExtraDataSection(memo, memoHash, HASH_LEN))
+        section_hashes.hashesLen++;
+      signature_section.hashes.hashesLen++;
+    }
 
     // Hash the eligible signature sections
     for (uint32_t i = 0; i < txObj->transaction.sections.signaturesLen; i++) {

tests_zemu/tests/transactions.test.ts

@@ -63,34 +63,37 @@ function hashSignatureSec(pubkeys: Buffer[], salt: Buffer, hashes: { [index: num
 const TEST_DATA = [
   {
     name: 'bond',
-    blob: Buffer.from('150000005552355f5f325a61455f6e36326a4f54655973355f00260000002d3234333338352d30362d33305430343a34353a35302e3537313637353535362b30303a30306692c99f5c20a9b2031889db018bb6459e8c42203dafa62f8c019a9c4e4dbc62e6a825ebd04018efadd3d85c7b7c6055010ada9d12974a937ad34d7493c63445686829c655a91165cb9e70971ef887843ee5c0b31369141ac9ade456711a6cee01d1429a3798de6d23000000000000000000000000000000000000000000000000050031d10fd973261dd8a45ab446bf1912375ab85bda0062ca77b4ae3a84b582b6dcc2e385156de8d3b03a52c87f0c3a29beef54fb85b1eef44352e2f12d063e99624b3e2b151a016b13c950778aab52516b28c3bbd38ac0529bdcafd523de0339fb11e39afb9387020000000092fe73788d0100004b0000000007e0c2092d7266a53044324f00cdebb6fe3918c697a5727b3e091c240000000000000000000000000000000000000000000000000100bdb3ae7d368aace8b84940aa7dcdef116e06bfde0292fe73788d01000000e30fedce40816e3afc87c1b4a7c97b3e0c6b4627310d37d00d04cf87a6629653010c00000074785f626f6e642e7761736d', 'hex'),
+    blob: Buffer.from('1c000000487a6f3561336132425f7157536e38355f5633535f523344525a615201260000002d3139383037392d30352d30355430343a30383a33352e3534343439313338372b30303a3030260000002d3233303230372d30372d33305430393a34363a30322e3239353031313835372b30303a3030b07a2c8b9950891d8d111f996d967d197b0fcaffe7b98f575e376194db3decebbe8094a1bf7bc67990ded99bf393e16e32d9da1ed390a21fcaaaaaa12012ec4ecf355f31cdb67a1cb422fe1bc207fc6a115aa1cb1ea5d9b63965d00e4050bd05017765a698290335060000000000000000000000000000000000000000000000005e00b20a1d252c58940835ba2ff13b3b0c491ae1c54900b31b654514b84e5b848df597e22abf59e3af4486cc44a878f4077270ef5ec1bebb5e7438d64ab4b9313945816213757201191ff6ae3302feda897597e4191ed63ce80aa62a544c27166cea37c5a0f96d040300000000999076898d0100003600000000e36306bc9ac083113ec3243c0de592a1b2820da312fe7e79580269820000000000000000000000000000000000000000000000000002999076898d01000000d4cbc63df8aeba10f111a5032f9312b8ad135b6ed8253bfbc57fce1a7100ccd3010c00000074785f626f6e642e7761736d0155d119d551037ef800dd6b82ec19979eddd4549371af61bdf20442c455c04da2b5a76c1105fc898ea600', 'hex'),
     sectionHashes: {
-      0: Buffer.from('c32ffdff6163484fe5feb04a6c8f747a4052c21945dcc7f12ca466868c4a4933', 'hex'),
-      1: Buffer.from('e6a825ebd04018efadd3d85c7b7c6055010ada9d12974a937ad34d7493c63445', 'hex'),
-      2: Buffer.from('6692c99f5c20a9b2031889db018bb6459e8c42203dafa62f8c019a9c4e4dbc62', 'hex'),
-      0xff: Buffer.from('326289a26ecbe995affe03912a4e84b9c853262c01ef4924f31f3be22e7e1a1a', 'hex'),
+      0: Buffer.from('621b3c8c695f7b3f90548cba054086fd906b694d2e8375b5d7a2c3214308eff4', 'hex'),
+      1: Buffer.from('be8094a1bf7bc67990ded99bf393e16e32d9da1ed390a21fcaaaaaa12012ec4e', 'hex'),
+      2: Buffer.from('b07a2c8b9950891d8d111f996d967d197b0fcaffe7b98f575e376194db3deceb', 'hex'),
+      3: Buffer.from('cf355f31cdb67a1cb422fe1bc207fc6a115aa1cb1ea5d9b63965d00e4050bd05', 'hex'),
+      0xff: Buffer.from('76bebc01dd282b92e80bfac6b11e44f00d9f4dfd03127b7c88d666b0a502bceb', 'hex'),
     } as { [index: number]: Buffer },
   },
   {
     name: 'init_proposal',
-    blob: Buffer.from('1d0000006c6f63616c6e65742e6664633665356661643365356535326433662d300023000000323032332d31312d31365431343a33313a32382e3130313832393531382b30303a3030036244dbf2c2d2fc6900e7c46a0d81e75a6e137c4900ee614cc8b1551543ce5d9e467e3e8db73280a50aac95b59e54ece4f670624e1a46388dd0c458e78076420101000000000000000000000000000000000000000000000000000000000000000032fdd4e57f56519541491312d4e9089032244eca009fd0df101ba3e91d24f555893ae1bf0b271bd98363d6d4c659876731fe4a75170500000000000000a86100000000000000030000000194468bd88b010000007e68fb834a7772c82a312c4e6e519d97282cce39507950c35fe89f1c347a4a2e000294468bd88b01000000d81ff4dba9b1316576360dc94fcd611f9b228b040eaefb5157819d692eb4ef50011500000074785f696e69745f70726f706f73616c2e7761736d0094468bd88b0100005000000000061a4caa2da23123adeb4ae80ba0dc5239bff64baa4aaf5f385dc6877ae22e2600282bcb6a66c770f23e7b2f068ae0ba025eccb2ec00000c0000000000000018000000000000001e00000000000000', 'hex'),
+    blob: Buffer.from('1500000046315a37354e61575f746d544c7162736c5f71313500250000002b36323134362d30382d32345431393a33333a35362e3633393936323233352b30303a30301b4a30e7603606f68aa56abf4bfa2e2895c19027e1f81ed6f8c5ad1255a2302ba9b2900ad8b2bff46678176d5579cfe068f6b9575ca6a877da4385220e54856057c6004e1684170da337d4209e7b3eab69ff44bbe92c7286b6a9ec263add247d019d751f95424ee5a80000000000000000000000000000000000000000000000002500ddfd09c3c89d51db3df5a4ae5ff40747c8d0b0270102a025661d344496ccbaaf76c3909433cbb408bedca77c1dc3720313bf6ea5e0c65c38d4433997add5720f605684b0a0bb0004000000012e1a48babcfceaec00183178a2699d4025dfc4363a8ac11c7561b9bd2145a0081eadb6d83e1b420f28011e0000005f74345f5f6c5a4d6b385f6c415f695f443943735f505f5f6739305f5a4400a99076898d010000b200000003eeb98ec44dad99796b79b0657bf94d22bfa669328dcd49d426ec60a3193f7c74cb4e28c75b832e00280e2db2e6f183e9744905c7ded4507c8063ce170104000000000118c0654e5cf9b188e197229a7bca0be3e5a5df710000a47f3a8f9e15021d228c10b01dbffe71e96c6fee010134b07fd87831a60c376eff6dffa1b53de5a384f90101e2a2b18869cd218db8e307d8d0907642279513a3c7c2121a0f94aacb40116488020daba9095f6f7689b4346002a99076898d0100000037f60a13dd093d403c340ef42fd7dd3635e7556bfbc2c17695c5af13f9933dd6011500000074785f696e69745f70726f706f73616c2e7761736d01a89123149f6f0fd600d82cc2d9e7c5ec5b8fc071b5f21d4f355d6080f6bd488d9326f493115e2d0ceb0107000000395f5f6c5f5235', 'hex'),
     sectionHashes: {
-      0: Buffer.from('e86108905c4ba210c2c20289369b9cbcad3dfed25c601b9b6673ddef5573e3d4', 'hex'),
-      1: Buffer.from('061a4caa2da23123adeb4ae80ba0dc5239bff64baa4aaf5f385dc6877ae22e26', 'hex'),
-      2: Buffer.from('036244dbf2c2d2fc6900e7c46a0d81e75a6e137c4900ee614cc8b1551543ce5d', 'hex'),
-      3: Buffer.from('9e467e3e8db73280a50aac95b59e54ece4f670624e1a46388dd0c458e7807642', 'hex'),
-      0xff: Buffer.from('039a4d90beb2ead23ef48cecc0039104f865dd3c6c89ee12b90defbe8205c319', 'hex'),
+      0: Buffer.from('fe2b3b1736cf1f61b150aa3261bba8c12dedc1e787d7d27d6dab42871736cad6', 'hex'),
+      1: Buffer.from('796b79b0657bf94d22bfa669328dcd49d426ec60a3193f7c74cb4e28c75b832e', 'hex'),
+      2: Buffer.from('a9b2900ad8b2bff46678176d5579cfe068f6b9575ca6a877da4385220e548560', 'hex'),
+      3: Buffer.from('1b4a30e7603606f68aa56abf4bfa2e2895c19027e1f81ed6f8c5ad1255a2302b', 'hex'),
+      4: Buffer.from('57c6004e1684170da337d4209e7b3eab69ff44bbe92c7286b6a9ec263add247d', 'hex'),
+      0xff: Buffer.from('d8eddc341d2dcaa4d424d930c6e7360e0e5ab04aef71153328c75fa6e30ef24e', 'hex'),
     } as { [index: number]: Buffer },
   },
   {
     name: 'update_vp',
-    blob: Buffer.from('1e000000347133434953386c6e5f5f4e5657747a4d30587538545f30535f695f694601250000002b37323536322d31322d32385432313a34323a31312e3636393233393337382b30303a3030260000002b3236313437372d31312d30395430363a31373a35352e3637383136333537392b30303a30301016529e0f47127de7f27b40d479856e09d56b3b071fdfba740f70bcb13e9e8d0f0b2ab4a4b0c8037e5e4a69b57a161ad61725d9238da54e4f7aef83287f48bb478a1fdcac485929cf6cfb0eafcd994265f4220b76974c6e48e947fe235eb05501182b37fb0cad25500000000000000000000000000000000000000000000000005400e5b331e2bef7a2a64a901e85e3d1c7898efb37fa009edbe8da5a7d769490fa23cd647a5483ee4c3887d5b59cab66bdcf7380f27699e35715b47d9c02120d811502bfd124c101fb91884dd8240120b5d8afb36be277ff827f02c403454094f3e5032c0729464e0300000001884f57f60ff7b0de00af2b089e3aafdecc096bdca242dde6aff6ebc15ce4ba33045290f9c37f30a6dc0000d5fe73788d0100003c00000001d3ed6a7207e133c19c181f3a44008d319921616c01da73db72fa4425a4fab613f0005e8f7ef58d8df7ac671c81119189a498f84af300000000010002d5fe73788d01000000d9510e0f4e1fd123e9cf4033b5b3752eed07164e2e8a9e336b9dfdfe72b1f45a011600000074785f7570646174655f6163636f756e742e7761736d', 'hex'),
+    blob: Buffer.from('010000003101260000002d3138393235352d30392d32385432313a35383a35342e3531353039373133342b30303a3030260000002b3133363032392d30332d32355432313a30333a35372e3932363432323036382b30303a303090ff4ed48f5dbad61c94821e1e8103533ad93c87f0f73a736a7507ddbe443b05c8f771592526f205a5b08a5d7d762acf847e7eb42a447bca4aba6471a8d98ac57bb9560064a1b2f26570b2767407ed13f06371e69464060d54631abb4142ab270162f3ac36bf439508000000000000000000000000000000000000000000000000f3001759e8da89db2f0db7ceee4f6e8861f28561e7f20077e08552c0b502f26167f3de86fdfd7025c9b3dcbfdeb078bee3a3596dcf6b2c86beb30c962f840a3480cb145ab2444d000400000001b6af2b81b958e936001a74a1b82ae9856ccc19224615f6d463356a3c446e736c974aeaf9f17441a3590000ab9076898d0100007f00000000984b983297541d6f33d64dd5ab61fa4a95a11c78016b565afe9a6fd7dab8453d6219fdb02fcaca171898cbf43ca356493961fa95770200000001026c4af6c5d737180f7a9e4684a5724c4e70a0b1c24401c7de9d716c62a9f2f68d00621434b41e175caa4a04979f051c6af7c7dc1876cd733ec688f6d9be2619c7fe010002ab9076898d01000000ae00541ba3330250f7add0634fb53473a9f22b6917f8e852f514b3ce8d561d4b011600000074785f7570646174655f6163636f756e742e7761736d013e63339da161339f008929796a902b190423e944a40901ffe2a218c7b219356beed75f6001471ef62000', 'hex'),
     sectionHashes: {
-      0: Buffer.from('62471999b85604e0c74af0120b5ce29bfd0c0b2e26e219c0c12c8ebda17efb3f', 'hex'),
-      1: Buffer.from('da73db72fa4425a4fab613f0005e8f7ef58d8df7ac671c81119189a498f84af3', 'hex'),
-      2: Buffer.from('0f0b2ab4a4b0c8037e5e4a69b57a161ad61725d9238da54e4f7aef83287f48bb', 'hex'),
-      3: Buffer.from('1016529e0f47127de7f27b40d479856e09d56b3b071fdfba740f70bcb13e9e8d', 'hex'),
-      0xff: Buffer.from('9ec0932bd9860dc041c5dbe087cfdb207acb45207de2e9b974537a5f691fd99b', 'hex'),
+      0: Buffer.from('0468327d8e7626c00e3ddbb30bc4d572049e11ae1e66f15ea557e40f67bd9381', 'hex'),
+      1: Buffer.from('6b565afe9a6fd7dab8453d6219fdb02fcaca171898cbf43ca356493961fa9577', 'hex'),
+      2: Buffer.from('c8f771592526f205a5b08a5d7d762acf847e7eb42a447bca4aba6471a8d98ac5', 'hex'),
+      3: Buffer.from('90ff4ed48f5dbad61c94821e1e8103533ad93c87f0f73a736a7507ddbe443b05', 'hex'),
+      4: Buffer.from('7bb9560064a1b2f26570b2767407ed13f06371e69464060d54631abb4142ab27', 'hex'),
+      0xff: Buffer.from('5ebd2bb7e79b9d749d688c18f4fe22b3edba441bb92a0401400d7ac938a3cc45', 'hex'),
     } as { [index: number]: Buffer },
   },
   {