Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(platform)!: state transition fee increase and priorities #1750

Merged
merged 28 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3016cf8
feat: fee multiplier and priorities
QuantumExplorer Mar 7, 2024
310fff6
fmt
QuantumExplorer Mar 7, 2024
c701280
fee multipler to use u16
QuantumExplorer Mar 7, 2024
015b3c9
Merge branch 'v1.0-dev' into feat/feeMultiplierAndPriorities
QuantumExplorer Mar 7, 2024
af3899a
increased size of state transition
QuantumExplorer Mar 7, 2024
0929e27
Merge branch 'feat/feeMultiplierAndPriorities' of github.com:dashpay/…
QuantumExplorer Mar 7, 2024
e5e35e1
renamed things
QuantumExplorer Mar 8, 2024
4325229
renamed things
QuantumExplorer Mar 8, 2024
e0a3d18
renamed things
QuantumExplorer Mar 8, 2024
b43bd89
changed an add to a saturating add
QuantumExplorer Mar 8, 2024
94180de
renamed things
QuantumExplorer Mar 8, 2024
f6a6c60
renamed things
QuantumExplorer Mar 8, 2024
cb75e18
renamed things
QuantumExplorer Mar 8, 2024
ebe433e
renamed things
QuantumExplorer Mar 8, 2024
e62e7cb
Merge branch 'v1.0-dev' into feat/feeMultiplierAndPriorities
QuantumExplorer Mar 8, 2024
55f6264
Merge branch 'v1.0-dev' into feat/feeMultiplierAndPriorities
QuantumExplorer Mar 8, 2024
69785be
fmt
QuantumExplorer Mar 8, 2024
b4f7c84
Merge branch 'feat/feeMultiplierAndPriorities' of github.com:dashpay/…
QuantumExplorer Mar 8, 2024
266948a
added comment
QuantumExplorer Mar 8, 2024
cc8bfdf
fixed priority test
QuantumExplorer Mar 8, 2024
97d8d5d
Merge branch 'v1.0-dev' into feat/feeMultiplierAndPriorities
QuantumExplorer Mar 8, 2024
668a1de
renamed variable
QuantumExplorer Mar 8, 2024
1469f6c
fmt
QuantumExplorer Mar 8, 2024
a798fac
rename
QuantumExplorer Mar 8, 2024
d8b85c9
rename
QuantumExplorer Mar 8, 2024
1355e5a
rename
QuantumExplorer Mar 8, 2024
aa1b85e
fixed a test
QuantumExplorer Mar 8, 2024
68a07c4
fixed a test
QuantumExplorer Mar 8, 2024
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
Prev Previous commit
Next Next commit
renamed things
  • Loading branch information
