Update manifest

vacuumlabs · Apr 18, 2024 · 362fe04 · 362fe04
1 parent eafad1c
commit 362fe04
Show file tree

Hide file tree

Showing 14 changed files with 541 additions and 522 deletions.
diff --git a/js/src/txMerkleTree.js b/js/src/txMerkleTree.js
@@ -1,25 +1,25 @@
 export const merkleTree = {
-  "hash": "e5de7e03151b79a530f29806444d1764a0dbd4823ea38eb58144f2e551ef90d9",
+  "hash": "3b8a3f04a2eac7998ef3b7dac432f73ca08c296886daf146e42b3563543e5c49",
   "children": [
     {
-      "hash": "e506b85f9d54a5f2f67017bfe350ae31b7b9d200c6b4164f6659beb593f2256d",
+      "hash": "f5b4f20ebf66048eb52e05e6d39c0ef0de46dbcb523de9cbec5a7431f35945f3",
       "children": [
         {
-          "hash": "f094b3a6c716f144697dbe4b2ba5d2f1e2da984b2e80aa05a5590204c7e37d36",
+          "hash": "82137b013ac2531825cd65b4a28a7be556c1c369c8a87c24e161f5f8001b1194",
           "children": [
             {
-              "hash": "1c5ca0bd6e2efe7b703bf5fb36929d0cc9c9d209c67785881dd3da4fd46aa205",
+              "hash": "6900ff3054ae4933c381d7d3e2d8b1b17b515b3d6b98e93d11f00acb9d359323",
               "children": [
                 {
-                  "hash": "ba8d78ee5eb236b4e5dea4440ac6b87123d9fcf85e1b36b7e5a0d60f26e9d3a4",
+                  "hash": "c43cfe541b0628a223d0b531ae1c92b537d22438fd19fd98ecf8b7759a56699c",
                   "children": [
-                    "0263d8b6a045bf8e6196198184db685c2cf22932503ccb2dcb85c7d2dc04c882ba63d8b6a045bf8e6196198184db685c2cf22932503ccb2dcb85c7d2dc04c882ba437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003"
+                    "02c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443cc4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003"
                   ]
                 },
                 {
-                  "hash": "8ffa9371ad7acc826d866ae38a8082382a7a6a78558514f038607e65b3d33cf7",
+                  "hash": "85992afd3e94015265d19d9fc7c7cbe04e1a1496b2fd6473dcae0c6b404f77c8",
                   "children": [
-                    "0221d4e87df171ccbe015efe69dc2ffd24814c5fc0f2e364daf5c80515ce4a8bd921d4e87df171ccbe015efe69dc2ffd24814c5fc0f2e364daf5c80515ce4a8bd9416464204b65790004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003"
+                    "021c9d1210f2bf129b86803b153e137420c9117e8a2409a1e2ef6f916a4e8d611f1c9d1210f2bf129b86803b153e137420c9117e8a2409a1e2ef6f916a4e8d611f416464204b65790004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003"
                   ]
                 },
                 {
@@ -41,32 +41,32 @@ export const merkleTree = {
                   ]
                 },
                 {
-                  "hash": "fbc32d80f4b63fdbe9b07c2a15429b1bb812ff354a39c55bbeec86092fbed3af",
+                  "hash": "ed5b792d16451b6324d59a6b6f6ab264c64bf21ec79a2cfeff80026f4d8b1cd6",
                   "children": [
-                    "02c1518742a95f9b49259abed8364b05d616ee8acebe123e9979f762b9e7522f93697ad2a90da93cbd02b7658f174c9c32e2016a574edb89cf24b57a8155c343e45472616e736665722046756e6769626c6520546f6b656e20776974682041646472657373000401416d6f756e740000554669783634000301526563697069656e74000141646472657373000301465420436f6e74726163742041646472657373000241646472657373000304465420436f6e7472616374204e616d650003"
+                    "020adc1ebe8246cf7656aefd9bf336f7f0c102a039e343776da61da4d6aa39aed2d8f826a451d808697ed3ce7908a080c05219df458e3e6cd4ccd073600c58e6005472616e736665722046756e6769626c6520546f6b656e20776974682041646472657373000401416d6f756e740000554669783634000301526563697069656e74000141646472657373000301465420436f6e74726163742041646472657373000241646472657373000304465420436f6e7472616374204e616d650003"
                   ]
                 },
                 {
-                  "hash": "13f49f212695702b7bb3c40e83a21965c8896a5b27f7ca5060e92f495e7a34dc",
+                  "hash": "bbb61ffb9141077dae6f17074fd3164785f763786fcc663741c1c2d892db868b",
                   "children": [
-                    "02d9ef3b05f8b06d43c3a0ef4066e88e6248323c5f235f9a5d1f8a85d6e2bc9bfa1d12c005fa7a08277204e5d54e29b725c52b9e8e3dd6ff6e01f8d47d7be1626c5365747570204e465420436f6c6c656374696f6e0002014e465420436f6e747261637420416464726573730000416464726573730003044e465420436f6e7472616374204e616d650001"
+                    "0254fae25bb09f5a324821b644890acbc5a356bcbe821218edeb18bd3042dcd333a25e07dea5eb608387d3766fd6ce0110491599a6d61a5e7e9afddd19a7e766115365747570204e465420436f6c6c656374696f6e0002014e465420436f6e747261637420416464726573730000416464726573730003044e465420436f6e7472616374204e616d650001"
                   ]
                 }
               ]
             },
             {
-              "hash": "39c872ce2cd813b03467d6fe3c74171278be3a7672876f9054b46dd793918de3",
+              "hash": "210ce9329af66737c49065f854327f14587781dcde6e04cae8f62a1144734b04",
               "children": [
                 {
-                  "hash": "f3b874e9ccb839c607b28a232f9a9f69f2a2ae3540b6d85db0dbd2b842cdbb40",
+                  "hash": "e4728a6ea610bc9f6e6b7aa87be64cfaef2aa72ea95d7e2ffdf1732509aab0dc",
                   "children": [
-                    "02f08815a2f535512a65e5c95c391dd6ff89662dad8fd68da836d11d0827a52bd4a56eb0c3e6c3456eee86d5cb62ddf700b0d1e5e65f12fe6926edd6d1816582855472616e73666572204e46542077697468205061746873000401526563697069656e740000416464726573730003014e465420494420746f205472616e73666572000155496e74363400030453656e646572277320436f6c6c656374696f6e2050617468204964656e746966696572000204526563697069656e7427732052656365697665722050617468204964656e7469666965720003"
+                    "02db0518029ca76e6f2d8ec1517768b1d395523e87d11a4297197f98b53dc9cc2d2cb2cd6408a35f08b4f9b13e6e6b44d5325eb78a7a1eebb0e790ee285bdd13655472616e73666572204e46542077697468205061746873000401526563697069656e740000416464726573730003014e465420494420746f205472616e73666572000155496e74363400030453656e646572277320436f6c6c656374696f6e2050617468204964656e746966696572000204526563697069656e7427732052656365697665722050617468204964656e7469666965720003"
                   ]
                 },
                 {
-                  "hash": "ee52358d565de121f5102d6dfb184aba9865b5e2e3594c52844f864e74668a04",
+                  "hash": "47df2ea839c7e2bf8aff9ed112a76c9eae83f9aa3f7dc574bdd4772e1a339712",
                   "children": [
-                    "02b7892b30d7a68531db8af3aa73eec7bf899bd039bc9883c4d0270e44c78cec30111142945f27d91bf3be630737805eba25d586b0c292bb3818e5d4cf4287e31c5472616e73666572204e465420776974682041646472657373000401526563697069656e740000416464726573730003014e465420494420746f205472616e73666572000155496e7436340003014e465420436f6e747261637420416464726573730002416464726573730003044e465420436f6e7472616374204e616d650003"
+                    "02e4b837ce4d30be9bc74768085a0b43ba4d5edb3bed9c23c18b6a4de1024d459b91fd4533a93f55a756484958e5409b9666c85e4191e9ba6f5fb3587a973d4eb55472616e73666572204e465420776974682041646472657373000401526563697069656e740000416464726573730003014e465420494420746f205472616e73666572000155496e7436340003014e465420436f6e747261637420416464726573730002416464726573730003044e465420436f6e7472616374204e616d650003"
                   ]
                 },
                 {
@@ -149,18 +149,18 @@ export const merkleTree = {
               ]
             },
             {
-              "hash": "4d3432718724a8c3b5de68f394c467169fa1c2294739685b87c6ae5b00a46817",
+              "hash": "f2070a3be507580f1c50209a1121e1c980d81c0dd51b8e55adc5b5ddafa97adc",
               "children": [
                 {
-                  "hash": "5af37d69ebb4555dd0061c2ddde70a10dc7d2ad6fc991119306ac7a75d4ce815",
+                  "hash": "1db501d2b5dda1232062fba4dd77bf1b3bd7d4366a6aaf74ccf406cf2caf7e0b",
                   "children": [
-                    "02311f4071dda8b17ac6cbc6f0a27e98bd426026825d3c68308903fead884e616e38bfd23b200ecef4d13fa3c2ea998b51e6a24f3a8ceb260d2affab7c918a97d05472616e73666572204e6f64650002044e6f6465204944000001416464726573730001416464726573730003"
+                    "02a39eedbe19f252c24ba2cc74aa70c0afd68b8d89528cad05a0a535e2f9c6ee873578c7f3b015df3a807dce45a0df262e79d95683cef20bd6247a8f1184c562795472616e73666572204e6f64650002044e6f6465204944000001416464726573730001416464726573730003"
                   ]
                 },
                 {
-                  "hash": "148677d2ed1ff860d66107c9e10c5081a68ff06913cc132c883b09a9f7cb813f",
+                  "hash": "acb03d0e42854eb5c740c44a11766c7b5da2a80f4019c31e1e9260f1db23ae5b",
                   "children": [
-                    "02f9fa239cb78b3e07b8f8d56e173e2673b4b53aeb07d507a769c8d96eaf400b8d11e2107d2ccd96cb6b3fa3a704491dcd9e1736215137304e0494243c21befc765472616e736665722044656c656761746f720003044e6f646520494400000144656c656761746f72204944000155496e743332000301416464726573730002416464726573730003"
+                    "02135df83060f854d487030594e954e9642e4cf6accb5b5abbdf88a9e0754689138c7b8460f11ae786c207493eac35deaccb456a31f9df34ddecccad12685c61fc5472616e736665722044656c656761746f720003044e6f646520494400000144656c656761746f72204944000155496e743332000301416464726573730002416464726573730003"
                   ]
                 },
                 {
@@ -2420,13 +2420,13 @@ export const merkleTree = {
 }
 
 export const merkleIndex = {
-  "63d8b6a045bf8e61": [
+  "c4a7efd8708396e8": [
     0,
     0,
     0,
     0
   ],
-  "21d4e87df171ccbe": [
+  "1c9d1210f2bf129b": [
     0,
     0,
     0,
@@ -2462,49 +2462,49 @@ export const merkleIndex = {
     0,
     4
   ],
-  "c1518742a95f9b49": [
+  "0adc1ebe8246cf76": [
     0,
     0,
     0,
     5
   ],
-  "697ad2a90da93cbd": [
+  "d8f826a451d80869": [
     0,
     0,
     0,
     5
   ],
-  "d9ef3b05f8b06d43": [
+  "54fae25bb09f5a32": [
     0,
     0,
     0,
     6
   ],
-  "1d12c005fa7a0827": [
+  "a25e07dea5eb6083": [
     0,
     0,
     0,
     6
   ],
-  "f08815a2f535512a": [
+  "db0518029ca76e6f": [
     0,
     0,
     1,
     0
   ],
-  "a56eb0c3e6c3456e": [
+  "2cb2cd6408a35f08": [
     0,
     0,
     1,
     0
   ],
-  "b7892b30d7a68531": [
+  "e4b837ce4d30be9b": [
     0,
     0,
     1,
     1
   ],
-  "111142945f27d91b": [
+  "91fd4533a93f55a7": [
     0,
     0,
     1,
@@ -2654,25 +2654,25 @@ export const merkleIndex = {
     2,
     6
   ],
-  "311f4071dda8b17a": [
+  "a39eedbe19f252c2": [
     0,
     0,
     3,
     0
   ],
-  "38bfd23b200ecef4": [
+  "3578c7f3b015df3a": [
     0,
     0,
     3,
     0
   ],
-  "f9fa239cb78b3e07": [
+  "135df83060f854d4": [
     0,
     0,
     3,
     1
   ],
-  "11e2107d2ccd96cb": [
+  "8c7b8460f11ae786": [
     0,
     0,
     3,

diff --git a/js/test/test.js b/js/test/test.js
@@ -148,20 +148,23 @@ async function runTest() {
   assert.equal(res.signatureDER.toString("hex"), "304502210093cd8452a5f6770cefcec110e66e82d5986aa734d71c7055a95b0b6a2b74423b022069924df1208bd18f9ae21a3e6236b8fc5500c4cbb69266435ee5c0cb3c9e190d")
   assert.equal(transport.expected.length, 0)
 
-  //signTransaction - merkle tree
+  //signTransaction - merkle tree. This needs to be fixed when merkle tree changes. FA.01, only metadata (330203) and proof is important (330204, 330205)
+  //metadata: "02c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443cc4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003"
+  //proof1
   transport.expected = [
     ["3300000000", "00000c0000311000049000"],
     ["33020000162c0000801b0200800102008000000000000000000103", "9000"],
     ["3302010002f904","9000"],
-    ["33020300900263d8b6a045bf8e6196198184db685c2cf22932503ccb2dcb85c7d2dc04c882ba63d8b6a045bf8e6196198184db685c2cf22932503ccb2dcb85c7d2dc04c882ba437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003", "9000"],
-    ["33020400e0ba8d78ee5eb236b4e5dea4440ac6b87123d9fcf85e1b36b7e5a0d60f26e9d3a48ffa9371ad7acc826d866ae38a8082382a7a6a78558514f038607e65b3d33cf7b5b81e2d8d86b60ca608b709cbe3c61fd45cd371699896cd26e915bda7814bdd20aa32dac6f0564026754cd8e38e092ba2c89f061c2a6574eb6df4adbf91480ee112591a80586f3b71a856155e1995fae1e86f03fff3bb7aa7f91d082b652182fbc32d80f4b63fdbe9b07c2a15429b1bb812ff354a39c55bbeec86092fbed3af13f49f212695702b7bb3c40e83a21965c8896a5b27f7ca5060e92f495e7a34dc", "9000"],
-    ["33020400e01c5ca0bd6e2efe7b703bf5fb36929d0cc9c9d209c67785881dd3da4fd46aa20539c872ce2cd813b03467d6fe3c74171278be3a7672876f9054b46dd793918de332412631b4049669cbe83a3dfb6a6d56d34f7c67fc8eea50f674d45aebfc83c74d3432718724a8c3b5de68f394c467169fa1c2294739685b87c6ae5b00a4681763981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a", "9000"],
-    ["33020400e0f094b3a6c716f144697dbe4b2ba5d2f1e2da984b2e80aa05a5590204c7e37d3688bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad91929", "9000"],
-    ["33020500e0e506b85f9d54a5f2f67017bfe350ae31b7b9d200c6b4164f6659beb593f2256d94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e", "47fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb09a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e844003044022047fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb022009a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e8449000"],
+    ["330203009002c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443cc4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003", "9000"],
+    ["33020400e0c43cfe541b0628a223d0b531ae1c92b537d22438fd19fd98ecf8b7759a56699c85992afd3e94015265d19d9fc7c7cbe04e1a1496b2fd6473dcae0c6b404f77c8b5b81e2d8d86b60ca608b709cbe3c61fd45cd371699896cd26e915bda7814bdd20aa32dac6f0564026754cd8e38e092ba2c89f061c2a6574eb6df4adbf91480ee112591a80586f3b71a856155e1995fae1e86f03fff3bb7aa7f91d082b652182ed5b792d16451b6324d59a6b6f6ab264c64bf21ec79a2cfeff80026f4d8b1cd6bbb61ffb9141077dae6f17074fd3164785f763786fcc663741c1c2d892db868b", "9000"],
+    ["33020400e06900ff3054ae4933c381d7d3e2d8b1b17b515b3d6b98e93d11f00acb9d359323210ce9329af66737c49065f854327f14587781dcde6e04cae8f62a1144734b0432412631b4049669cbe83a3dfb6a6d56d34f7c67fc8eea50f674d45aebfc83c7f2070a3be507580f1c50209a1121e1c980d81c0dd51b8e55adc5b5ddafa97adc63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a", "9000"],
+    ["33020400e082137b013ac2531825cd65b4a28a7be556c1c369c8a87c24e161f5f8001b119488bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad91929", "9000"],
+    ["33020500e0f5b4f20ebf66048eb52e05e6d39c0ef0de46dbcb523de9cbec5a7431f35945f394a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e", "47fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb09a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e844003044022047fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb022009a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e8449000"],
   ]
 
   tx2 = "f904"
-  scriptHash = "63d8b6a045bf8e6196198184db685c2cf22932503ccb2dcb85c7d2dc04c882ba"
+  // This needs to be fixed if hash chamges. FA.01
+  scriptHash = "c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c"
   res = await app.sign("m/44'/539'/513'/0/0", Buffer.from(tx2, "hex"), cryptoOptions, scriptHash)
   assert.equal(res.returnCode, 0x9000)
   assert.equal(res.signatureCompact.toString("hex"), "47fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb09a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e84400")

diff --git a/src/tx_metadata.c b/src/tx_metadata.c
@@ -18,8 +18,8 @@ struct {
 } txMetadataState;
 
 static const uint8_t merkleTreeRoot[METADATA_HASH_SIZE] = {
-    0xe5, 0xde, 0x7e, 0x03, 0x15, 0x1b, 0x79, 0xa5, 0x30, 0xf2, 0x98, 0x06, 0x44, 0x4d, 0x17, 0x64,
-    0xa0, 0xdb, 0xd4, 0x82, 0x3e, 0xa3, 0x8e, 0xb5, 0x81, 0x44, 0xf2, 0xe5, 0x51, 0xef, 0x90, 0xd9};
+    0x3b, 0x8a, 0x3f, 0x04, 0xa2, 0xea, 0xc7, 0x99, 0x8e, 0xf3, 0xb7, 0xda, 0xc4, 0x32, 0xf7, 0x3c,
+    0xa0, 0x8c, 0x29, 0x68, 0x86, 0xda, 0xf1, 0x46, 0xe4, 0x2b, 0x35, 0x63, 0x54, 0x3e, 0x5c, 0x49};
 
 static const char *STRING_TYPE_STRING = "String";
 static const char *UINT8_TYPE_STRING = "UInt8";