Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl TokenTransferTransitionActionValidation for TokenTransferTransitionAction {
.validation_and_processing
.state_transitions
.batch_state_transition
.token_issuance_transition_state_validation
.token_transfer_transition_state_validation
{
0 => self.validate_state_v0(
platform,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ impl TokenTransferTransitionActionStateValidationV0 for TokenTransferTransitionA
platform_version,
)?
.unwrap_or_default();

execution_context.add_operation(ValidationOperation::RetrieveIdentityTokenBalance);

if balance < self.amount() {
return Ok(SimpleConsensusValidationResult::new_with_error(
ConsensusError::StateError(StateError::IdentityDoesNotHaveEnoughTokenBalanceError(
Expand All @@ -83,9 +85,11 @@ impl TokenTransferTransitionActionStateValidationV0 for TokenTransferTransitionA
transaction,
platform_version,
)?;

execution_context.add_operation(ValidationOperation::PrecalculatedOperation(fee_result));

if let Some(info) = info {
if info.frozen() == true {
if info.frozen() {
return Ok(SimpleConsensusValidationResult::new_with_error(
ConsensusError::StateError(StateError::IdentityTokenAccountFrozenError(
IdentityTokenAccountFrozenError::new(
Expand All @@ -98,6 +102,32 @@ impl TokenTransferTransitionActionStateValidationV0 for TokenTransferTransitionA
}
};

// We need to verify that account we are transferring to not frozen
let (info, fee_result) = platform.drive.fetch_identity_token_info_with_costs(
self.token_id().to_buffer(),
self.recipient_id().to_buffer(),
block_info,
true,
transaction,
platform_version,
)?;

execution_context.add_operation(ValidationOperation::PrecalculatedOperation(fee_result));

if let Some(info) = info {
if info.frozen() {
return Ok(SimpleConsensusValidationResult::new_with_error(
ConsensusError::StateError(StateError::IdentityTokenAccountFrozenError(
IdentityTokenAccountFrozenError::new(
self.token_id(),
self.recipient_id(),
"transfer".to_string(),
),
)),
));
}
};

// We need to verify that the token is not paused
let (token_status, fee_result) = platform.drive.fetch_token_status_with_costs(
self.token_id().to_buffer(),
Expand All @@ -106,7 +136,9 @@ impl TokenTransferTransitionActionStateValidationV0 for TokenTransferTransitionA
transaction,
platform_version,
)?;

execution_context.add_operation(ValidationOperation::PrecalculatedOperation(fee_result));

if let Some(status) = token_status {
if status.paused() {
return Ok(SimpleConsensusValidationResult::new_with_error(
Expand Down
Loading