Merge branch 'fix/FixStartAsPaused' of github.com:dashpay/platform into fix/FixStartAsPaused

Author: QuantumExplorer

packages/rs-dpp/src/errors/consensus/basic/token/invalid_token_amount_error.rs

@@ -9,7 +9,7 @@ use thiserror::Error;
     Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize,
 )]
 #[error(
-    "Invalid token amount {}, exceeds maximum allowed {}",
+    "Invalid token amount {}, should be between 1 and maximum allowed {}",
     token_amount,
     max_token_amount
 )]

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_burn_transition/validate_structure/v0/mod.rs

@@ -1,6 +1,7 @@
 use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError};
 use crate::consensus::basic::BasicError;
 use crate::consensus::ConsensusError;
+use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM;
 use crate::state_transition::batch_transition::token_burn_transition::v0::v0_methods::TokenBurnTransitionV0Methods;
 use crate::state_transition::batch_transition::TokenBurnTransition;
 use crate::tokens::MAX_TOKEN_NOTE_LEN;
@@ -12,10 +13,10 @@ pub(super) trait TokenBurnTransitionActionStructureValidationV0 {
 }
 impl TokenBurnTransitionActionStructureValidationV0 for TokenBurnTransition {
     fn validate_structure_v0(&self) -> Result<SimpleConsensusValidationResult, ProtocolError> {
-        if self.burn_amount() > i64::MAX as u64 {
+        if self.burn_amount() > MAX_DISTRIBUTION_PARAM || self.burn_amount() == 0 {
             return Ok(SimpleConsensusValidationResult::new_with_error(
                 ConsensusError::BasicError(BasicError::InvalidTokenAmountError(
-                    InvalidTokenAmountError::new(i64::MAX as u64, self.burn_amount()),
+                    InvalidTokenAmountError::new(MAX_DISTRIBUTION_PARAM, self.burn_amount()),
                 )),
             ));
         }

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_direct_purchase_transition/validate_structure/v0/mod.rs

@@ -12,7 +12,7 @@ pub(super) trait TokenDirectPurchaseTransitionActionStructureValidationV0 {
 }
 impl TokenDirectPurchaseTransitionActionStructureValidationV0 for TokenDirectPurchaseTransition {
     fn validate_structure_v0(&self) -> Result<SimpleConsensusValidationResult, ProtocolError> {
-        if self.token_count() > MAX_DISTRIBUTION_PARAM {
+        if self.token_count() > MAX_DISTRIBUTION_PARAM || self.token_count() == 0 {
             return Ok(SimpleConsensusValidationResult::new_with_error(
                 ConsensusError::BasicError(BasicError::InvalidTokenAmountError(
                     InvalidTokenAmountError::new(MAX_DISTRIBUTION_PARAM, self.token_count()),

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_mint_transition/validate_structure/v0/mod.rs

@@ -1,6 +1,7 @@
 use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError};
 use crate::consensus::basic::BasicError;
 use crate::consensus::ConsensusError;
+use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM;
 use crate::state_transition::batch_transition::token_mint_transition::v0::v0_methods::TokenMintTransitionV0Methods;
 use crate::state_transition::batch_transition::TokenMintTransition;
 use crate::tokens::MAX_TOKEN_NOTE_LEN;
@@ -12,10 +13,10 @@ pub(super) trait TokenMintTransitionActionStructureValidationV0 {
 }
 impl TokenMintTransitionActionStructureValidationV0 for TokenMintTransition {
     fn validate_structure_v0(&self) -> Result<SimpleConsensusValidationResult, ProtocolError> {
-        if self.amount() > i64::MAX as u64 {
+        if self.amount() > MAX_DISTRIBUTION_PARAM || self.amount() == 0 {
             return Ok(SimpleConsensusValidationResult::new_with_error(
                 ConsensusError::BasicError(BasicError::InvalidTokenAmountError(
-                    InvalidTokenAmountError::new(i64::MAX as u64, self.amount()),
+                    InvalidTokenAmountError::new(MAX_DISTRIBUTION_PARAM, self.amount()),
                 )),
             ));
         }

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/validate_structure/v0/mod.rs

@@ -2,6 +2,7 @@ use platform_value::Identifier;
 use crate::consensus::basic::BasicError;
 use crate::consensus::basic::token::{InvalidTokenAmountError, InvalidTokenNoteTooBigError, TokenTransferToOurselfError};
 use crate::consensus::ConsensusError;
+use crate::data_contract::associated_token::token_perpetual_distribution::distribution_function::MAX_DISTRIBUTION_PARAM;
 use crate::ProtocolError;
 use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors;
 use crate::state_transition::batch_transition::token_base_transition::v0::v0_methods::TokenBaseTransitionV0Methods;
@@ -21,10 +22,10 @@ impl TokenTransferTransitionActionStructureValidationV0 for TokenTransferTransit
         &self,
         owner_id: Identifier,
     ) -> Result<SimpleConsensusValidationResult, ProtocolError> {
-        if self.amount() > i64::MAX as u64 {
+        if self.amount() > MAX_DISTRIBUTION_PARAM || self.amount() == 0 {
             return Ok(SimpleConsensusValidationResult::new_with_error(
                 ConsensusError::BasicError(BasicError::InvalidTokenAmountError(
-                    InvalidTokenAmountError::new(i64::MAX as u64, self.amount()),
+                    InvalidTokenAmountError::new(MAX_DISTRIBUTION_PARAM, self.amount()),
                 )),
             ));
         }