Add arg to specify address-signer for solana deploy (#10416)
This commit is contained in:
parent
318835e3a0
commit
da34310eb4
|
@ -276,7 +276,10 @@ pub enum CliCommand {
|
||||||
lamports: u64,
|
lamports: u64,
|
||||||
},
|
},
|
||||||
// Program Deployment
|
// Program Deployment
|
||||||
Deploy(String),
|
Deploy {
|
||||||
|
program_location: String,
|
||||||
|
address: Option<SignerIndex>,
|
||||||
|
},
|
||||||
// Stake Commands
|
// Stake Commands
|
||||||
CreateStakeAccount {
|
CreateStakeAccount {
|
||||||
stake_account: SignerIndex,
|
stake_account: SignerIndex,
|
||||||
|
@ -662,15 +665,27 @@ pub fn parse_command(
|
||||||
parse_withdraw_from_nonce_account(matches, default_signer_path, wallet_manager)
|
parse_withdraw_from_nonce_account(matches, default_signer_path, wallet_manager)
|
||||||
}
|
}
|
||||||
// Program Deployment
|
// Program Deployment
|
||||||
("deploy", Some(matches)) => Ok(CliCommandInfo {
|
("deploy", Some(matches)) => {
|
||||||
command: CliCommand::Deploy(matches.value_of("program_location").unwrap().to_string()),
|
let (address_signer, _address) = signer_of(matches, "address_signer", wallet_manager)?;
|
||||||
signers: vec![signer_from_path(
|
let mut signers = vec![signer_from_path(
|
||||||
matches,
|
matches,
|
||||||
default_signer_path,
|
default_signer_path,
|
||||||
"keypair",
|
"keypair",
|
||||||
wallet_manager,
|
wallet_manager,
|
||||||
)?],
|
)?];
|
||||||
}),
|
let address = address_signer.map(|signer| {
|
||||||
|
signers.push(signer);
|
||||||
|
1
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(CliCommandInfo {
|
||||||
|
command: CliCommand::Deploy {
|
||||||
|
program_location: matches.value_of("program_location").unwrap().to_string(),
|
||||||
|
address,
|
||||||
|
},
|
||||||
|
signers,
|
||||||
|
})
|
||||||
|
}
|
||||||
// Stake Commands
|
// Stake Commands
|
||||||
("create-stake-account", Some(matches)) => {
|
("create-stake-account", Some(matches)) => {
|
||||||
parse_stake_create_account(matches, default_signer_path, wallet_manager)
|
parse_stake_create_account(matches, default_signer_path, wallet_manager)
|
||||||
|
@ -1329,8 +1344,14 @@ fn process_deploy(
|
||||||
rpc_client: &RpcClient,
|
rpc_client: &RpcClient,
|
||||||
config: &CliConfig,
|
config: &CliConfig,
|
||||||
program_location: &str,
|
program_location: &str,
|
||||||
|
address: Option<SignerIndex>,
|
||||||
) -> ProcessResult {
|
) -> ProcessResult {
|
||||||
let program_id = Keypair::new();
|
let new_keypair = Keypair::new(); // Create ephemeral keypair to use for program address, if not provided
|
||||||
|
let program_id = if let Some(i) = address {
|
||||||
|
config.signers[i]
|
||||||
|
} else {
|
||||||
|
&new_keypair
|
||||||
|
};
|
||||||
let mut file = File::open(program_location).map_err(|err| {
|
let mut file = File::open(program_location).map_err(|err| {
|
||||||
CliError::DynamicProgramError(format!("Unable to open program file: {}", err))
|
CliError::DynamicProgramError(format!("Unable to open program file: {}", err))
|
||||||
})?;
|
})?;
|
||||||
|
@ -1352,9 +1373,9 @@ fn process_deploy(
|
||||||
);
|
);
|
||||||
let message = Message::new(&[ix]);
|
let message = Message::new(&[ix]);
|
||||||
let mut create_account_tx = Transaction::new_unsigned(message);
|
let mut create_account_tx = Transaction::new_unsigned(message);
|
||||||
create_account_tx.try_sign(&[config.signers[0], &program_id], blockhash)?;
|
let signers = [config.signers[0], program_id];
|
||||||
|
create_account_tx.try_sign(&signers, blockhash)?;
|
||||||
messages.push(&create_account_tx.message);
|
messages.push(&create_account_tx.message);
|
||||||
let signers = [config.signers[0], &program_id];
|
|
||||||
let mut write_transactions = vec![];
|
let mut write_transactions = vec![];
|
||||||
for (chunk, i) in program_data.chunks(DATA_CHUNK_SIZE).zip(0..) {
|
for (chunk, i) in program_data.chunks(DATA_CHUNK_SIZE).zip(0..) {
|
||||||
let instruction = loader_instruction::write(
|
let instruction = loader_instruction::write(
|
||||||
|
@ -1882,9 +1903,10 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
|
||||||
// Program Deployment
|
// Program Deployment
|
||||||
|
|
||||||
// Deploy a custom program to the chain
|
// Deploy a custom program to the chain
|
||||||
CliCommand::Deploy(ref program_location) => {
|
CliCommand::Deploy {
|
||||||
process_deploy(&rpc_client, config, program_location)
|
program_location,
|
||||||
}
|
address,
|
||||||
|
} => process_deploy(&rpc_client, config, program_location, *address),
|
||||||
|
|
||||||
// Stake Commands
|
// Stake Commands
|
||||||
|
|
||||||
|
@ -2525,6 +2547,14 @@ pub fn app<'ab, 'v>(name: &str, about: &'ab str, version: &'v str) -> App<'ab, '
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.required(true)
|
.required(true)
|
||||||
.help("/path/to/program.o"),
|
.help("/path/to/program.o"),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("address_signer")
|
||||||
|
.index(2)
|
||||||
|
.value_name("SIGNER_KEYPAIR")
|
||||||
|
.takes_value(true)
|
||||||
|
.validator(is_valid_signer)
|
||||||
|
.help("The signer for the desired address of the program [default: new random address]")
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.subcommand(
|
.subcommand(
|
||||||
|
@ -2969,11 +2999,37 @@ mod tests {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
parse_command(&test_deploy, &keypair_file, &mut None).unwrap(),
|
parse_command(&test_deploy, &keypair_file, &mut None).unwrap(),
|
||||||
CliCommandInfo {
|
CliCommandInfo {
|
||||||
command: CliCommand::Deploy("/Users/test/program.o".to_string()),
|
command: CliCommand::Deploy {
|
||||||
|
program_location: "/Users/test/program.o".to_string(),
|
||||||
|
address: None,
|
||||||
|
},
|
||||||
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
signers: vec![read_keypair_file(&keypair_file).unwrap().into()],
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
let custom_address = Keypair::new();
|
||||||
|
let custom_address_file = make_tmp_path("custom_address_file");
|
||||||
|
write_keypair_file(&custom_address, &custom_address_file).unwrap();
|
||||||
|
let test_deploy = test_commands.clone().get_matches_from(vec![
|
||||||
|
"test",
|
||||||
|
"deploy",
|
||||||
|
"/Users/test/program.o",
|
||||||
|
&custom_address_file,
|
||||||
|
]);
|
||||||
|
assert_eq!(
|
||||||
|
parse_command(&test_deploy, &keypair_file, &mut None).unwrap(),
|
||||||
|
CliCommandInfo {
|
||||||
|
command: CliCommand::Deploy {
|
||||||
|
program_location: "/Users/test/program.o".to_string(),
|
||||||
|
address: Some(1),
|
||||||
|
},
|
||||||
|
signers: vec![
|
||||||
|
read_keypair_file(&keypair_file).unwrap().into(),
|
||||||
|
read_keypair_file(&custom_address_file).unwrap().into(),
|
||||||
|
],
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// Test ResolveSigner Subcommand, KeypairUrl::Filepath
|
// Test ResolveSigner Subcommand, KeypairUrl::Filepath
|
||||||
let test_resolve_signer =
|
let test_resolve_signer =
|
||||||
test_commands
|
test_commands
|
||||||
|
@ -3672,7 +3728,10 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
config.signers = vec![&default_keypair];
|
config.signers = vec![&default_keypair];
|
||||||
|
|
||||||
config.command = CliCommand::Deploy(pathbuf.to_str().unwrap().to_string());
|
config.command = CliCommand::Deploy {
|
||||||
|
program_location: pathbuf.to_str().unwrap().to_string(),
|
||||||
|
address: None,
|
||||||
|
};
|
||||||
let result = process_command(&config);
|
let result = process_command(&config);
|
||||||
let json: Value = serde_json::from_str(&result.unwrap()).unwrap();
|
let json: Value = serde_json::from_str(&result.unwrap()).unwrap();
|
||||||
let program_id = json
|
let program_id = json
|
||||||
|
@ -3686,7 +3745,10 @@ mod tests {
|
||||||
assert!(program_id.parse::<Pubkey>().is_ok());
|
assert!(program_id.parse::<Pubkey>().is_ok());
|
||||||
|
|
||||||
// Failure case
|
// Failure case
|
||||||
config.command = CliCommand::Deploy("bad/file/location.so".to_string());
|
config.command = CliCommand::Deploy {
|
||||||
|
program_location: "bad/file/location.so".to_string(),
|
||||||
|
address: None,
|
||||||
|
};
|
||||||
assert!(process_command(&config).is_err());
|
assert!(process_command(&config).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,11 @@ use solana_cli::cli::{process_command, CliCommand, CliConfig};
|
||||||
use solana_client::rpc_client::RpcClient;
|
use solana_client::rpc_client::RpcClient;
|
||||||
use solana_core::validator::TestValidator;
|
use solana_core::validator::TestValidator;
|
||||||
use solana_faucet::faucet::run_local_faucet;
|
use solana_faucet::faucet::run_local_faucet;
|
||||||
use solana_sdk::{bpf_loader, pubkey::Pubkey, signature::Keypair};
|
use solana_sdk::{
|
||||||
|
bpf_loader,
|
||||||
|
pubkey::Pubkey,
|
||||||
|
signature::{Keypair, Signer},
|
||||||
|
};
|
||||||
use std::{
|
use std::{
|
||||||
fs::{remove_dir_all, File},
|
fs::{remove_dir_all, File},
|
||||||
io::Read,
|
io::Read,
|
||||||
|
@ -50,12 +54,15 @@ fn test_cli_deploy_program() {
|
||||||
faucet_host: None,
|
faucet_host: None,
|
||||||
faucet_port: faucet_addr.port(),
|
faucet_port: faucet_addr.port(),
|
||||||
pubkey: None,
|
pubkey: None,
|
||||||
lamports: minimum_balance_for_rent_exemption + 1, // min balance for rent exemption + leftover for tx processing
|
lamports: 3 * minimum_balance_for_rent_exemption, // min balance for rent exemption for two programs + leftover for tx processing
|
||||||
};
|
};
|
||||||
config.signers = vec![&keypair];
|
config.signers = vec![&keypair];
|
||||||
process_command(&config).unwrap();
|
process_command(&config).unwrap();
|
||||||
|
|
||||||
config.command = CliCommand::Deploy(pathbuf.to_str().unwrap().to_string());
|
config.command = CliCommand::Deploy {
|
||||||
|
program_location: pathbuf.to_str().unwrap().to_string(),
|
||||||
|
address: None,
|
||||||
|
};
|
||||||
|
|
||||||
let response = process_command(&config);
|
let response = process_command(&config);
|
||||||
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
let json: Value = serde_json::from_str(&response.unwrap()).unwrap();
|
||||||
|
@ -67,16 +74,35 @@ fn test_cli_deploy_program() {
|
||||||
.as_str()
|
.as_str()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let program_id = Pubkey::from_str(&program_id_str).unwrap();
|
let program_id = Pubkey::from_str(&program_id_str).unwrap();
|
||||||
let account = rpc_client.get_account(&program_id).unwrap();
|
let account0 = rpc_client.get_account(&program_id).unwrap();
|
||||||
assert_eq!(account.lamports, minimum_balance_for_rent_exemption);
|
assert_eq!(account0.lamports, minimum_balance_for_rent_exemption);
|
||||||
assert_eq!(account.owner, bpf_loader::id());
|
assert_eq!(account0.owner, bpf_loader::id());
|
||||||
assert_eq!(account.executable, true);
|
assert_eq!(account0.executable, true);
|
||||||
|
|
||||||
let mut file = File::open(pathbuf.to_str().unwrap().to_string()).unwrap();
|
let mut file = File::open(pathbuf.to_str().unwrap().to_string()).unwrap();
|
||||||
let mut elf = Vec::new();
|
let mut elf = Vec::new();
|
||||||
file.read_to_end(&mut elf).unwrap();
|
file.read_to_end(&mut elf).unwrap();
|
||||||
|
|
||||||
assert_eq!(account.data, elf);
|
assert_eq!(account0.data, elf);
|
||||||
|
|
||||||
|
// Test custom address
|
||||||
|
let custom_address_keypair = Keypair::new();
|
||||||
|
config.signers = vec![&keypair, &custom_address_keypair];
|
||||||
|
config.command = CliCommand::Deploy {
|
||||||
|
program_location: pathbuf.to_str().unwrap().to_string(),
|
||||||
|
address: Some(1),
|
||||||
|
};
|
||||||
|
process_command(&config).unwrap();
|
||||||
|
let account1 = rpc_client
|
||||||
|
.get_account(&custom_address_keypair.pubkey())
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(account1.lamports, minimum_balance_for_rent_exemption);
|
||||||
|
assert_eq!(account1.owner, bpf_loader::id());
|
||||||
|
assert_eq!(account1.executable, true);
|
||||||
|
assert_eq!(account0.data, account1.data);
|
||||||
|
|
||||||
|
// Attempt to redeploy to the same address
|
||||||
|
process_command(&config).unwrap_err();
|
||||||
|
|
||||||
server.close().unwrap();
|
server.close().unwrap();
|
||||||
remove_dir_all(ledger_path).unwrap();
|
remove_dir_all(ledger_path).unwrap();
|
||||||
|
|
Loading…
Reference in New Issue