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

[rosetta] Allow commission percentage to be adjustable #6103

Merged
merged 1 commit into from Jan 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions crates/aptos-rosetta-cli/src/construction.rs
Expand Up @@ -316,6 +316,9 @@ pub struct CreateStakePoolCommand {
/// Amount
#[clap(long)]
amount: Option<u64>,
/// Commission percentage
#[clap(long)]
commission_percentage: Option<u64>,
}

impl CreateStakePoolCommand {
Expand All @@ -334,6 +337,7 @@ impl CreateStakePoolCommand {
self.operator,
self.voter,
self.amount,
self.commission_percentage,
self.txn_args.expiry_time()?,
self.txn_args.sequence_number,
self.txn_args.max_gas,
Expand Down
2 changes: 2 additions & 0 deletions crates/aptos-rosetta/src/client.rs
Expand Up @@ -355,6 +355,7 @@ impl RosettaClient {
new_operator: Option<AccountAddress>,
new_voter: Option<AccountAddress>,
stake_amount: Option<u64>,
commission_percentage: Option<u64>,
expiry_time_secs: u64,
sequence_number: Option<u64>,
max_gas: Option<u64>,
Expand All @@ -375,6 +376,7 @@ impl RosettaClient {
new_operator,
new_voter,
stake_amount,
commission_percentage,
)];

self.submit_operations(
Expand Down
2 changes: 2 additions & 0 deletions crates/aptos-rosetta/src/construction.rs
Expand Up @@ -790,13 +790,15 @@ pub fn parse_create_stake_pool_operation(
let operator = parse_function_arg("create_stake_pool", args, 0)?;
let voter = parse_function_arg("create_stake_pool", args, 1)?;
let amount: u64 = parse_function_arg("create_stake_pool", args, 2)?;
let commission_percentage: u64 = parse_function_arg("create_stake_pool", args, 3)?;
Ok(vec![Operation::create_stake_pool(
0,
None,
sender,
Some(operator),
Some(voter),
Some(amount),
Some(commission_percentage),
)])
}

Expand Down
12 changes: 10 additions & 2 deletions crates/aptos-rosetta/src/types/objects.rs
Expand Up @@ -197,14 +197,14 @@ impl Operation {
}
}

/// TODO: This is experimental and should not be used outside of testing
pub fn create_stake_pool(
operation_index: u64,
status: Option<OperationStatusType>,
owner: AccountAddress,
operator: Option<AccountAddress>,
voter: Option<AccountAddress>,
staked_balance: Option<u64>,
commission_percentage: Option<u64>,
) -> Operation {
Operation::new(
OperationType::InitializeStakePool,
Expand All @@ -216,6 +216,7 @@ impl Operation {
operator.map(AccountIdentifier::base_account),
voter.map(AccountIdentifier::base_account),
staked_balance,
commission_percentage,
)),
)
}
Expand Down Expand Up @@ -415,6 +416,8 @@ pub struct OperationMetadata {
pub new_voter: Option<AccountIdentifier>,
#[serde(skip_serializing_if = "Option::is_none")]
pub staked_balance: Option<U64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub commission_percentage: Option<U64>,
}

impl OperationMetadata {
Expand Down Expand Up @@ -450,11 +453,13 @@ impl OperationMetadata {
new_operator: Option<AccountIdentifier>,
new_voter: Option<AccountIdentifier>,
staked_balance: Option<u64>,
commission_percentage: Option<u64>,
) -> Self {
OperationMetadata {
new_operator,
new_voter,
staked_balance: staked_balance.map(U64::from),
commission_percentage: commission_percentage.map(U64::from),
..Default::default()
}
}
Expand Down Expand Up @@ -1376,6 +1381,7 @@ impl InternalOperation {
new_operator,
new_voter,
staked_balance,
commission_percentage,
..
}),
Some(account),
Expand All @@ -1398,7 +1404,9 @@ impl InternalOperation {
operator: operator_address,
voter: voter_address,
amount: staked_balance.map(u64::from).unwrap_or_default(),
commission_percentage: 0,
commission_percentage: commission_percentage
.map(u64::from)
.unwrap_or_default(),
seed: vec![],
}));
}
Expand Down
15 changes: 15 additions & 0 deletions testsuite/smoke-test/src/rosetta.rs
Expand Up @@ -926,6 +926,7 @@ async fn test_block() {
Some(account_id_2),
Some(account_id_2),
Some(100000000000000),
Some(5),
Duration::from_secs(5),
None,
None,
Expand Down Expand Up @@ -1604,6 +1605,18 @@ async fn parse_operations(
.unwrap()
.0;
assert_eq!(actual_stake_amount, stake);

let commission_percentage = operation
.metadata
.as_ref()
.unwrap()
.commission_percentage
.as_ref()
.unwrap()
.0;
let actual_commission: u64 =
bcs::from_bytes(payload.args().get(3).unwrap()).unwrap();
assert_eq!(actual_commission, commission_percentage);
} else {
panic!("Not an entry function");
}
Expand Down Expand Up @@ -2034,6 +2047,7 @@ async fn create_stake_pool_and_wait(
operator: Option<AccountAddress>,
voter: Option<AccountAddress>,
stake_amount: Option<u64>,
commission_percentage: Option<u64>,
txn_expiry_duration: Duration,
sequence_number: Option<u64>,
max_gas: Option<u64>,
Expand All @@ -2047,6 +2061,7 @@ async fn create_stake_pool_and_wait(
operator,
voter,
stake_amount,
commission_percentage,
expiry_time.as_secs(),
sequence_number,
max_gas,
Expand Down