CLI: Support offline and nonced stake subcommands (#7831)
* Support durable nonce for staker-authorize-* * CLI: Factor out sign-only reply parsing to helper * Support offline signing for staker-authorize-*
This commit is contained in:
@ -200,6 +200,11 @@ pub enum CliCommand {
|
|||||||
new_authorized_pubkey: Pubkey,
|
new_authorized_pubkey: Pubkey,
|
||||||
stake_authorize: StakeAuthorize,
|
stake_authorize: StakeAuthorize,
|
||||||
authority: Option<KeypairEq>,
|
authority: Option<KeypairEq>,
|
||||||
|
sign_only: bool,
|
||||||
|
signers: Option<Vec<(Pubkey, Signature)>>,
|
||||||
|
blockhash: Option<Hash>,
|
||||||
|
nonce_account: Option<Pubkey>,
|
||||||
|
nonce_authority: Option<KeypairEq>,
|
||||||
},
|
},
|
||||||
WithdrawStake {
|
WithdrawStake {
|
||||||
stake_account_pubkey: Pubkey,
|
stake_account_pubkey: Pubkey,
|
||||||
@ -1356,6 +1361,11 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
|||||||
new_authorized_pubkey,
|
new_authorized_pubkey,
|
||||||
stake_authorize,
|
stake_authorize,
|
||||||
ref authority,
|
ref authority,
|
||||||
|
sign_only,
|
||||||
|
ref signers,
|
||||||
|
blockhash,
|
||||||
|
nonce_account,
|
||||||
|
ref nonce_authority,
|
||||||
} => process_stake_authorize(
|
} => process_stake_authorize(
|
||||||
&rpc_client,
|
&rpc_client,
|
||||||
config,
|
config,
|
||||||
@ -1363,6 +1373,11 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
|||||||
&new_authorized_pubkey,
|
&new_authorized_pubkey,
|
||||||
*stake_authorize,
|
*stake_authorize,
|
||||||
authority.as_deref(),
|
authority.as_deref(),
|
||||||
|
*sign_only,
|
||||||
|
signers,
|
||||||
|
*blockhash,
|
||||||
|
*nonce_account,
|
||||||
|
nonce_authority.as_deref(),
|
||||||
),
|
),
|
||||||
|
|
||||||
CliCommand::WithdrawStake {
|
CliCommand::WithdrawStake {
|
||||||
|
315
cli/src/stake.rs
315
cli/src/stake.rs
@ -236,6 +236,46 @@ impl StakeSubCommands for App<'_, '_> {
|
|||||||
.help("New authorized staker")
|
.help("New authorized staker")
|
||||||
)
|
)
|
||||||
.arg(stake_authority_arg())
|
.arg(stake_authority_arg())
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("sign_only")
|
||||||
|
.long("sign-only")
|
||||||
|
.takes_value(false)
|
||||||
|
.help("Sign the transaction offline"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("signer")
|
||||||
|
.long("signer")
|
||||||
|
.value_name("PUBKEY=BASE58_SIG")
|
||||||
|
.takes_value(true)
|
||||||
|
.validator(is_pubkey_sig)
|
||||||
|
.multiple(true)
|
||||||
|
.help("Provide a public-key/signature pair for the transaction"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("blockhash")
|
||||||
|
.long("blockhash")
|
||||||
|
.value_name("BLOCKHASH")
|
||||||
|
.takes_value(true)
|
||||||
|
.validator(is_hash)
|
||||||
|
.help("Use the supplied blockhash"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name(NONCE_ARG.name)
|
||||||
|
.long(NONCE_ARG.long)
|
||||||
|
.takes_value(true)
|
||||||
|
.value_name("PUBKEY")
|
||||||
|
.requires("blockhash")
|
||||||
|
.validator(is_pubkey)
|
||||||
|
.help(NONCE_ARG.help)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name(NONCE_AUTHORITY_ARG.name)
|
||||||
|
.long(NONCE_AUTHORITY_ARG.long)
|
||||||
|
.takes_value(true)
|
||||||
|
.requires(NONCE_ARG.name)
|
||||||
|
.validator(is_keypair_or_ask_keyword)
|
||||||
|
.help(NONCE_AUTHORITY_ARG.help)
|
||||||
|
),
|
||||||
)
|
)
|
||||||
.subcommand(
|
.subcommand(
|
||||||
SubCommand::with_name("stake-authorize-withdrawer")
|
SubCommand::with_name("stake-authorize-withdrawer")
|
||||||
@ -259,6 +299,46 @@ impl StakeSubCommands for App<'_, '_> {
|
|||||||
.help("New authorized withdrawer")
|
.help("New authorized withdrawer")
|
||||||
)
|
)
|
||||||
.arg(withdraw_authority_arg())
|
.arg(withdraw_authority_arg())
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("sign_only")
|
||||||
|
.long("sign-only")
|
||||||
|
.takes_value(false)
|
||||||
|
.help("Sign the transaction offline"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("signer")
|
||||||
|
.long("signer")
|
||||||
|
.value_name("PUBKEY=BASE58_SIG")
|
||||||
|
.takes_value(true)
|
||||||
|
.validator(is_pubkey_sig)
|
||||||
|
.multiple(true)
|
||||||
|
.help("Provide a public-key/signature pair for the transaction"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("blockhash")
|
||||||
|
.long("blockhash")
|
||||||
|
.value_name("BLOCKHASH")
|
||||||
|
.takes_value(true)
|
||||||
|
.validator(is_hash)
|
||||||
|
.help("Use the supplied blockhash"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name(NONCE_ARG.name)
|
||||||
|
.long(NONCE_ARG.long)
|
||||||
|
.takes_value(true)
|
||||||
|
.value_name("PUBKEY")
|
||||||
|
.requires("blockhash")
|
||||||
|
.validator(is_pubkey)
|
||||||
|
.help(NONCE_ARG.help)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name(NONCE_AUTHORITY_ARG.name)
|
||||||
|
.long(NONCE_AUTHORITY_ARG.long)
|
||||||
|
.takes_value(true)
|
||||||
|
.requires(NONCE_ARG.name)
|
||||||
|
.validator(is_keypair_or_ask_keyword)
|
||||||
|
.help(NONCE_AUTHORITY_ARG.help)
|
||||||
|
),
|
||||||
)
|
)
|
||||||
.subcommand(
|
.subcommand(
|
||||||
SubCommand::with_name("deactivate-stake")
|
SubCommand::with_name("deactivate-stake")
|
||||||
@ -492,6 +572,17 @@ pub fn parse_stake_authorize(
|
|||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
let sign_only = matches.is_present("sign_only");
|
||||||
|
let signers = pubkeys_sigs_of(&matches, "signer");
|
||||||
|
let blockhash = value_of(matches, "blockhash");
|
||||||
|
let nonce_account = pubkey_of(&matches, NONCE_ARG.name);
|
||||||
|
let nonce_authority = if matches.is_present(NONCE_AUTHORITY_ARG.name) {
|
||||||
|
let authority = keypair_of(&matches, NONCE_AUTHORITY_ARG.name)
|
||||||
|
.ok_or_else(|| CliError::BadParameter("Invalid keypair for nonce-authority".into()))?;
|
||||||
|
Some(authority.into())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
Ok(CliCommandInfo {
|
Ok(CliCommandInfo {
|
||||||
command: CliCommand::StakeAuthorize {
|
command: CliCommand::StakeAuthorize {
|
||||||
@ -499,6 +590,11 @@ pub fn parse_stake_authorize(
|
|||||||
new_authorized_pubkey,
|
new_authorized_pubkey,
|
||||||
stake_authorize,
|
stake_authorize,
|
||||||
authority,
|
authority,
|
||||||
|
sign_only,
|
||||||
|
signers,
|
||||||
|
blockhash,
|
||||||
|
nonce_account,
|
||||||
|
nonce_authority,
|
||||||
},
|
},
|
||||||
require_keypair: true,
|
require_keypair: true,
|
||||||
})
|
})
|
||||||
@ -686,6 +782,7 @@ pub fn process_create_stake_account(
|
|||||||
log_instruction_custom_error::<SystemError>(result)
|
log_instruction_custom_error::<SystemError>(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
pub fn process_stake_authorize(
|
pub fn process_stake_authorize(
|
||||||
rpc_client: &RpcClient,
|
rpc_client: &RpcClient,
|
||||||
config: &CliConfig,
|
config: &CliConfig,
|
||||||
@ -693,13 +790,19 @@ pub fn process_stake_authorize(
|
|||||||
authorized_pubkey: &Pubkey,
|
authorized_pubkey: &Pubkey,
|
||||||
stake_authorize: StakeAuthorize,
|
stake_authorize: StakeAuthorize,
|
||||||
authority: Option<&Keypair>,
|
authority: Option<&Keypair>,
|
||||||
|
sign_only: bool,
|
||||||
|
signers: &Option<Vec<(Pubkey, Signature)>>,
|
||||||
|
blockhash: Option<Hash>,
|
||||||
|
nonce_account: Option<Pubkey>,
|
||||||
|
nonce_authority: Option<&Keypair>,
|
||||||
) -> ProcessResult {
|
) -> ProcessResult {
|
||||||
check_unique_pubkeys(
|
check_unique_pubkeys(
|
||||||
(stake_account_pubkey, "stake_account_pubkey".to_string()),
|
(stake_account_pubkey, "stake_account_pubkey".to_string()),
|
||||||
(authorized_pubkey, "new_authorized_pubkey".to_string()),
|
(authorized_pubkey, "new_authorized_pubkey".to_string()),
|
||||||
)?;
|
)?;
|
||||||
let authority = authority.unwrap_or(&config.keypair);
|
let authority = authority.unwrap_or(&config.keypair);
|
||||||
let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?;
|
let (recent_blockhash, fee_calculator) =
|
||||||
|
get_blockhash_fee_calculator(rpc_client, sign_only, blockhash)?;
|
||||||
let ixs = vec![stake_instruction::authorize(
|
let ixs = vec![stake_instruction::authorize(
|
||||||
stake_account_pubkey, // stake account to update
|
stake_account_pubkey, // stake account to update
|
||||||
&authority.pubkey(), // currently authorized
|
&authority.pubkey(), // currently authorized
|
||||||
@ -707,20 +810,44 @@ pub fn process_stake_authorize(
|
|||||||
stake_authorize, // stake or withdraw
|
stake_authorize, // stake or withdraw
|
||||||
)];
|
)];
|
||||||
|
|
||||||
let mut tx = Transaction::new_signed_with_payer(
|
let mut tx = if let Some(nonce_account) = &nonce_account {
|
||||||
ixs,
|
let nonce_authority: &Keypair = nonce_authority.unwrap_or(&config.keypair);
|
||||||
Some(&config.keypair.pubkey()),
|
Transaction::new_signed_with_nonce(
|
||||||
&[&config.keypair, authority],
|
ixs,
|
||||||
recent_blockhash,
|
Some(&config.keypair.pubkey()),
|
||||||
);
|
&[&config.keypair, authority, nonce_authority],
|
||||||
check_account_for_fee(
|
nonce_account,
|
||||||
rpc_client,
|
&nonce_authority.pubkey(),
|
||||||
&config.keypair.pubkey(),
|
recent_blockhash,
|
||||||
&fee_calculator,
|
)
|
||||||
&tx.message,
|
} else {
|
||||||
)?;
|
Transaction::new_signed_with_payer(
|
||||||
let result = rpc_client.send_and_confirm_transaction(&mut tx, &[&config.keypair]);
|
ixs,
|
||||||
log_instruction_custom_error::<StakeError>(result)
|
Some(&config.keypair.pubkey()),
|
||||||
|
&[&config.keypair, authority],
|
||||||
|
recent_blockhash,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if let Some(signers) = signers {
|
||||||
|
replace_signatures(&mut tx, &signers)?;
|
||||||
|
}
|
||||||
|
if sign_only {
|
||||||
|
return_signers(&tx)
|
||||||
|
} else {
|
||||||
|
if let Some(nonce_account) = &nonce_account {
|
||||||
|
let nonce_authority: &Keypair = nonce_authority.unwrap_or(&config.keypair);
|
||||||
|
let nonce_account = rpc_client.get_account(nonce_account)?;
|
||||||
|
check_nonce_account(&nonce_account, &nonce_authority.pubkey(), &recent_blockhash)?;
|
||||||
|
}
|
||||||
|
check_account_for_fee(
|
||||||
|
rpc_client,
|
||||||
|
&tx.message.account_keys[0],
|
||||||
|
&fee_calculator,
|
||||||
|
&tx.message,
|
||||||
|
)?;
|
||||||
|
let result = rpc_client.send_and_confirm_transaction(&mut tx, &[&config.keypair]);
|
||||||
|
log_instruction_custom_error::<StakeError>(result)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn process_deactivate_stake_account(
|
pub fn process_deactivate_stake_account(
|
||||||
@ -1100,6 +1227,11 @@ mod tests {
|
|||||||
new_authorized_pubkey: stake_account_pubkey,
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
stake_authorize,
|
stake_authorize,
|
||||||
authority: None,
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
},
|
},
|
||||||
require_keypair: true
|
require_keypair: true
|
||||||
}
|
}
|
||||||
@ -1121,6 +1253,159 @@ mod tests {
|
|||||||
new_authorized_pubkey: stake_account_pubkey,
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
stake_authorize,
|
stake_authorize,
|
||||||
authority: Some(read_keypair_file(&authority_keypair_file).unwrap().into()),
|
authority: Some(read_keypair_file(&authority_keypair_file).unwrap().into()),
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
},
|
||||||
|
require_keypair: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// Test Authorize Subcommand w/ sign-only
|
||||||
|
let test_authorize = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
&subcommand,
|
||||||
|
&stake_account_string,
|
||||||
|
&stake_account_string,
|
||||||
|
"--sign-only",
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_authorize).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
|
stake_authorize,
|
||||||
|
authority: None,
|
||||||
|
sign_only: true,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
},
|
||||||
|
require_keypair: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// Test Authorize Subcommand w/ signer
|
||||||
|
let keypair = Keypair::new();
|
||||||
|
let sig = keypair.sign_message(&[0u8]);
|
||||||
|
let signer = format!("{}={}", keypair.pubkey(), sig);
|
||||||
|
let test_authorize = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
&subcommand,
|
||||||
|
&stake_account_string,
|
||||||
|
&stake_account_string,
|
||||||
|
"--signer",
|
||||||
|
&signer,
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_authorize).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
|
stake_authorize,
|
||||||
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: Some(vec![(keypair.pubkey(), sig)]),
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
},
|
||||||
|
require_keypair: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// Test Authorize Subcommand w/ signers
|
||||||
|
let keypair2 = Keypair::new();
|
||||||
|
let sig2 = keypair.sign_message(&[0u8]);
|
||||||
|
let signer2 = format!("{}={}", keypair2.pubkey(), sig2);
|
||||||
|
let test_authorize = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
&subcommand,
|
||||||
|
&stake_account_string,
|
||||||
|
&stake_account_string,
|
||||||
|
"--signer",
|
||||||
|
&signer,
|
||||||
|
"--signer",
|
||||||
|
&signer2,
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_authorize).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
|
stake_authorize,
|
||||||
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: Some(vec![(keypair.pubkey(), sig), (keypair2.pubkey(), sig2),]),
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
},
|
||||||
|
require_keypair: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// Test Authorize Subcommand w/ blockhash
|
||||||
|
let blockhash = Hash::default();
|
||||||
|
let blockhash_string = format!("{}", blockhash);
|
||||||
|
let test_authorize = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
&subcommand,
|
||||||
|
&stake_account_string,
|
||||||
|
&stake_account_string,
|
||||||
|
"--blockhash",
|
||||||
|
&blockhash_string,
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_authorize).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
|
stake_authorize,
|
||||||
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: Some(blockhash),
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
},
|
||||||
|
require_keypair: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// Test Authorize Subcommand w/ nonce
|
||||||
|
let (nonce_keypair_file, mut nonce_tmp_file) = make_tmp_file();
|
||||||
|
let nonce_authority_keypair = Keypair::new();
|
||||||
|
write_keypair(&nonce_authority_keypair, nonce_tmp_file.as_file_mut()).unwrap();
|
||||||
|
let nonce_account_pubkey = nonce_authority_keypair.pubkey();
|
||||||
|
let nonce_account_string = nonce_account_pubkey.to_string();
|
||||||
|
let test_authorize = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
&subcommand,
|
||||||
|
&stake_account_string,
|
||||||
|
&stake_account_string,
|
||||||
|
"--blockhash",
|
||||||
|
&blockhash_string,
|
||||||
|
"--nonce",
|
||||||
|
&nonce_account_string,
|
||||||
|
"--nonce-authority",
|
||||||
|
&nonce_keypair_file,
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_authorize).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: stake_account_pubkey,
|
||||||
|
stake_authorize,
|
||||||
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: Some(blockhash),
|
||||||
|
nonce_account: Some(nonce_account_pubkey),
|
||||||
|
nonce_authority: Some(nonce_authority_keypair.into()),
|
||||||
},
|
},
|
||||||
require_keypair: true
|
require_keypair: true
|
||||||
}
|
}
|
||||||
|
@ -40,6 +40,23 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_sign_only_reply_string(reply: &str) -> (Hash, Vec<(Pubkey, Signature)>) {
|
||||||
|
let object: Value = serde_json::from_str(&reply).unwrap();
|
||||||
|
let blockhash_str = object.get("blockhash").unwrap().as_str().unwrap();
|
||||||
|
let blockhash = blockhash_str.parse::<Hash>().unwrap();
|
||||||
|
let signer_strings = object.get("signers").unwrap().as_array().unwrap();
|
||||||
|
let signers = signer_strings
|
||||||
|
.iter()
|
||||||
|
.map(|signer_string| {
|
||||||
|
let mut signer = signer_string.as_str().unwrap().split('=');
|
||||||
|
let key = Pubkey::from_str(signer.next().unwrap()).unwrap();
|
||||||
|
let sig = Signature::from_str(signer.next().unwrap()).unwrap();
|
||||||
|
(key, sig)
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
(blockhash, signers)
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_seed_stake_delegation_and_deactivation() {
|
fn test_seed_stake_delegation_and_deactivation() {
|
||||||
solana_logger::setup();
|
solana_logger::setup();
|
||||||
@ -300,18 +317,7 @@ fn test_offline_stake_delegation_and_deactivation() {
|
|||||||
nonce_authority: None,
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
let sig_response = process_command(&config_validator).unwrap();
|
let sig_response = process_command(&config_validator).unwrap();
|
||||||
let object: Value = serde_json::from_str(&sig_response).unwrap();
|
let (blockhash, signers) = parse_sign_only_reply_string(&sig_response);
|
||||||
let blockhash_str = object.get("blockhash").unwrap().as_str().unwrap();
|
|
||||||
let signer_strings = object.get("signers").unwrap().as_array().unwrap();
|
|
||||||
let signers: Vec<_> = signer_strings
|
|
||||||
.iter()
|
|
||||||
.map(|signer_string| {
|
|
||||||
let mut signer = signer_string.as_str().unwrap().split('=');
|
|
||||||
let key = Pubkey::from_str(signer.next().unwrap()).unwrap();
|
|
||||||
let sig = Signature::from_str(signer.next().unwrap()).unwrap();
|
|
||||||
(key, sig)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
// Delegate stake online
|
// Delegate stake online
|
||||||
config_payer.command = CliCommand::DelegateStake {
|
config_payer.command = CliCommand::DelegateStake {
|
||||||
@ -321,7 +327,7 @@ fn test_offline_stake_delegation_and_deactivation() {
|
|||||||
force: true,
|
force: true,
|
||||||
sign_only: false,
|
sign_only: false,
|
||||||
signers: Some(signers),
|
signers: Some(signers),
|
||||||
blockhash: Some(blockhash_str.parse::<Hash>().unwrap()),
|
blockhash: Some(blockhash),
|
||||||
nonce_account: None,
|
nonce_account: None,
|
||||||
nonce_authority: None,
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
@ -338,18 +344,7 @@ fn test_offline_stake_delegation_and_deactivation() {
|
|||||||
nonce_authority: None,
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
let sig_response = process_command(&config_validator).unwrap();
|
let sig_response = process_command(&config_validator).unwrap();
|
||||||
let object: Value = serde_json::from_str(&sig_response).unwrap();
|
let (blockhash, signers) = parse_sign_only_reply_string(&sig_response);
|
||||||
let blockhash_str = object.get("blockhash").unwrap().as_str().unwrap();
|
|
||||||
let signer_strings = object.get("signers").unwrap().as_array().unwrap();
|
|
||||||
let signers: Vec<_> = signer_strings
|
|
||||||
.iter()
|
|
||||||
.map(|signer_string| {
|
|
||||||
let mut signer = signer_string.as_str().unwrap().split('=');
|
|
||||||
let key = Pubkey::from_str(signer.next().unwrap()).unwrap();
|
|
||||||
let sig = Signature::from_str(signer.next().unwrap()).unwrap();
|
|
||||||
(key, sig)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
// Deactivate stake online
|
// Deactivate stake online
|
||||||
config_payer.command = CliCommand::DeactivateStake {
|
config_payer.command = CliCommand::DeactivateStake {
|
||||||
@ -357,7 +352,7 @@ fn test_offline_stake_delegation_and_deactivation() {
|
|||||||
stake_authority: None,
|
stake_authority: None,
|
||||||
sign_only: false,
|
sign_only: false,
|
||||||
signers: Some(signers),
|
signers: Some(signers),
|
||||||
blockhash: Some(blockhash_str.parse::<Hash>().unwrap()),
|
blockhash: Some(blockhash),
|
||||||
nonce_account: None,
|
nonce_account: None,
|
||||||
nonce_authority: None,
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
@ -517,6 +512,11 @@ fn test_stake_authorize() {
|
|||||||
new_authorized_pubkey: online_authority_pubkey,
|
new_authorized_pubkey: online_authority_pubkey,
|
||||||
stake_authorize: StakeAuthorize::Staker,
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
authority: None,
|
authority: None,
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
process_command(&config).unwrap();
|
process_command(&config).unwrap();
|
||||||
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
||||||
@ -530,13 +530,18 @@ fn test_stake_authorize() {
|
|||||||
// Assign new offline stake authority
|
// Assign new offline stake authority
|
||||||
let offline_authority = Keypair::new();
|
let offline_authority = Keypair::new();
|
||||||
let offline_authority_pubkey = offline_authority.pubkey();
|
let offline_authority_pubkey = offline_authority.pubkey();
|
||||||
let (_offline_authority_file, mut tmp_file) = make_tmp_file();
|
let (offline_authority_file, mut tmp_file) = make_tmp_file();
|
||||||
write_keypair(&offline_authority, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&offline_authority, tmp_file.as_file_mut()).unwrap();
|
||||||
config.command = CliCommand::StakeAuthorize {
|
config.command = CliCommand::StakeAuthorize {
|
||||||
stake_account_pubkey,
|
stake_account_pubkey,
|
||||||
new_authorized_pubkey: offline_authority_pubkey,
|
new_authorized_pubkey: offline_authority_pubkey,
|
||||||
stake_authorize: StakeAuthorize::Staker,
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
authority: Some(read_keypair_file(&online_authority_file).unwrap().into()),
|
authority: Some(read_keypair_file(&online_authority_file).unwrap().into()),
|
||||||
|
sign_only: false,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
};
|
};
|
||||||
process_command(&config).unwrap();
|
process_command(&config).unwrap();
|
||||||
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
||||||
@ -547,6 +552,115 @@ fn test_stake_authorize() {
|
|||||||
};
|
};
|
||||||
assert_eq!(current_authority, offline_authority_pubkey);
|
assert_eq!(current_authority, offline_authority_pubkey);
|
||||||
|
|
||||||
|
// Offline assignment of new nonced stake authority
|
||||||
|
let nonced_authority = Keypair::new();
|
||||||
|
let nonced_authority_pubkey = nonced_authority.pubkey();
|
||||||
|
let (nonced_authority_file, mut tmp_file) = make_tmp_file();
|
||||||
|
write_keypair(&nonced_authority, tmp_file.as_file_mut()).unwrap();
|
||||||
|
config.command = CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: nonced_authority_pubkey,
|
||||||
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
|
authority: Some(read_keypair_file(&offline_authority_file).unwrap().into()),
|
||||||
|
sign_only: true,
|
||||||
|
signers: None,
|
||||||
|
blockhash: None,
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
};
|
||||||
|
let sign_reply = process_command(&config).unwrap();
|
||||||
|
let (blockhash, signers) = parse_sign_only_reply_string(&sign_reply);
|
||||||
|
config.command = CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: nonced_authority_pubkey,
|
||||||
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
|
// We need to be able to specify the authority by pubkey/sig pair here
|
||||||
|
authority: Some(read_keypair_file(&offline_authority_file).unwrap().into()),
|
||||||
|
sign_only: false,
|
||||||
|
signers: Some(signers),
|
||||||
|
blockhash: Some(blockhash),
|
||||||
|
nonce_account: None,
|
||||||
|
nonce_authority: None,
|
||||||
|
};
|
||||||
|
process_command(&config).unwrap();
|
||||||
|
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
||||||
|
let stake_state: StakeState = stake_account.state().unwrap();
|
||||||
|
let current_authority = match stake_state {
|
||||||
|
StakeState::Initialized(meta) => meta.authorized.staker,
|
||||||
|
_ => panic!("Unexpected stake state!"),
|
||||||
|
};
|
||||||
|
assert_eq!(current_authority, nonced_authority_pubkey);
|
||||||
|
|
||||||
|
// Create nonce account
|
||||||
|
let minimum_nonce_balance = rpc_client
|
||||||
|
.get_minimum_balance_for_rent_exemption(NonceState::size())
|
||||||
|
.unwrap();
|
||||||
|
let nonce_account = Keypair::new();
|
||||||
|
let (nonce_keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
|
write_keypair(&nonce_account, tmp_file.as_file_mut()).unwrap();
|
||||||
|
config.command = CliCommand::CreateNonceAccount {
|
||||||
|
nonce_account: read_keypair_file(&nonce_keypair_file).unwrap().into(),
|
||||||
|
seed: None,
|
||||||
|
nonce_authority: Some(config.keypair.pubkey()),
|
||||||
|
lamports: minimum_nonce_balance,
|
||||||
|
};
|
||||||
|
process_command(&config).unwrap();
|
||||||
|
|
||||||
|
// Fetch nonce hash
|
||||||
|
let account = rpc_client.get_account(&nonce_account.pubkey()).unwrap();
|
||||||
|
let nonce_state: NonceState = account.state().unwrap();
|
||||||
|
let nonce_hash = match nonce_state {
|
||||||
|
NonceState::Initialized(_meta, hash) => hash,
|
||||||
|
_ => panic!("Nonce is not initialized"),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Nonced assignment of new nonced stake authority
|
||||||
|
let online_authority = Keypair::new();
|
||||||
|
let online_authority_pubkey = online_authority.pubkey();
|
||||||
|
let (_online_authority_file, mut tmp_file) = make_tmp_file();
|
||||||
|
write_keypair(&online_authority, tmp_file.as_file_mut()).unwrap();
|
||||||
|
config.command = CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: online_authority_pubkey,
|
||||||
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
|
authority: Some(read_keypair_file(&nonced_authority_file).unwrap().into()),
|
||||||
|
sign_only: true,
|
||||||
|
signers: None,
|
||||||
|
blockhash: Some(nonce_hash),
|
||||||
|
nonce_account: Some(nonce_account.pubkey()),
|
||||||
|
nonce_authority: None,
|
||||||
|
//nonce_authority: Some(read_keypair_file(&nonce_keypair_file).unwrap().into()),
|
||||||
|
};
|
||||||
|
let sign_reply = process_command(&config).unwrap();
|
||||||
|
let (blockhash, signers) = parse_sign_only_reply_string(&sign_reply);
|
||||||
|
assert_eq!(blockhash, nonce_hash);
|
||||||
|
config.command = CliCommand::StakeAuthorize {
|
||||||
|
stake_account_pubkey,
|
||||||
|
new_authorized_pubkey: online_authority_pubkey,
|
||||||
|
stake_authorize: StakeAuthorize::Staker,
|
||||||
|
// We need to be able to specify the authority by pubkey/sig pair here
|
||||||
|
authority: Some(read_keypair_file(&nonced_authority_file).unwrap().into()),
|
||||||
|
sign_only: false,
|
||||||
|
signers: Some(signers),
|
||||||
|
blockhash: Some(blockhash),
|
||||||
|
nonce_account: Some(nonce_account.pubkey()),
|
||||||
|
nonce_authority: None,
|
||||||
|
};
|
||||||
|
process_command(&config).unwrap();
|
||||||
|
let stake_account = rpc_client.get_account(&stake_account_pubkey).unwrap();
|
||||||
|
let stake_state: StakeState = stake_account.state().unwrap();
|
||||||
|
let current_authority = match stake_state {
|
||||||
|
StakeState::Initialized(meta) => meta.authorized.staker,
|
||||||
|
_ => panic!("Unexpected stake state!"),
|
||||||
|
};
|
||||||
|
assert_eq!(current_authority, online_authority_pubkey);
|
||||||
|
let account = rpc_client.get_account(&nonce_account.pubkey()).unwrap();
|
||||||
|
let nonce_state: NonceState = account.state().unwrap();
|
||||||
|
let new_nonce_hash = match nonce_state {
|
||||||
|
NonceState::Initialized(_meta, hash) => hash,
|
||||||
|
_ => panic!("Nonce is not initialized"),
|
||||||
|
};
|
||||||
|
assert_ne!(nonce_hash, new_nonce_hash);
|
||||||
server.close().unwrap();
|
server.close().unwrap();
|
||||||
remove_dir_all(ledger_path).unwrap();
|
remove_dir_all(ledger_path).unwrap();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user