Merge pull request #211 from Zondax/rename-method

rename community to neurons
Zondax · Jun 19, 2023 · d744167 · d744167
2 parents bdac696 + 3993be1
commit d744167
Show file tree

Hide file tree

Showing 29 changed files with 57 additions and 59 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the minor version of this release
 APPVERSION_N=4
 # This is the patch version of this release
-APPVERSION_P=3
+APPVERSION_P=4
diff --git a/app/src/candid/candid_types.h b/app/src/candid/candid_types.h
@@ -155,11 +155,11 @@ typedef enum {
     hash_operation_IncreaseDissolveDelay = 2143729936,
     hash_operation_AddHotkey = 628424947,
     hash_operation_RemoveHotkey = 45994902,
-    hash_operation_JoinCommunityFund = 3248805476,
+    hash_operation_JoinNeuronsFund = 3248805476,
     hash_operation_ChangeAutoStakeMaturity = 1906071820,
 
     hash_operation_StartDissolving = 1977744848,
-    hash_operation_LeaveCommunityFund = 3675510135,
+    hash_operation_LeaveNeuronsFund = 3675510135,
     hash_operation_SetDissolvedTimestamp = 3913126211,
 } operation_variant_hash_e;
 
@@ -178,7 +178,7 @@ typedef enum {
     FOLLOW_TOPIC_SNS_DECENTRALIZATION_SALE = 11,
     FOLLOW_TOPIC_SUBNET_REPLICA_VERSION_MANAGEMENT = 12,
     FOLLOW_TOPIC_REPLICA_VERSION_MANAGEMENT = 13,
-    FOLLOW_TOPIC_SNS_AND_COMMUNITY_FUND = 14,
+    FOLLOW_TOPIC_SNS_AND_NEURONS_FUND = 14,
 } candid_FollowTopics_e;
 
 // Permissions ENUM

