Skip to content

Commit

Permalink
remove and rename some tx definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlosala @ftheirs
carlosala authored and ftheirs committed Mar 13, 2024
1 parent 454c852 commit 28bbe1b
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 78 deletions.
54 changes: 23 additions & 31 deletions app/src/parser_impl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@ parser_error_t getManageNeuronType(const parser_tx_t *v, manageNeuron_e *mn_type
const bool isSNS = v->tx_fields.call.is_sns;
switch (command->hash) {
case hash_command_Spawn:
*mn_type = SpawnCandid;
*mn_type = Spawn;
return parser_ok;
case hash_command_StakeMaturity:
*mn_type = isSNS ? SNS_StakeMaturity : StakeMaturityCandid;
*mn_type = isSNS ? SNS_StakeMaturity : StakeMaturity;
return parser_ok;
case hash_command_Split:
*mn_type = Split;
Expand All @@ -265,42 +265,42 @@ parser_error_t getManageNeuronType(const parser_tx_t *v, manageNeuron_e *mn_type
*mn_type = Merge;
return parser_ok;
case hash_command_RegisterVote:
*mn_type = RegisterVoteCandid;
*mn_type = RegisterVote;
return parser_ok;
case hash_command_Follow:
*mn_type = FollowCandid;
*mn_type = Follow;
return parser_ok;
case hash_command_Configure: {
if (!command->configure.has_operation) {
return parser_unexpected_value;
}
switch (command->configure.operation.hash) {
case hash_operation_SetDissolvedTimestamp:
*mn_type = isSNS ? SNS_Configure_SetDissolveDelay : Configure_SetDissolvedTimestamp;
*mn_type = isSNS ? SNS_Configure_SetDissolveDelay : Configure_SetDissolvedDelay;
break;
case hash_operation_LeaveNeuronsFund:
*mn_type = Configure_LeaveNeuronsFundCandid;
*mn_type = Configure_LeaveNeuronsFund;
break;
case hash_operation_ChangeAutoStakeMaturity:
*mn_type = Configure_ChangeAutoStakeMaturity;
break;
case hash_operation_IncreaseDissolveDelay:
*mn_type = Configure_IncreaseDissolveDelayCandid;
*mn_type = Configure_IncreaseDissolveDelay;
break;
case hash_operation_StartDissolving:
*mn_type = isSNS ? SNS_Configure_StartDissolving : Configure_StartDissolvingCandid;
*mn_type = isSNS ? SNS_Configure_StartDissolving : Configure_StartDissolving;
break;
case hash_operation_StopDissolving:
*mn_type = isSNS ? SNS_Configure_StopDissolving : Configure_StopDissolvingCandid;
*mn_type = isSNS ? SNS_Configure_StopDissolving : Configure_StopDissolving;
break;
case hash_operation_JoinNeuronsFund:
*mn_type = Configure_JoinNeuronsFundCandid;
*mn_type = Configure_JoinNeuronsFund;
break;
case hash_operation_AddHotkey:
*mn_type = Configure_AddHotkeyCandid;
*mn_type = Configure_AddHotkey;
break;
case hash_operation_RemoveHotkey:
*mn_type = Configure_RemoveHotkeyCandid;
*mn_type = Configure_RemoveHotkey;
break;
default:
return parser_unexpected_value;
Expand All @@ -314,7 +314,7 @@ parser_error_t getManageNeuronType(const parser_tx_t *v, manageNeuron_e *mn_type
*mn_type = SNS_RemoveNeuronPermissions;
return parser_ok;
case sns_hash_command_Disburse:
*mn_type = isSNS ? SNS_Disburse : DisburseCandid;
*mn_type = isSNS ? SNS_Disburse : Disburse;
return parser_ok;

default:
Expand Down Expand Up @@ -632,46 +632,38 @@ uint8_t getNumItemsManageNeurons(__Z_UNUSED const parser_context_t *c, const par
}

switch (mn_type) {
case Configure_StopDissolving :
case Configure_JoinNeuronsFund :
case Configure_LeaveNeuronsFund :
case Configure_JoinNeuronsFundCandid:
case Configure_LeaveNeuronsFundCandid:
case Configure_StartDissolving : {
return 2;
}
case Split:
case Merge:
case Configure_RemoveHotKey :
case Configure_AddHotKey :
case Configure_RemoveHotkeyCandid:
case Configure_AddHotkeyCandid:
case Configure_RemoveHotkey :
case Configure_AddHotkey :
case Configure_IncreaseDissolveDelay:
case Configure_IncreaseDissolveDelayCandid:
case Configure_ChangeAutoStakeMaturity:
case Configure_SetDissolvedTimestamp: {
case Configure_SetDissolvedDelay: {
return 3;
}
case SNS_Configure_SetDissolveDelay:
case RegisterVoteCandid:
case DisburseCandid: {
case RegisterVote:
case Disburse: {
return 4;
}
case SpawnCandid: {
case Spawn: {
// 2 fields + opt(percentage_to_spawn) + controller (opt or self) + opt(nonce)
return 3
+ (v->tx_fields.call.data.candid_manageNeuron.command.spawn.has_percentage_to_spawn ? 1 : 0)
+ (v->tx_fields.call.data.candid_manageNeuron.command.spawn.has_nonce ? 1 : 0);
}
case Configure_StartDissolvingCandid:
case Configure_StopDissolvingCandid:
case Configure_StartDissolving:
case Configure_StopDissolving:
return 2;
case StakeMaturityCandid:
case StakeMaturity:
// 2 fields + opt(percentage_to_stake)
return 2
+ (v->tx_fields.call.data.candid_manageNeuron.command.stake.has_percentage_to_stake ? 1 : 0);

case FollowCandid: {
case Follow: {
uint8_t followees_count = v->tx_fields.call.data.candid_manageNeuron.command.follow.followees_size;
return followees_count > 0 ? 3 + followees_count : 4;
}
Expand Down
26 changes: 13 additions & 13 deletions app/src/parser_print_candid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1201,13 +1201,13 @@ __Z_INLINE parser_error_t parser_getItemManageNeuron(const parser_context_t *ctx
CHECK_PARSER_ERR(getManageNeuronType(&parser_tx_obj, &mn_type))

switch (mn_type) {
case Configure_SetDissolvedTimestamp: {
case Configure_SetDissolvedDelay: {
return parser_getItemSetDissolveTimestamp(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case Configure_ChangeAutoStakeMaturity: {
return parser_getItemChangeAutoStakeMaturity(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case SpawnCandid: {
case Spawn: {
return parser_getItemSpawnCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case Split: {
Expand All @@ -1216,25 +1216,25 @@ __Z_INLINE parser_error_t parser_getItemManageNeuron(const parser_context_t *ctx
case Merge: {
return parser_getItemMerge(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case StakeMaturityCandid: {
case StakeMaturity: {
return parser_getItemStakeMaturityCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case DisburseCandid:
case Disburse:
return parser_getItemDisburseCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
case RegisterVoteCandid:
case RegisterVote:
return parser_getItemRegisterVoteCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
case FollowCandid:
case Follow:
return parser_getItemFollowCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
case Configure_IncreaseDissolveDelayCandid: {
case Configure_IncreaseDissolveDelay: {
return parser_getItemIncreaseDissolveDelayCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
}
case Configure_AddHotkeyCandid:
case Configure_RemoveHotkeyCandid:
case Configure_AddHotkey:
case Configure_RemoveHotkey:
return parser_getItemConfigureAddRemoveHotkeyCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
case Configure_JoinNeuronsFundCandid:
case Configure_LeaveNeuronsFundCandid:
case Configure_StartDissolvingCandid:
case Configure_StopDissolvingCandid:
case Configure_JoinNeuronsFund:
case Configure_LeaveNeuronsFund:
case Configure_StartDissolving:
case Configure_StopDissolving:
return parser_getItemConfigureNoElementsCandid(displayIdx, outKey, outKeyLen, outVal, outValLen, pageIdx, pageCount);
case SNS_Configure_StartDissolving:
case SNS_Configure_StopDissolving:
Expand Down
60 changes: 26 additions & 34 deletions app/src/parser_txdef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,40 +54,32 @@ typedef enum {
typedef enum {
wrong_operation = 0, //default is not accepted

Configure = 2,
Configure_IncreaseDissolveDelay = 2001,
Configure_StartDissolving = 2002,
Configure_StopDissolving = 2003,
Configure_AddHotKey = 2004,
Configure_RemoveHotKey = 2005,
Configure_SetDissolvedTimestamp = 2006,
Configure_JoinNeuronsFund = 2007,
Configure_LeaveNeuronsFund = 2008,
Configure_ChangeAutoStakeMaturity = 2009,

////
Split = 11,
Merge = 1000,
SpawnCandid = 1001,
StakeMaturityCandid = 1002,
Configure_IncreaseDissolveDelayCandid = 1003,
Configure_StartDissolvingCandid = 1004,
Configure_StopDissolvingCandid = 1005,
DisburseCandid = 1006,
Configure_JoinNeuronsFundCandid = 1007,
Configure_LeaveNeuronsFundCandid = 1008,
Configure_AddHotkeyCandid = 1009,
Configure_RemoveHotkeyCandid = 1010,
RegisterVoteCandid = 1011,
FollowCandid = 1012,

SNS_AddNeuronPermissions = 3000,
SNS_RemoveNeuronPermissions = 3001,
SNS_Configure_StartDissolving = 3002,
SNS_Configure_StopDissolving = 3003,
SNS_Disburse = 3004,
SNS_StakeMaturity = 3005,
SNS_Configure_SetDissolveDelay = 3006,
Merge = 1,
Spawn = 2,
Disburse = 3,
StakeMaturity = 4,
RegisterVote = 5,
Follow = 6,
Split = 7,

Configure_SetDissolvedDelay = 100,
Configure_IncreaseDissolveDelay = 101,
Configure_StartDissolving = 102,
Configure_StopDissolving = 103,
Configure_JoinNeuronsFund = 104,
Configure_LeaveNeuronsFund = 105,
Configure_AddHotkey = 106,
Configure_RemoveHotkey = 107,
Configure_ChangeAutoStakeMaturity = 108,

SNS_AddNeuronPermissions = 200,
SNS_RemoveNeuronPermissions = 201,
SNS_Disburse = 202,
SNS_StakeMaturity = 203,

SNS_Configure_StartDissolving = 300,
SNS_Configure_StopDissolving = 301,
SNS_Configure_SetDissolveDelay = 302,
} manageNeuron_e;

typedef enum {
Expand Down

0 comments on commit 28bbe1b

Please sign in to comment.