diff --git a/app/Makefile.version b/app/Makefile.version index 94f877f9..3dea5a4e 100644 --- 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 index 881cc4d1..30e97c13 100644 --- 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 index e6820f2f..d865a156 100644 --- 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 index 9c6cbf0c..d47bdfab 100644 --- 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 index 04201f02..03821d28 100644 --- 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 index 7ad3f970..19bebb2b 100644 --- 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 index 99fb949f..dfa98dae 100644 --- 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 index ad64dd41..dfcc256f 100644 --- 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 index 2f509248..bae8872f 160000 --- a/deps/ledger-zxlib +++ b/deps/ledger-zxlib @@ -1 +1 @@ -Subproject commit 2f509248f5e4e273b9793c8cc609a79dfdeadef9 +Subproject commit bae8872fb572e3fb79f34813800c7981d4d01050 diff --git a/deps/nanopb b/deps/nanopb index 37bea38a..75751dff 160000 --- a/deps/nanopb +++ b/deps/nanopb @@ -1 +1 @@ -Subproject commit 37bea38a137dda4d90433fe91ac88b671035a5e1 +Subproject commit 75751dff32aa8f1a26ed57e39803f96e287c83b7 diff --git a/deps/nanos-secure-sdk b/deps/nanos-secure-sdk index 8663123a..ba973f5f 160000 --- a/deps/nanos-secure-sdk +++ b/deps/nanos-secure-sdk @@ -1 +1 @@ -Subproject commit 8663123a243894bb1652685e44a787f7df1b9447 +Subproject commit ba973f5f4be506e93fe51e1114b9a3ac93adab2a diff --git a/deps/stax-secure-sdk b/deps/stax-secure-sdk index a6096028..17b23ed9 160000 --- a/deps/stax-secure-sdk +++ b/deps/stax-secure-sdk @@ -1 +1 @@ -Subproject commit a60960287e6d7a93d246a6d93a5aa2a7d9ab6989 +Subproject commit 17b23ed97e996d13d1a9c52bd2a7c222a25649a2 diff --git a/tests/manual.json b/tests/manual.json index bd16cf6c..21958e8c 100644 --- 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" ] } diff --git a/tests/phase2.json b/tests/phase2.json index 4bbb69c0..879d61f9 100644 --- a/tests/phase2.json +++ b/tests/phase2.json @@ -190,28 +190,28 @@ }, { "index": 18, - "name": "Leave Community Fund", + "name": "Leave Neurons Fund", "blob": "d9d9f7a167636f6e74656e74a6636172675903764449444c496c01dbb701786e006e796e686e786c03bc949d820302dbe2be950903ef9999fe09046c01b9ef938008786d006c02afa3bda10175c2cee0d80c076c006c029cb1fa2503ba89e5c204786b039ef5cc0f099992ccd0010adae1c99903786e0b6c01d7ab010c6c01f6b0989a08036c018eddc3a60d036c018dc3b2b303796c01c88ecad50a786b0896a7f7150ef381d4ab020fb09b9ba40709d0fb87af070990f29afe0710e4ac938d0c09f7aacfd80d09c3a2f6c90e116e126c01a78882820a136c02ea99cff20475b2b8d4960b016c01c38fbbd10b016c05f5bbe3900178d2bbf0d9017eb9ef93800878dbe2be950903ef9999fe09786c04efd6e4027198abec810119b6f798b201c500a696a48708716e716c02cbe4fdc70471fc91f4f805196e1a6c02dbb70101bac7a7fa0d1b6c01b99d9da50b796d7b6c01cedfa0a8041e6e1f6c01e0a9b302786e216c02a9ddf49b0720d8a38ca80d226b0b9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106148db2d592091598a5d0c7091691b2fab80a17e0f8fffd0b1889b8b3b30e1da3f3c0ad0f236e246b02cd8e8eb9041ecebee1d308006e266c03dbb70101cbe2b58b0825f1bb8b880d276c02e4d7bee905758effd6e90e1e6c02dbb701039df1afe707206e2a6c01f5bbe39001786c01a9ddf49b07206b02fdf59aec0b2ce3b586ff0c2d6e2e6c03ce9ca6ce012bf382ccb3072fb9ef938008786c02f9889a5778b2cc99e705786e316c01edbb85f901326e336c02cfbe93a40434c796cdbe0b036c01c2cee0d80c076c02007501366d376c0184aead33386e7e6d306c02f8b9b6c9043aa4ccf7dd0a3b6c089eb493cf0378befa8dd40479be8fe6e30478ce89be97067886f998bc0978c5cae3d40a7893a190e00c78f5e1d0e70d786d686c018594e2c50b3e6b02bf80e42b2ac6a6e4b90a2a6ec0006c01f0a2cabb0bc1006c0196bdb4e904716b0b93a7e09d021cd881c9c40328d69ce79d0a2982ffcfaa0c309dfa94a40d35e3c3c5990e39b1a5aea10e3cf5d9d7a50e3dfad5ddf40e3fdb9cebf70ec200d6f4c7ff0fc3006ec4006b0b9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106148db2d592091598a5d0c7091691b2fab80a17e0f8fffd0b1889b8b3b30e1da3f3c0ad0f236ec6006c03dbb70101cbe2b58b08c700f1bb8b880d2701c8000100c8c056ea395dd501040106006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b170c1c3cac2b3a406b6d6574686f645f6e616d656d6d616e6167655f6e6575726f6e6c726571756573745f747970656463616c6c6673656e6465724104", "output": [ - "0 | Transaction type : Leave Community Fund", + "0 | Transaction type : Leave Neurons' Fund", "1 | Neuron ID : 15374508381553346560" ], "output_expert": [ - "0 | Transaction type : Leave Community Fund", + "0 | Transaction type : Leave Neurons' Fund", "1 | Neuron ID : 15374508381553346560" ], "valid": true }, { "index": 19, - "name": "Leave Community Fund", + "name": "Leave Neurons Fund", "blob": "d9d9f7a167636f6e74656e74a6636172675903764449444c496c01dbb701786e006e796e686e786c03bc949d820302dbe2be950903ef9999fe09046c01b9ef938008786d006c02afa3bda10175c2cee0d80c076c006c029cb1fa2503ba89e5c204786b039ef5cc0f099992ccd0010adae1c99903786e0b6c01d7ab010c6c01f6b0989a08036c018eddc3a60d036c018dc3b2b303796c01c88ecad50a786b0896a7f7150ef381d4ab020fb09b9ba40709d0fb87af070990f29afe0710e4ac938d0c09f7aacfd80d09c3a2f6c90e116e126c01a78882820a136c02ea99cff20475b2b8d4960b016c01c38fbbd10b016c05f5bbe3900178d2bbf0d9017eb9ef93800878dbe2be950903ef9999fe09786c04efd6e4027198abec810119b6f798b201c500a696a48708716e716c02cbe4fdc70471fc91f4f805196e1a6c02dbb70101bac7a7fa0d1b6c01b99d9da50b796d7b6c01cedfa0a8041e6e1f6c01e0a9b302786e216c02a9ddf49b0720d8a38ca80d226b0b9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106148db2d592091598a5d0c7091691b2fab80a17e0f8fffd0b1889b8b3b30e1da3f3c0ad0f236e246b02cd8e8eb9041ecebee1d308006e266c03dbb70101cbe2b58b0825f1bb8b880d276c02e4d7bee905758effd6e90e1e6c02dbb701039df1afe707206e2a6c01f5bbe39001786c01a9ddf49b07206b02fdf59aec0b2ce3b586ff0c2d6e2e6c03ce9ca6ce012bf382ccb3072fb9ef938008786c02f9889a5778b2cc99e705786e316c01edbb85f901326e336c02cfbe93a40434c796cdbe0b036c01c2cee0d80c076c02007501366d376c0184aead33386e7e6d306c02f8b9b6c9043aa4ccf7dd0a3b6c089eb493cf0378befa8dd40479be8fe6e30478ce89be97067886f998bc0978c5cae3d40a7893a190e00c78f5e1d0e70d786d686c018594e2c50b3e6b02bf80e42b2ac6a6e4b90a2a6ec0006c01f0a2cabb0bc1006c0196bdb4e904716b0b93a7e09d021cd881c9c40328d69ce79d0a2982ffcfaa0c309dfa94a40d35e3c3c5990e39b1a5aea10e3cf5d9d7a50e3dfad5ddf40e3fdb9cebf70ec200d6f4c7ff0fc3006ec4006b0b9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106148db2d592091598a5d0c7091691b2fab80a17e0f8fffd0b1889b8b3b30e1da3f3c0ad0f236ec6006c03dbb70101cbe2b58b08c700f1bb8b880d2701c8000100406c4830c8a17a01040106006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b170c1c3caca54c406b6d6574686f645f6e616d656d6d616e6167655f6e6575726f6e6c726571756573745f747970656463616c6c6673656e6465724104", "output": [ - "0 | Transaction type : Leave Community Fund", + "0 | Transaction type : Leave Neurons' Fund", "1 | Neuron ID : 8836564053576663040" ], "output_expert": [ - "0 | Transaction type : Leave Community Fund", + "0 | Transaction type : Leave Neurons' Fund", "1 | Neuron ID : 8836564053576663040" ], "valid": true @@ -824,27 +824,27 @@ }, { "index": 330, - "name": "Join Community Fund", + "name": "Join Neurons Fund", "blob": "d9d9f7a167636f6e74656e74a6636172675903e54449444c4e6c01dbb701786e006e796e686e786c03bc949d820302dbe2be950903ef9999fe09046c01b9ef938008786d006c02afa3bda10175c2cee0d80c076c006c029cb1fa2503ba89e5c204786b039ef5cc0f099992ccd0010adae1c99903786e0b6c01d7ab010c6c01f6b0989a08036c018eddc3a60d036c01d0e1e9f60c7e6c018dc3b2b303796c01c88ecad50a786b0996a7f7150ef381d4ab020f8cb2f18c0710b09b9ba40709d0fb87af070990f29afe0711e4ac938d0c09f7aacfd80d09c3a2f6c90e126e136c01a78882820a146c02ea99cff20475b2b8d4960b016c01c38fbbd10b016c05f5bbe3900178d2bbf0d9017eb9ef93800878dbe2be950903ef9999fe09786c04efd6e4027198abec81011ab6f798b201ca00a696a48708716e716c02cbe4fdc70471fc91f4f8051a6e1b6c02dbb70101bac7a7fa0d1c6c01bbb4b09703026c01b99d9da50b796d7b6c01cedfa0a804206e216c01e0a9b302786e236c02a9ddf49b0722d8a38ca80d246b0c9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106158db2d592091698a5d0c7091791b2fab80a18e0f8fffd0b198bf3afac0d1e89b8b3b30e1fa3f3c0ad0f256e266b02cd8e8eb90420cebee1d308006e286c03dbb70101cbe2b58b0827f1bb8b880d296c02e4d7bee905758effd6e90e206c02dbb701039df1afe707226e2c6c01f5bbe39001786c01a9ddf49b07226b02fdf59aec0b2ee3b586ff0c2f6e306c03ce9ca6ce012df382ccb30731b9ef938008786c07fed391bd0178dcd0a0ab0378dfbcb4d80478edc6ecab087993e5e481097890b090af0e78ca9ab7d20f786e336c03d889bea60d04b5f6f9e90e03c6f6ebeb0e346c02f9889a5778b2cc99e705786e366c01edbb85f901376e386c02cfbe93a40439c796cdbe0b036c01c2cee0d80c076c020075013b6d3c6c0184aead333d6e7e6d326c02f8b9b6c9043fa4ccf7dd0ac0006c089eb493cf0378befa8dd40479be8fe6e30478ce89be97067886f998bc0978c5cae3d40a7893a190e00c78f5e1d0e70d786d686c018594e2c50bc3006b02bf80e42b2cc6a6e4b90a2c6ec5006c01f0a2cabb0bc6006c0196bdb4e904716b0c93a7e09d021dd881c9c4032ad69ce79d0a2b82ffcfaa0c329e9598a00d359dfa94a40d3ae3c3c5990e3eb1a5aea10ec100f5d9d7a50ec200fad5ddf40ec400db9cebf70ec700d6f4c7ff0fc8006ec9006b0c9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106158db2d592091698a5d0c7091791b2fab80a18e0f8fffd0b198bf3afac0d1e89b8b3b30e1fa3f3c0ad0f256ecb006c03dbb70101cbe2b58b08cc00f1bb8b880d2901cd000100c8c056ea395dd501040106006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b174e7c84b93bb9406b6d6574686f645f6e616d656d6d616e6167655f6e6575726f6e6c726571756573745f747970656463616c6c6673656e646572581d19aa3d42c048dd7d14f0cfa0df69a1c1381780f6e9a137abaa6a82e302", "output": [ - "0 | Transaction type : Join Community Fund", + "0 | Transaction type : Join Neurons' Fund", "1 | Neuron ID : 15374508381553346560" ], "output_expert": [ - "0 | Transaction type : Join Community Fund", + "0 | Transaction type : Join Neurons' Fund", "1 | Neuron ID : 15374508381553346560" ] }, { "index": 331, - "name": "Join Community Fund", + "name": "Join Neurons Fund", "blob": "d9d9f7a167636f6e74656e74a6636172675903e54449444c4e6c01dbb701786e006e796e686e786c03bc949d820302dbe2be950903ef9999fe09046c01b9ef938008786d006c02afa3bda10175c2cee0d80c076c006c029cb1fa2503ba89e5c204786b039ef5cc0f099992ccd0010adae1c99903786e0b6c01d7ab010c6c01f6b0989a08036c018eddc3a60d036c01d0e1e9f60c7e6c018dc3b2b303796c01c88ecad50a786b0996a7f7150ef381d4ab020f8cb2f18c0710b09b9ba40709d0fb87af070990f29afe0711e4ac938d0c09f7aacfd80d09c3a2f6c90e126e136c01a78882820a146c02ea99cff20475b2b8d4960b016c01c38fbbd10b016c05f5bbe3900178d2bbf0d9017eb9ef93800878dbe2be950903ef9999fe09786c04efd6e4027198abec81011ab6f798b201ca00a696a48708716e716c02cbe4fdc70471fc91f4f8051a6e1b6c02dbb70101bac7a7fa0d1c6c01bbb4b09703026c01b99d9da50b796d7b6c01cedfa0a804206e216c01e0a9b302786e236c02a9ddf49b0722d8a38ca80d246b0c9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106158db2d592091698a5d0c7091791b2fab80a18e0f8fffd0b198bf3afac0d1e89b8b3b30e1fa3f3c0ad0f256e266b02cd8e8eb90420cebee1d308006e286c03dbb70101cbe2b58b0827f1bb8b880d296c02e4d7bee905758effd6e90e206c02dbb701039df1afe707226e2c6c01f5bbe39001786c01a9ddf49b07226b02fdf59aec0b2ee3b586ff0c2f6e306c03ce9ca6ce012df382ccb30731b9ef938008786c07fed391bd0178dcd0a0ab0378dfbcb4d80478edc6ecab087993e5e481097890b090af0e78ca9ab7d20f786e336c03d889bea60d04b5f6f9e90e03c6f6ebeb0e346c02f9889a5778b2cc99e705786e366c01edbb85f901376e386c02cfbe93a40439c796cdbe0b036c01c2cee0d80c076c020075013b6d3c6c0184aead333d6e7e6d326c02f8b9b6c9043fa4ccf7dd0ac0006c089eb493cf0378befa8dd40479be8fe6e30478ce89be97067886f998bc0978c5cae3d40a7893a190e00c78f5e1d0e70d786d686c018594e2c50bc3006b02bf80e42b2cc6a6e4b90a2c6ec5006c01f0a2cabb0bc6006c0196bdb4e904716b0c93a7e09d021dd881c9c4032ad69ce79d0a2b82ffcfaa0c329e9598a00d359dfa94a40d3ae3c3c5990e3eb1a5aea10ec100f5d9d7a50ec200fad5ddf40ec400db9cebf70ec700d6f4c7ff0fc8006ec9006b0c9b9cd0a40105bab5f1a40106918bacf10208fc9fc683050dc6b3bb9106158db2d592091698a5d0c7091791b2fab80a18e0f8fffd0b198bf3afac0d1e89b8b3b30e1fa3f3c0ad0f256ecb006c03dbb70101cbe2b58b08cc00f1bb8b880d2901cd000100406c4830c8a17a01040106006b63616e69737465725f69644a000000000000000101016e696e67726573735f6578706972791b174e7c84b9d44fc06b6d6574686f645f6e616d656d6d616e6167655f6e6575726f6e6c726571756573745f747970656463616c6c6673656e646572581d19aa3d42c048dd7d14f0cfa0df69a1c1381780f6e9a137abaa6a82e302", "output": [ - "0 | Transaction type : Join Community Fund", + "0 | Transaction type : Join Neurons' Fund", "1 | Neuron ID : 8836564053576663040" ], "output_expert": [ - "0 | Transaction type : Join Community Fund", + "0 | Transaction type : Join Neurons' Fund", "1 | Neuron ID : 8836564053576663040" ] }, @@ -1131,14 +1131,14 @@ "output": [ "0 | Transaction type : Follow", "1 | Neuron ID : 4053576662908", - "2 | Topic : SNS & Community Fund", + "2 | Topic : SNS & Neurons' Fund", "3 | Followees (1/2) : 999888123", "4 | Followees (2/2) : 3141242222" ], "output_expert": [ "0 | Transaction type : Follow", "1 | Neuron ID : 4053576662908", - "2 | Topic : SNS & Community Fund", + "2 | Topic : SNS & Neurons' Fund", "3 | Followees (1/2) : 999888123", "4 | Followees (2/2) : 3141242222" ] @@ -1190,7 +1190,7 @@ "output": [ "0 | Transaction type : Follow", "1 | Neuron ID : 999888123", - "2 | Topic : SNS & Community Fund", + "2 | Topic : SNS & Neurons' Fund", "3 | Followees (1/3) : 4053576662908", "4 | Followees (2/3) : 3141242222", "5 | Followees (3/3) : 8836564053576663040" @@ -1198,7 +1198,7 @@ "output_expert": [ "0 | Transaction type : Follow", "1 | Neuron ID : 999888123", - "2 | Topic : SNS & Community Fund", + "2 | Topic : SNS & Neurons' Fund", "3 | Followees (1/3) : 4053576662908", "4 | Followees (2/3) : 3141242222", "5 | Followees (3/3) : 8836564053576663040" diff --git a/tests_zemu/snapshots/s-candid_follow/00002.png b/tests_zemu/snapshots/s-candid_follow/00002.png index 05374c3c..7bf6776e 100644 Binary files a/tests_zemu/snapshots/s-candid_follow/00002.png and b/tests_zemu/snapshots/s-candid_follow/00002.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index f2a69b89..b03e61f1 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png index f2a69b89..b03e61f1 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/s-pb_join_community_fund/00000.png b/tests_zemu/snapshots/s-pb_join_community_fund/00000.png index a533af5a..282a3862 100644 Binary files a/tests_zemu/snapshots/s-pb_join_community_fund/00000.png and b/tests_zemu/snapshots/s-pb_join_community_fund/00000.png differ diff --git a/tests_zemu/snapshots/sp-candid_follow/00003.png b/tests_zemu/snapshots/sp-candid_follow/00003.png index 97723c04..d1a07a70 100644 Binary files a/tests_zemu/snapshots/sp-candid_follow/00003.png and b/tests_zemu/snapshots/sp-candid_follow/00003.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png index aa487f1a..d8c71c45 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png index aa487f1a..d8c71c45 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/sp-pb_join_community_fund/00001.png b/tests_zemu/snapshots/sp-pb_join_community_fund/00001.png index 97255d80..890d0a4c 100644 Binary files a/tests_zemu/snapshots/sp-pb_join_community_fund/00001.png and b/tests_zemu/snapshots/sp-pb_join_community_fund/00001.png differ diff --git a/tests_zemu/snapshots/st-candid_follow/00001.png b/tests_zemu/snapshots/st-candid_follow/00001.png index ffa41837..ca18801f 100644 Binary files a/tests_zemu/snapshots/st-candid_follow/00001.png and b/tests_zemu/snapshots/st-candid_follow/00001.png differ diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png index 5105f073..529c4ad8 100644 Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and b/tests_zemu/snapshots/st-mainmenu/00001.png differ diff --git a/tests_zemu/snapshots/st-pb_join_community_fund/00001.png b/tests_zemu/snapshots/st-pb_join_community_fund/00001.png index 7c0c3ccf..56dd49c2 100644 Binary files a/tests_zemu/snapshots/st-pb_join_community_fund/00001.png and b/tests_zemu/snapshots/st-pb_join_community_fund/00001.png differ diff --git a/tests_zemu/snapshots/x-candid_follow/00003.png b/tests_zemu/snapshots/x-candid_follow/00003.png index 97723c04..d1a07a70 100644 Binary files a/tests_zemu/snapshots/x-candid_follow/00003.png and b/tests_zemu/snapshots/x-candid_follow/00003.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index aa487f1a..d8c71c45 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png index aa487f1a..d8c71c45 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/x-pb_join_community_fund/00001.png b/tests_zemu/snapshots/x-pb_join_community_fund/00001.png index 97255d80..890d0a4c 100644 Binary files a/tests_zemu/snapshots/x-pb_join_community_fund/00001.png and b/tests_zemu/snapshots/x-pb_join_community_fund/00001.png differ