diff --git a/app/src/candid/nns_parser.c b/app/src/candid/nns_parser.c
@@ -328,7 +328,7 @@ __Z_INLINE parser_error_t readCommandFollow(parser_context_t *ctx, candid_transa
 
     // now let's read
     CHECK_PARSER_ERR(readCandidInt32(ctx, &val->command.follow.topic))
-    if (val->command.follow.topic < 0 || val->command.follow.topic > FOLLOW_TOPIC_SNS_AND_COMMUNITY_FUND) {
+    if (val->command.follow.topic < 0 || val->command.follow.topic > FOLLOW_TOPIC_SNS_AND_NEURONS_FUND) {
         return parser_unexpected_value;
     }
     CHECK_PARSER_ERR(readCandidByte(ctx, &val->command.follow.followees_size))
@@ -498,10 +498,10 @@ __Z_INLINE parser_error_t readCommandConfigure(parser_context_t *ctx, candid_tra
         case hash_operation_RemoveHotkey:
             CHECK_PARSER_ERR(readOperationAddRemoveHotkey(ctx, txn, operation))
             break;
-        case hash_operation_LeaveCommunityFund:
+        case hash_operation_LeaveNeuronsFund:
         case hash_operation_StartDissolving:
         case hash_operation_StopDissolving:
-        case hash_operation_JoinCommunityFund:
+        case hash_operation_JoinNeuronsFund:
             // Check empty record
             CHECK_PARSER_ERR(getCandidTypeFromTable(txn, txn->element.implementation))
             CHECK_PARSER_ERR(readCandidRecordLength(txn))

diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
@@ -330,8 +330,8 @@ parser_error_t getManageNeuronType(const parser_tx_t *v, manageNeuron_e *mn_type
                         case hash_operation_SetDissolvedTimestamp:
                             *mn_type = Configure_SetDissolvedTimestamp;
                             break;
-                        case hash_operation_LeaveCommunityFund:
-                            *mn_type = Configure_LeaveCommunityFundCandid;
+                        case hash_operation_LeaveNeuronsFund:
+                            *mn_type = Configure_LeaveNeuronsFundCandid;
                             break;
                         case hash_operation_ChangeAutoStakeMaturity:
                             *mn_type = Configure_ChangeAutoStakeMaturity;
@@ -345,8 +345,8 @@ parser_error_t getManageNeuronType(const parser_tx_t *v, manageNeuron_e *mn_type
                         case hash_operation_StopDissolving:
                             *mn_type = isSNS ? SNS_Configure_StopDissolving : Configure_StopDissolvingCandid;
                             break;
-                        case hash_operation_JoinCommunityFund:
-                            *mn_type = Configure_JoinCommunityFundCandid;
+                        case hash_operation_JoinNeuronsFund:
+                            *mn_type = Configure_JoinNeuronsFundCandid;
                             break;
                         case hash_operation_AddHotkey:
                             *mn_type = Configure_AddHotkeyCandid;
@@ -736,10 +736,10 @@ uint8_t getNumItemsManageNeurons(__Z_UNUSED const parser_context_t *c, const par
 
     switch (mn_type) {
         case Configure_StopDissolving :
-        case Configure_JoinCommunityFund :
-        case Configure_LeaveCommunityFund :
-        case Configure_JoinCommunityFundCandid:
-        case Configure_LeaveCommunityFundCandid:
+        case Configure_JoinNeuronsFund :
+        case Configure_LeaveNeuronsFund :
+        case Configure_JoinNeuronsFundCandid:
+        case Configure_LeaveNeuronsFundCandid:
         case Configure_StartDissolving : {
             return 2;
         }

diff --git a/app/src/parser_print_candid.c b/app/src/parser_print_candid.c
@@ -112,8 +112,8 @@ __Z_INLINE parser_error_t print_follow_topic(int32_t topic, char *outVal, uint16
         case FOLLOW_TOPIC_REPLICA_VERSION_MANAGEMENT:
             pageString(outVal, outValLen, "Replica Version Management", pageIdx, pageCount);
             break;
-        case FOLLOW_TOPIC_SNS_AND_COMMUNITY_FUND:
-            pageString(outVal, outValLen, "SNS & Community Fund", pageIdx, pageCount);
+        case FOLLOW_TOPIC_SNS_AND_NEURONS_FUND:
+            pageString(outVal, outValLen, "SNS & Neurons' Fund", pageIdx, pageCount);
             break;
 
         default:
@@ -733,10 +733,10 @@ static parser_error_t parser_getItemConfigureNoElementsCandid(uint8_t displayIdx
             pageString(outVal, outValLen, "Start Dissolve Neuron", pageIdx, pageCount);
         } else if (hash == hash_operation_StopDissolving) {
             pageString(outVal, outValLen, "Stop Dissolve Neuron", pageIdx, pageCount);
-        } else if (hash == hash_operation_JoinCommunityFund) {
-            pageString(outVal, outValLen, JOIN_COMMUNITY_FUND, pageIdx, pageCount);
-        } else if (hash == hash_operation_LeaveCommunityFund) {
-            pageString(outVal, outValLen, "Leave Community Fund", pageIdx, pageCount);
+        } else if (hash == hash_operation_JoinNeuronsFund) {
+            pageString(outVal, outValLen, "Join Neurons' Fund", pageIdx, pageCount);
+        } else if (hash == hash_operation_LeaveNeuronsFund) {
+            pageString(outVal, outValLen, "Leave Neurons' Fund", pageIdx, pageCount);
         } else {
             return parser_unexpected_value;
         }
@@ -1166,8 +1166,8 @@ __Z_INLINE parser_error_t parser_getItemManageNeuron(const parser_context_t *ctx
         case Configure_AddHotkeyCandid:
         case Configure_RemoveHotkeyCandid:
             return parser_getItemConfigureAddRemoveHotkeyCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
-        case Configure_JoinCommunityFundCandid:
-        case Configure_LeaveCommunityFundCandid:
+        case Configure_JoinNeuronsFundCandid:
+        case Configure_LeaveNeuronsFundCandid:
         case Configure_StartDissolvingCandid:
         case Configure_StopDissolvingCandid:
             return parser_getItemConfigureNoElementsCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);

diff --git a/app/src/parser_print_protobuf.c b/app/src/parser_print_protobuf.c
@@ -268,7 +268,7 @@ static parser_error_t parser_getItemIncreaseNeuronTimer(uint8_t displayIdx,
     return parser_no_data;
 }
 
-static parser_error_t parser_getItemJoinCommunityFund(uint8_t displayIdx,
+static parser_error_t parser_getItemJoinNeuronsFund(uint8_t displayIdx,
                                                       char *outKey, uint16_t outKeyLen,
                                                       char *outVal, uint16_t outValLen,
                                                       uint8_t pageIdx, uint8_t *pageCount) {
@@ -278,7 +278,7 @@ static parser_error_t parser_getItemJoinCommunityFund(uint8_t displayIdx,
 
     if (displayIdx == 0) {
         snprintf(outKey, outKeyLen, "Transaction type");
-        snprintf(outVal, outValLen, JOIN_COMMUNITY_FUND);
+        snprintf(outVal, outValLen, "Join Neurons' Fund");
         return parser_ok;
     }
 
@@ -723,7 +723,7 @@ static parser_error_t parser_getItemFollow(uint8_t displayIdx,
                 return parser_ok;
             }
             case ic_nns_governance_pb_v1_Topic_TOPIC_SNS_AND_COMMUNITY_FUND : {
-                snprintf(outVal, outValLen, "SNS & Community Fund");
+                snprintf(outVal, outValLen, "SNS & Neurons' Fund");
                 return parser_ok;
             }
             default: {
@@ -795,9 +795,9 @@ static parser_error_t parser_getItemManageNeuron(uint8_t displayIdx,
         case Configure_IncreaseDissolveDelay:
             return parser_getItemIncreaseNeuronTimer(displayIdx,
                                                      outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
-        case Configure_JoinCommunityFund :
-            return parser_getItemJoinCommunityFund(displayIdx,
-                                                   outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
+        case Configure_JoinNeuronsFund :
+            return parser_getItemJoinNeuronsFund(displayIdx,
+                                                 outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
         case Configure_StopDissolving :
         case Configure_StartDissolving : {
             return parser_getItemStartStopDissolve(displayIdx,

diff --git a/app/src/parser_print_strings.h b/app/src/parser_print_strings.h
@@ -20,12 +20,10 @@ extern "C" {
 #endif
 
 #if defined(TARGET_STAX)
-    #define JOIN_COMMUNITY_FUND "Join Community Fund"
     #define INCREASE_DISSOLVE_DELAY "Increase Dissolve\nDelay"
     #define START_DISSOLVE_NEURON "Start Dissolve Neuron"
     #define STOP_DISSOLVE_NEURON "Stop Dissolve Neuron"
 #else
-    #define JOIN_COMMUNITY_FUND "Join Community     Fund"
     #define INCREASE_DISSOLVE_DELAY "Increase Dissolve  Delay"
     #define START_DISSOLVE_NEURON "Start Dissolve     Neuron"
     #define STOP_DISSOLVE_NEURON "Stop Dissolve      Neuron"

diff --git a/app/src/parser_txdef.h b/app/src/parser_txdef.h
@@ -73,8 +73,8 @@ typedef enum {
     Configure_AddHotKey = 2004,
     Configure_RemoveHotKey = 2005,
     Configure_SetDissolvedTimestamp = 2006,
-    Configure_JoinCommunityFund = 2007,
-    Configure_LeaveCommunityFund = 2008,
+    Configure_JoinNeuronsFund = 2007,
+    Configure_LeaveNeuronsFund = 2008,
     Configure_ChangeAutoStakeMaturity = 2009,
 
 ////
@@ -94,8 +94,8 @@ typedef enum {
     Configure_StartDissolvingCandid = 1004,
     Configure_StopDissolvingCandid = 1005,
     DisburseCandid = 1006,
-    Configure_JoinCommunityFundCandid = 1007,
-    Configure_LeaveCommunityFundCandid = 1008,
+    Configure_JoinNeuronsFundCandid = 1007,
+    Configure_LeaveNeuronsFundCandid = 1008,
     Configure_AddHotkeyCandid = 1009,
     Configure_RemoveHotkeyCandid = 1010,
     RegisterVoteCandid = 1011,

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/deps/nanopb b/deps/nanopb
diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk
diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk
diff --git a/tests/manual.json b/tests/manual.json
@@ -9349,20 +9349,20 @@
     "output": ["0 | Transaction type : Claim Neurons"]
   },
   {
-    "name": "Join Community Fund",
+    "name": "Join Neurons Fund",
     "index": 1040,
     "blob": "d9d9f7a167636f6e74656e74a663617267486202107b12023a006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b16ba67d2b864bf406b6d6574686f645f6e616d65706d616e6167655f6e6575726f6e5f70626c726571756573745f747970656463616c6c6673656e646572581dd899978f029508f4fa5fce3d2539de5aade6d229efcc458233deee7502",
     "output": [
-      "0 | Transaction type : Join Community     Fund",
+      "0 | Transaction type : Join Neurons' Fund",
       "1 | Neuron ID : 123"
     ]
   },
   {
-    "name": "Join Community Fund",
+    "name": "Join Neurons Fund",
     "index": 1041,
     "blob": "d9d9f7a167636f6e74656e74a66361726749620310c80312023a006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b16ba68220c1cfe006b6d6574686f645f6e616d65706d616e6167655f6e6575726f6e5f70626c726571756573745f747970656463616c6c6673656e646572581dd899978f029508f4fa5fce3d2539de5aade6d229efcc458233deee7502",
     "output": [
-      "0 | Transaction type : Join Community     Fund",
+      "0 | Transaction type : Join Neurons' Fund",
       "1 | Neuron ID : 456"
     ]
   }
+6 −1		app/ui/view_stax.c
+1 −1		dockerized_build.mk
+1 −3		include/zxmacros_ledger.h
+1 −1		include/zxversion.h
+10 −0		docs/migration.md
+1 −1		docs/reference.md
+17 −2		generator/nanopb_generator.py
+2 −0		tests/enum_sizes/SConscript
+35 −0		tests/enum_sizes/enumsizes.proto
+16 −0		tests/enum_sizes/enumsizes_intsize_unittests.cc
+3 −0		tests/enum_sizes/enumsizes_intsize_unittests.h
+3 −0		tests/enum_sizes/enumsizes_unittests.c