revert script updates to restrict changes to new node register only

onflow · Jan 29, 2025 · 2b14a7b · 2b14a7b
1 parent 70f907c
commit 2b14a7b
Show file tree

Hide file tree

Showing 194 changed files with 1,975 additions and 1,905 deletions.
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ pytest tests/ --tb=short -v --device flex
 
 Note that in case ledger-app-dev-tools:latest is updated there is a chance that slight changes in gui happen. In that case it is necessary to re-generate the snapshots, e.g.
 ```shell
-pytest tests/ --tb=short -v --device nanos –golden_run
+pytest tests/ --tb=short -v --device nanos –-golden_run
 ```
 and review the changes in test/snapshots directory
 

diff --git a/js/src/txMerkleTree.js b/js/src/txMerkleTree.js
diff --git a/js/test/test.js b/js/test/test.js
@@ -155,22 +155,22 @@ async function runTest() {
   assert.equal(transport.expected.length, 0)
 
   //signTransaction - merkle tree. This needs to be fixed when merkle tree changes. FA.01, only metadata (330203) and proof is important (330204, 330205)
-  //metadata: "029e46752d27947cc85e5fb62f4deecb12bd7b2a721211ef944acf528bd648dcd79e46752d27947cc85e5fb62f4deecb12bd7b2a721211ef944acf528bd648dcd7437265617465204163636f756e740003045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002"
+  //metadata: "02c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443cc4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c437265617465204163636f756e740003045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002"
   //proof1
   transport.expected = [
     ["3300000000", "00000c0000311000049000"],
     ["33020000162c0000801b0200800102008000000000000000000103", "9000"],
     ["3302010002f904","9000"],
-    ["330203007b029e46752d27947cc85e5fb62f4deecb12bd7b2a721211ef944acf528bd648dcd79e46752d27947cc85e5fb62f4deecb12bd7b2a721211ef944acf528bd648dcd7437265617465204163636f756e740003045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002", "9000"],
-    ["33020400e023b0dd67bd651dd2ae5c318486bf96f170173d6eb52bbb8867fc4b9914be7caac44d21aa30fcd3c717c02151cb60275dd84e97ab0f6e03f3b8b67c8701ce0e0066f2970da5775dece3467df9268d5f5349c57ba0cb5016bc3a4412eb9b1bd4b609e42bcf86c1357d31d8ed3d2569596e58f44efeef4a7aa2c89adc30242f2d6e589eb34bbae9b1da9ecddca7fd3d2e03d6a383b9b7c0209ef2711a657e7dedc5779cf5bedad006f073e50ac176159dfb9e020957d29b81947dbfe07d9136b1fa932bebc831854a61bc79fd527ce161c0fc279a6dce5d326499f0215356337bdf", "9000"],
-    ["33020400e04f7c6cc135c8aa32426d5303a93685b67e7088d862f3cf1ed1d827abcdfd544c742d6e0015520cf3206f04bd73d312f1d20d767b28b5932e157f16d77369d5b0700b87fc1343839e67f28a65b58dc091282cde796ef16d069a3b60f6ee3f8c20413bed19a08455b0b72cf2bedc8aed52170ab7ccc6e1c582d4940fa14e09bb3563981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a", "9000"],
-    ["33020400e07c5cb8603f41d182e1f7867630fc4faac07fa2e3eebd64cafedc8aa755e16f9888bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad91929", "9000"],
-    ["33020500e05a8094539a9e1642a60775137dbcd1d048cf51e7e9bf027b72d46c9285a0f44294a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e", "47fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb09a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e844003044022047fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb022009a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e8449000"],
+    ["330203009002c4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443cc4a7efd8708396e8c7a3611f72a9f89f675bf6d5c9336dd389e5839cba78443c437265617465204163636f756e740004045075626c6963204b65790000065369676e617475726520416c672e0001054861736820416c672e0002014b65792057656967687400035546697836340003", "9000"],
+    ["33020400e0c43cfe541b0628a223d0b531ae1c92b537d22438fd19fd98ecf8b7759a56699c85992afd3e94015265d19d9fc7c7cbe04e1a1496b2fd6473dcae0c6b404f77c8b5b81e2d8d86b60ca608b709cbe3c61fd45cd371699896cd26e915bda7814bddeb6840289224d8506819dd85ba3a8b8df504de1079e5353e5ab36d20f987569f8f69d764860ca602c24cb13858d1cc69b94f37f1c34edf1156b3ab9409e8a7efb022a37057dc012ce244a35a12a71ca047552658e04d49cdb92c6b9d0c706cc81daeeae363c035bbf2446c0c50d742444fbf9c392eccbec90f9b70591f217cbb", "9000"],
+    ["33020400e0fdc9ed4c7d1cdd61c7d54718392d3b0d250fe687ca5dc36e49707cb82888f459a70ead9e24c865314c33b8768be2e8e2750fab13a3d6be4687949c1f3893b69c32412631b4049669cbe83a3dfb6a6d56d34f7c67fc8eea50f674d45aebfc83c7bc95b3b4893c1ccaa5341c4591ba0200b118cc52e43b4820040974ffda9e5b7063981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a63981575be94aaa4f14daa9f27c6c2fd72b46de3994ed71abaec45aa4b40615a", "9000"],
+    ["33020400e07ecb7fc4a9a515f42bb1897ffae3f65db14286b86484b322814fe7644470c10688bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad9192988bd487007bf1a5be47cea944d797895181258aba33c77e8c75fe7e38ad91929", "9000"],
+    ["33020500e046ad85ad4640a5cf805dcc95edce918673594e1b77bfd636a4ed9fb9a4f5fab794a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e94a4bf5f458f2def50f807bf419501bfd5e77a084c30592aa3803a522a3c272e", "47fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb09a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e844003044022047fba63d87cac1a4d3d6345eb9ad4a8197d15cad816326675b950dc084fc90eb022009a4c529640f92a5f07c4f54221f26f08a09c3d635cac6cc633050e0dff9e8449000"],
   ]
 
   tx2 = "f904"
   // This needs to be fixed if hash changes. FA.01
-  scriptHash = "9e46752d27947cc85e5fb62f4deecb12bd7b2a721211ef944acf528bd648dcd7"
+  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] = {
-    0xd3, 0x73, 0x6d, 0xb4, 0x95, 0xce, 0xed, 0xc6, 0x4b, 0x2b, 0x57, 0x0c, 0xe1, 0x64, 0x08, 0xe2,
-    0x52, 0xd7, 0xd0, 0x29, 0xbf, 0xeb, 0x3e, 0xeb, 0x50, 0x14, 0x8a, 0xc0, 0x29, 0x96, 0x05, 0x27};
+    0x5a, 0xc8, 0x20, 0x24, 0x02, 0x37, 0xd9, 0x7d, 0x1d, 0x39, 0x0b, 0xbc, 0xa8, 0xb7, 0x0b, 0xf3,
+    0x39, 0xd8, 0xd3, 0xe8, 0x92, 0xbc, 0xdb, 0xb1, 0x4f, 0x96, 0x00, 0x0d, 0x55, 0xff, 0x65, 0xbe};
 
 static const char *STRING_TYPE_STRING = "String";
 static const char *UINT8_TYPE_STRING = "UInt8";