QuantumExplorer committed Mar 8, 2024
commit e0a3d1888a5fff292047c1ae96884fa0dbc2d8e6
2 changes: 1 addition & 1 deletion packages/rs-dpp/src/document/document_factory/v0/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl DocumentFactoryV0 {
Ok(DocumentsBatchTransitionV0 {
owner_id,
transitions,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: Default::default(),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ impl SpecializedDocumentFactoryV0 {
Ok(DocumentsBatchTransitionV0 {
owner_id,
transitions,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: Default::default(),
}
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-dpp/src/state_transition/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ impl StateTransition {

/// returns the fee_multiplier
pub fn fee_multiplier(&self) -> UserFeeIncrease {
call_method!(self, fee_multiplier)
call_method!(self, user_fee_increase)
}

/// The transaction id is a single hash of the data with the signature
Expand Down
10 changes: 5 additions & 5 deletions packages/rs-dpp/src/state_transition/serialization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ mod tests {
let identity_topup_transition = IdentityTopUpTransitionV0 {
asset_lock_proof: AssetLockProof::Instant(asset_lock_proof),
identity_id: identity.id(),
fee_multiplier: 0,
user_fee_increase: 0,
signature: [1u8; 65].to_vec().into(),
};
let state_transition: StateTransition = identity_topup_transition.into();
Expand Down Expand Up @@ -126,7 +126,7 @@ mod tests {
add_public_keys: add_public_keys_in_creation,
disable_public_keys: vec![],
public_keys_disabled_at: None,
fee_multiplier: 0,
user_fee_increase: 0,
};

let key_signable_bytes = identity_update_transition
Expand Down Expand Up @@ -194,7 +194,7 @@ mod tests {
add_public_keys: add_public_keys_in_creation,
disable_public_keys: vec![3, 4, 5],
public_keys_disabled_at: Some(15),
fee_multiplier: 0,
user_fee_increase: 0,
};

let key_signable_bytes = identity_update_transition
Expand Down Expand Up @@ -249,7 +249,7 @@ mod tests {
pooling: Pooling::Standard,
output_script: CoreScript::from_bytes((0..23).collect::<Vec<u8>>()),
nonce: 1,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: [1u8; 65].to_vec().into(),
};
Expand Down Expand Up @@ -300,7 +300,7 @@ mod tests {
.data_contract_owned()
.try_into_platform_versioned(platform_version)
.expect("expected a data contract"),
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: [1u8; 65].to_vec().into(),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ impl StateTransitionLike for DataContractCreateTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
DataContractCreateTransition::V0(transition) => transition.fee_multiplier(),
DataContractCreateTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use crate::version::PlatformVersion;
pub struct DataContractCreateTransitionV0 {
pub data_contract: DataContractInSerializationFormat,
pub identity_nonce: IdentityNonce,
pub fee_multiplier: UserFeeIncrease,
pub user_fee_increase: UserFeeIncrease,
#[platform_signable(exclude_from_sig_hash)]
pub signature_public_key_id: KeyID,
#[platform_signable(exclude_from_sig_hash)]
Expand Down Expand Up @@ -68,7 +68,7 @@ impl TryFromPlatformVersioned<DataContract> for DataContractCreateTransitionV0 {
Ok(DataContractCreateTransitionV0 {
data_contract: value.try_into_platform_versioned(platform_version)?,
identity_nonce: Default::default(),
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: Default::default(),
})
Expand All @@ -86,7 +86,7 @@ impl TryFromPlatformVersioned<CreatedDataContract> for DataContractCreateTransit
Ok(DataContractCreateTransitionV0 {
data_contract: data_contract.try_into_platform_versioned(platform_version)?,
identity_nonce,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: Default::default(),
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ impl StateTransitionLike for DataContractCreateTransitionV0 {
)]
}

fn fee_multiplier(&self) -> UserFeeIncrease {
self.fee_multiplier
fn user_fee_increase(&self) -> UserFeeIncrease {
self.user_fee_increase
}

fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) {
self.fee_multiplier = fee_multiplier
self.user_fee_increase = fee_multiplier
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl DataContractCreateTransitionMethodsV0 for DataContractCreateTransitionV0 {
let transition = DataContractCreateTransition::V0(DataContractCreateTransitionV0 {
data_contract: data_contract.try_into_platform_versioned(platform_version)?,
identity_nonce,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: key_id,
signature: Default::default(),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 {
platform_version,
)?
.try_into_platform_versioned(platform_version)?,
fee_multiplier: raw_object
user_fee_increase: raw_object
.get_optional_integer(FEE_MULTIPLIER)
.map_err(ProtocolError::ValueError)?
.unwrap_or_default(),
Expand Down Expand Up @@ -76,7 +76,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractCreateTransitionV0 {
platform_version,
)?
.try_into_platform_versioned(platform_version)?,
fee_multiplier: raw_value_map
user_fee_increase: raw_value_map
.remove_optional_integer(FEE_MULTIPLIER)
.map_err(ProtocolError::ValueError)?
.unwrap_or_default(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ impl StateTransitionLike for DataContractUpdateTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
DataContractUpdateTransition::V0(transition) => transition.fee_multiplier(),
DataContractUpdateTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub struct DataContractUpdateTransitionV0 {
)]
pub identity_contract_nonce: IdentityNonce,
pub data_contract: DataContractInSerializationFormat,
pub fee_multiplier: UserFeeIncrease,
pub user_fee_increase: UserFeeIncrease,
#[platform_signable(exclude_from_sig_hash)]
pub signature_public_key_id: KeyID,
#[platform_signable(exclude_from_sig_hash)]
Expand All @@ -54,7 +54,7 @@ impl TryFromPlatformVersioned<(DataContract, IdentityNonce)> for DataContractUpd
Ok(DataContractUpdateTransitionV0 {
identity_contract_nonce: value.1,
data_contract: value.0.try_into_platform_versioned(platform_version)?,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: 0,
signature: Default::default(),
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ impl StateTransitionLike for DataContractUpdateTransitionV0 {
)]
}

fn fee_multiplier(&self) -> UserFeeIncrease {
self.fee_multiplier
fn user_fee_increase(&self) -> UserFeeIncrease {
self.user_fee_increase
}

fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) {
self.fee_multiplier = fee_multiplier
self.user_fee_increase = fee_multiplier
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl DataContractUpdateTransitionMethodsV0 for DataContractUpdateTransitionV0 {
let transition = DataContractUpdateTransition::V0(DataContractUpdateTransitionV0 {
identity_contract_nonce,
data_contract: data_contract.try_into_platform_versioned(platform_version)?,
fee_multiplier,
user_fee_increase: fee_multiplier,
signature_public_key_id: key_id,
signature: Default::default(),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 {
platform_version,
)?
.try_into_platform_versioned(platform_version)?,
fee_multiplier: raw_object
user_fee_increase: raw_object
.get_optional_integer(FEE_MULTIPLIER)
.map_err(ProtocolError::ValueError)?
.unwrap_or_default(),
Expand Down Expand Up @@ -116,7 +116,7 @@ impl<'a> StateTransitionValueConvert<'a> for DataContractUpdateTransitionV0 {
platform_version,
)?
.try_into_platform_versioned(platform_version)?,
fee_multiplier: raw_value_map
user_fee_increase: raw_value_map
.remove_optional_integer(FEE_MULTIPLIER)
.map_err(ProtocolError::ValueError)?
.unwrap_or_default(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ impl StateTransitionLike for DocumentsBatchTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
DocumentsBatchTransition::V0(transition) => transition.fee_multiplier(),
DocumentsBatchTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize};
pub struct DocumentsBatchTransitionV0 {
pub owner_id: Identifier,
pub transitions: Vec<DocumentTransition>,
pub fee_multiplier: UserFeeIncrease,
pub user_fee_increase: UserFeeIncrease,
#[platform_signable(exclude_from_sig_hash)]
pub signature_public_key_id: KeyID,
#[platform_signable(exclude_from_sig_hash)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ impl StateTransitionLike for DocumentsBatchTransitionV0 {
.collect()
}

fn fee_multiplier(&self) -> UserFeeIncrease {
self.fee_multiplier
fn user_fee_increase(&self) -> UserFeeIncrease {
self.user_fee_increase
}

fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) {
self.fee_multiplier = fee_multiplier
self.user_fee_increase = fee_multiplier
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 {
let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 {
owner_id,
transitions: vec![create_transition.into()],
fee_multiplier,
user_fee_increase: fee_multiplier,
signature_public_key_id: 0,
signature: Default::default(),
}
Expand Down Expand Up @@ -93,7 +93,7 @@ impl DocumentsBatchTransitionMethodsV0 for DocumentsBatchTransitionV0 {
let documents_batch_transition: DocumentsBatchTransition = DocumentsBatchTransitionV0 {
owner_id,
transitions: vec![replace_transition.into()],
fee_multiplier,
user_fee_increase: fee_multiplier,
signature_public_key_id: 0,
signature: Default::default(),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ impl StateTransitionLike for IdentityCreateTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
IdentityCreateTransition::V0(transition) => transition.fee_multiplier(),
IdentityCreateTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl StateTransitionLike for IdentityCreateTransitionV0 {
vec![base64::encode(self.identity_id)]
}

fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
self.fee_multiplier
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ impl StateTransitionLike for IdentityCreditTransferTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
IdentityCreditTransferTransition::V0(transition) => transition.fee_multiplier(),
IdentityCreditTransferTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub struct IdentityCreditTransferTransitionV0 {
pub recipient_id: Identifier,
pub amount: u64,
pub nonce: IdentityNonce,
pub fee_multiplier: UserFeeIncrease,
pub user_fee_increase: UserFeeIncrease,
#[platform_signable(exclude_from_sig_hash)]
pub signature_public_key_id: KeyID,
#[platform_signable(exclude_from_sig_hash)]
Expand Down Expand Up @@ -79,7 +79,7 @@ mod test {
recipient_id: Identifier::random(),
amount: rng.gen(),
nonce: 1,
fee_multiplier: 0,
user_fee_increase: 0,
signature_public_key_id: rng.gen(),
signature: [0; 65].to_vec().into(),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ impl StateTransitionLike for IdentityCreditTransferTransitionV0 {
)]
}

fn fee_multiplier(&self) -> UserFeeIncrease {
self.fee_multiplier
fn user_fee_increase(&self) -> UserFeeIncrease {
self.user_fee_increase
}

fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) {
self.fee_multiplier = fee_multiplier
self.user_fee_increase = fee_multiplier
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransition {
}

/// returns the fee multiplier
fn fee_multiplier(&self) -> UserFeeIncrease {
fn user_fee_increase(&self) -> UserFeeIncrease {
match self {
IdentityCreditWithdrawalTransition::V0(transition) => transition.fee_multiplier(),
IdentityCreditWithdrawalTransition::V0(transition) => transition.user_fee_increase(),
}
}
/// set a fee multiplier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub struct IdentityCreditWithdrawalTransitionV0 {
pub pooling: Pooling,
pub output_script: CoreScript,
pub nonce: IdentityNonce,
pub fee_multiplier: UserFeeIncrease,
pub user_fee_increase: UserFeeIncrease,
#[platform_signable(exclude_from_sig_hash)]
pub signature_public_key_id: KeyID,
#[platform_signable(exclude_from_sig_hash)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ impl StateTransitionLike for IdentityCreditWithdrawalTransitionV0 {
)]
}

fn fee_multiplier(&self) -> UserFeeIncrease {
self.fee_multiplier
fn user_fee_increase(&self) -> UserFeeIncrease {
self.user_fee_increase
}

fn set_fee_multiplier(&mut self, fee_multiplier: UserFeeIncrease) {
self.fee_multiplier = fee_multiplier
self.user_fee_increase = fee_multiplier
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl IdentityCreditWithdrawalTransitionMethodsV0 for IdentityCreditWithdrawalTra
pooling,
output_script,
nonce,
fee_multiplier,
user_fee_increase: fee_multiplier,
signature_public_key_id: 0,
signature: Default::default(),
}
Expand Down
Loading
Loading