Compare commits
1 commit
master
...
hotfix/son
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a04f768abf |
2 changed files with 27 additions and 6 deletions
|
|
@ -181,19 +181,19 @@ namespace graphene { namespace chain {
|
||||||
inline uint32_t son_vesting_period()const {
|
inline uint32_t son_vesting_period()const {
|
||||||
return extensions.value.son_vesting_period.valid() ? *extensions.value.son_vesting_period : SON_VESTING_PERIOD; /// current period start date
|
return extensions.value.son_vesting_period.valid() ? *extensions.value.son_vesting_period : SON_VESTING_PERIOD; /// current period start date
|
||||||
}
|
}
|
||||||
inline uint16_t son_pay_max()const {
|
inline uint32_t son_pay_max()const {
|
||||||
return extensions.value.son_pay_max.valid() ? *extensions.value.son_pay_max : SON_PAY_MAX;
|
return extensions.value.son_pay_max.valid() ? *extensions.value.son_pay_max : SON_PAY_MAX;
|
||||||
}
|
}
|
||||||
inline uint16_t son_pay_time()const {
|
inline uint32_t son_pay_time()const {
|
||||||
return extensions.value.son_pay_time.valid() ? *extensions.value.son_pay_time : SON_PAY_TIME;
|
return extensions.value.son_pay_time.valid() ? *extensions.value.son_pay_time : SON_PAY_TIME;
|
||||||
}
|
}
|
||||||
inline uint16_t son_deregister_time()const {
|
inline uint32_t son_deregister_time()const {
|
||||||
return extensions.value.son_deregister_time.valid() ? *extensions.value.son_deregister_time : SON_DEREGISTER_TIME;
|
return extensions.value.son_deregister_time.valid() ? *extensions.value.son_deregister_time : SON_DEREGISTER_TIME;
|
||||||
}
|
}
|
||||||
inline uint16_t son_heartbeat_frequency()const {
|
inline uint32_t son_heartbeat_frequency()const {
|
||||||
return extensions.value.son_heartbeat_frequency.valid() ? *extensions.value.son_heartbeat_frequency : SON_HEARTBEAT_FREQUENCY;
|
return extensions.value.son_heartbeat_frequency.valid() ? *extensions.value.son_heartbeat_frequency : SON_HEARTBEAT_FREQUENCY;
|
||||||
}
|
}
|
||||||
inline uint16_t son_down_time()const {
|
inline uint32_t son_down_time()const {
|
||||||
return extensions.value.son_down_time.valid() ? *extensions.value.son_down_time : SON_DOWN_TIME;
|
return extensions.value.son_down_time.valid() ? *extensions.value.son_down_time : SON_DOWN_TIME;
|
||||||
}
|
}
|
||||||
inline uint16_t son_bitcoin_min_tx_confirmations()const {
|
inline uint16_t son_bitcoin_min_tx_confirmations()const {
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,27 @@ namespace graphene
|
||||||
int first_allowed_op = operation::tag<custom_permission_create_operation>::value;
|
int first_allowed_op = operation::tag<custom_permission_create_operation>::value;
|
||||||
switch (op_type)
|
switch (op_type)
|
||||||
{
|
{
|
||||||
|
case operation::tag<son_create_operation>::value:
|
||||||
|
case operation::tag<son_update_operation>::value:
|
||||||
|
case operation::tag<son_deregister_operation>::value:
|
||||||
|
case operation::tag<son_heartbeat_operation>::value:
|
||||||
|
case operation::tag<son_report_down_operation>::value:
|
||||||
|
case operation::tag<son_maintenance_operation>::value:
|
||||||
|
case operation::tag<son_wallet_recreate_operation>::value:
|
||||||
|
case operation::tag<son_wallet_update_operation>::value:
|
||||||
|
case operation::tag<son_wallet_deposit_create_operation>::value:
|
||||||
|
case operation::tag<son_wallet_deposit_process_operation>::value:
|
||||||
|
case operation::tag<son_wallet_withdraw_create_operation>::value:
|
||||||
|
case operation::tag<son_wallet_withdraw_process_operation>::value:
|
||||||
|
case operation::tag<sidechain_address_add_operation>::value:
|
||||||
|
case operation::tag<sidechain_address_update_operation>::value:
|
||||||
|
case operation::tag<sidechain_address_delete_operation>::value:
|
||||||
|
case operation::tag<sidechain_transaction_create_operation>::value:
|
||||||
|
case operation::tag<sidechain_transaction_sign_operation>::value:
|
||||||
|
case operation::tag<sidechain_transaction_send_operation>::value:
|
||||||
|
case operation::tag<sidechain_transaction_settle_operation>::value:
|
||||||
|
FC_ASSERT(block_time >= HARDFORK_SON_TIME, "Custom permissions and roles not allowed on this operation yet!");
|
||||||
|
break;
|
||||||
case operation::tag<custom_permission_create_operation>::value:
|
case operation::tag<custom_permission_create_operation>::value:
|
||||||
case operation::tag<custom_permission_update_operation>::value:
|
case operation::tag<custom_permission_update_operation>::value:
|
||||||
case operation::tag<custom_permission_delete_operation>::value:
|
case operation::tag<custom_permission_delete_operation>::value:
|
||||||
|
|
@ -45,4 +66,4 @@ namespace graphene
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace chain
|
} // namespace chain
|
||||||
} // namespace graphene
|
} // namespace graphene
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue