diff --git a/archiver-lib/src/archiver.rs b/archiver-lib/src/archiver.rs index 4e6ac846cb..d1c9c72f13 100644 --- a/archiver-lib/src/archiver.rs +++ b/archiver-lib/src/archiver.rs @@ -379,8 +379,7 @@ impl Archiver { &archiver_keypair.pubkey(), &storage_keypair.pubkey(), ); - let message = - Message::new_with_payer(vec![ix], Some(&archiver_keypair.pubkey())); + let message = Message::new_with_payer(&[ix], Some(&archiver_keypair.pubkey())); if let Err(e) = client.send_message(&[archiver_keypair.as_ref()], message) { error!("unable to redeem reward, tx failed: {:?}", e); } else { @@ -655,7 +654,7 @@ impl Archiver { Signature::new(&meta.signature.as_ref()), meta.blockhash, ); - let message = Message::new_with_payer(vec![instruction], Some(&archiver_keypair.pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&archiver_keypair.pubkey())); let mut transaction = Transaction::new( &[archiver_keypair.as_ref(), storage_keypair.as_ref()], message, diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 70b75f4a43..41df117b07 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -1207,7 +1207,7 @@ fn process_deploy( program_data.len() as u64, &bpf_loader::id(), ); - let message = Message::new(vec![ix]); + let message = Message::new(&[ix]); let mut create_account_tx = Transaction::new_unsigned(message); create_account_tx.try_sign(&[config.signers[0], &program_id], blockhash)?; messages.push(&create_account_tx.message); @@ -1220,7 +1220,7 @@ fn process_deploy( (i * DATA_CHUNK_SIZE) as u32, chunk.to_vec(), ); - let message = Message::new_with_payer(vec![instruction], Some(&signers[0].pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&signers, blockhash)?; write_transactions.push(tx); @@ -1230,7 +1230,7 @@ fn process_deploy( } let instruction = loader_instruction::finalize(&program_id.pubkey(), &bpf_loader::id()); - let message = Message::new_with_payer(vec![instruction], Some(&signers[0].pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&signers[0].pubkey())); let mut finalize_tx = Transaction::new_unsigned(message); finalize_tx.try_sign(&signers, blockhash)?; messages.push(&finalize_tx.message); @@ -1298,7 +1298,7 @@ fn process_pay( let message = if let Some(nonce_account) = &nonce_account { Message::new_with_nonce(vec![ix], None, nonce_account, &nonce_authority.pubkey()) } else { - Message::new(vec![ix]) + Message::new(&[ix]) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, blockhash)?; @@ -1338,7 +1338,7 @@ fn process_pay( cancelable, lamports, ); - let message = Message::new(ixs); + let message = Message::new(&ixs); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&[config.signers[0], &contract_state], blockhash)?; if sign_only { @@ -1381,7 +1381,7 @@ fn process_pay( cancelable, lamports, ); - let message = Message::new(ixs); + let message = Message::new(&ixs); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&[config.signers[0], &contract_state], blockhash)?; if sign_only { @@ -1415,7 +1415,7 @@ fn process_cancel(rpc_client: &RpcClient, config: &CliConfig, pubkey: &Pubkey) - pubkey, &config.signers[0].pubkey(), ); - let message = Message::new(vec![ix]); + let message = Message::new(&[ix]); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, blockhash)?; check_account_for_fee( @@ -1438,7 +1438,7 @@ fn process_time_elapsed( let (blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; let ix = budget_instruction::apply_timestamp(&config.signers[0].pubkey(), pubkey, to, dt); - let message = Message::new(vec![ix]); + let message = Message::new(&[ix]); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, blockhash)?; check_account_for_fee( @@ -1486,7 +1486,7 @@ fn process_transfer( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -1518,7 +1518,7 @@ fn process_witness( let (blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; let ix = budget_instruction::apply_signature(&config.signers[0].pubkey(), pubkey, to); - let message = Message::new(vec![ix]); + let message = Message::new(&[ix]); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, blockhash)?; check_account_for_fee( diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs index 381e0ec839..a74f9282fb 100644 --- a/cli/src/cluster_query.rs +++ b/cli/src/cluster_query.rs @@ -828,7 +828,7 @@ pub fn process_ping( last_blockhash = recent_blockhash; let ix = system_instruction::transfer(&config.signers[0].pubkey(), &to, lamports); - let message = Message::new(vec![ix]); + let message = Message::new(&[ix]); let mut transaction = Transaction::new_unsigned(message); transaction.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( diff --git a/cli/src/nonce.rs b/cli/src/nonce.rs index c7aab073cc..45be826542 100644 --- a/cli/src/nonce.rs +++ b/cli/src/nonce.rs @@ -441,7 +441,7 @@ pub fn process_authorize_nonce_account( let nonce_authority = config.signers[nonce_authority]; let ix = authorize_nonce_account(nonce_account, &nonce_authority.pubkey(), new_authority); - let message = Message::new_with_payer(vec![ix], Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&[ix], Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -518,7 +518,7 @@ pub fn process_create_nonce_account( let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; - let message = Message::new_with_payer(ixs, Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&ixs, Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -560,7 +560,7 @@ pub fn process_new_nonce( let nonce_authority = config.signers[nonce_authority]; let ix = advance_nonce_account(&nonce_account, &nonce_authority.pubkey()); let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; - let message = Message::new_with_payer(vec![ix], Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&[ix], Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( @@ -633,7 +633,7 @@ pub fn process_withdraw_from_nonce_account( destination_account_pubkey, lamports, ); - let message = Message::new_with_payer(vec![ix], Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&[ix], Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( diff --git a/cli/src/stake.rs b/cli/src/stake.rs index 1fa75d524d..8f3113c9a6 100644 --- a/cli/src/stake.rs +++ b/cli/src/stake.rs @@ -827,7 +827,7 @@ pub fn process_create_stake_account( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -889,7 +889,7 @@ pub fn process_stake_authorize( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -942,7 +942,7 @@ pub fn process_deactivate_stake_account( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -1001,7 +1001,7 @@ pub fn process_withdraw_stake( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -1134,7 +1134,7 @@ pub fn process_split_stake( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -1190,7 +1190,7 @@ pub fn process_stake_set_lockup( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; @@ -1424,7 +1424,7 @@ pub fn process_delegate_stake( &nonce_authority.pubkey(), ) } else { - Message::new_with_payer(ixs, Some(&fee_payer.pubkey())) + Message::new_with_payer(&ixs, Some(&fee_payer.pubkey())) }; let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; diff --git a/cli/src/storage.rs b/cli/src/storage.rs index faa01081dd..f207bd2dc7 100644 --- a/cli/src/storage.rs +++ b/cli/src/storage.rs @@ -212,7 +212,7 @@ pub fn process_create_storage_account( ); let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; - let message = Message::new(ixs); + let message = Message::new(&ixs); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( @@ -236,7 +236,7 @@ pub fn process_claim_storage_reward( let instruction = storage_instruction::claim_reward(node_account_pubkey, storage_account_pubkey); let signers = [config.signers[0]]; - let message = Message::new_with_payer(vec![instruction], Some(&signers[0].pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&signers, recent_blockhash)?; check_account_for_fee( diff --git a/cli/src/validator_info.rs b/cli/src/validator_info.rs index c902758eaa..bd83bdf132 100644 --- a/cli/src/validator_info.rs +++ b/cli/src/validator_info.rs @@ -339,7 +339,7 @@ pub fn process_set_validator_info( &validator_info, )]); let signers = vec![config.signers[0], &info_keypair]; - let message = Message::new(instructions); + let message = Message::new(&instructions); (message, signers) } else { println!( @@ -353,7 +353,7 @@ pub fn process_set_validator_info( keys, &validator_info, )]; - let message = Message::new_with_payer(instructions, Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&instructions, Some(&config.signers[0].pubkey())); let signers = vec![config.signers[0]]; (message, signers) }; diff --git a/cli/src/vote.rs b/cli/src/vote.rs index c56aa3196c..90eaf7b2c9 100644 --- a/cli/src/vote.rs +++ b/cli/src/vote.rs @@ -359,7 +359,7 @@ pub fn process_create_vote_account( }; let (recent_blockhash, fee_calculator) = rpc_client.get_recent_blockhash()?; - let message = Message::new(ixs); + let message = Message::new(&ixs); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( @@ -391,7 +391,7 @@ pub fn process_vote_authorize( vote_authorize, // vote or withdraw )]; - let message = Message::new_with_payer(ixs, Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&ixs, Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( @@ -422,7 +422,7 @@ pub fn process_vote_update_validator( new_identity_pubkey, )]; - let message = Message::new_with_payer(ixs, Some(&config.signers[0].pubkey())); + let message = Message::new_with_payer(&ixs, Some(&config.signers[0].pubkey())); let mut tx = Transaction::new_unsigned(message); tx.try_sign(&config.signers, recent_blockhash)?; check_account_for_fee( diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs index 110cbe4c1b..652a762107 100644 --- a/client/src/thin_client.rs +++ b/client/src/thin_client.rs @@ -368,7 +368,7 @@ impl SyncClient for ThinClient { keypair: &Keypair, instruction: Instruction, ) -> TransportResult { - let message = Message::new(vec![instruction]); + let message = Message::new(&[instruction]); self.send_message(&[keypair], message) } @@ -596,7 +596,7 @@ impl AsyncClient for ThinClient { instruction: Instruction, recent_blockhash: Hash, ) -> io::Result { - let message = Message::new(vec![instruction]); + let message = Message::new(&[instruction]); self.async_send_message(&[keypair], message, recent_blockhash) } fn async_transfer( diff --git a/core/src/storage_stage.rs b/core/src/storage_stage.rs index bf88c6575c..2a3ad88ac3 100644 --- a/core/src/storage_stage.rs +++ b/core/src/storage_stage.rs @@ -312,7 +312,7 @@ impl StorageStage { } let signer_keys = vec![keypair.as_ref(), storage_keypair.as_ref()]; - let message = Message::new_with_payer(vec![instruction], Some(&signer_keys[0].pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&signer_keys[0].pubkey())); let transaction = Transaction::new(&signer_keys, message, blockhash); // try sending the transaction upto 5 times for _ in 0..5 { diff --git a/core/tests/storage_stage.rs b/core/tests/storage_stage.rs index 57223b337b..708734641a 100644 --- a/core/tests/storage_stage.rs +++ b/core/tests/storage_stage.rs @@ -120,7 +120,7 @@ mod tests { None, ) .unwrap(); - let message = Message::new_with_payer(vec![mining_proof_ix], Some(&mint_keypair.pubkey())); + let message = Message::new_with_payer(&[mining_proof_ix], Some(&mint_keypair.pubkey())); let mining_proof_tx = Transaction::new( &[&mint_keypair, archiver_keypair.as_ref()], message, diff --git a/faucet/src/faucet.rs b/faucet/src/faucet.rs index 9f8dca94a0..dd67ab633e 100644 --- a/faucet/src/faucet.rs +++ b/faucet/src/faucet.rs @@ -127,7 +127,7 @@ impl Faucet { let create_instruction = system_instruction::transfer(&self.mint_keypair.pubkey(), &to, lamports); - let message = Message::new(vec![create_instruction]); + let message = Message::new(&[create_instruction]); Ok(Transaction::new(&[&self.mint_keypair], message, blockhash)) } else { Err(Error::new( @@ -413,7 +413,7 @@ mod tests { let keypair = Keypair::new(); let expected_instruction = system_instruction::transfer(&keypair.pubkey(), &to, lamports); - let message = Message::new(vec![expected_instruction]); + let message = Message::new(&[expected_instruction]); let expected_tx = Transaction::new(&[&keypair], message, blockhash); let expected_bytes = serialize(&expected_tx).unwrap(); let mut expected_vec_with_length = vec![0; 2]; diff --git a/faucet/tests/local-faucet.rs b/faucet/tests/local-faucet.rs index f0ebfabc03..5b1749f652 100644 --- a/faucet/tests/local-faucet.rs +++ b/faucet/tests/local-faucet.rs @@ -16,7 +16,7 @@ fn test_local_faucet() { let lamports = 50; let blockhash = Hash::new(&to.as_ref()); let create_instruction = system_instruction::transfer(&keypair.pubkey(), &to, lamports); - let message = Message::new(vec![create_instruction]); + let message = Message::new(&[create_instruction]); let expected_tx = Transaction::new(&[&keypair], message, blockhash); let (sender, receiver) = channel(); diff --git a/install/src/command.rs b/install/src/command.rs index 5c59440c22..b919ddb8e4 100644 --- a/install/src/command.rs +++ b/install/src/command.rs @@ -244,7 +244,7 @@ fn store_update_manifest( update_manifest, ); - let message = Message::new_with_payer(vec![instruction], Some(&from_keypair.pubkey())); + let message = Message::new_with_payer(&[instruction], Some(&from_keypair.pubkey())); let mut transaction = Transaction::new(&signers, message, recent_blockhash); rpc_client.send_and_confirm_transaction(&mut transaction, &[from_keypair])?; Ok(()) diff --git a/keygen/src/keygen.rs b/keygen/src/keygen.rs index 57c85e7541..d85acfbdef 100644 --- a/keygen/src/keygen.rs +++ b/keygen/src/keygen.rs @@ -566,7 +566,7 @@ fn main() -> Result<(), Box> { } ("verify", Some(matches)) => { let keypair = get_keypair_from_matches(matches, config, wallet_manager)?; - let simple_message = Message::new(vec![Instruction::new( + let simple_message = Message::new(&[Instruction::new( Pubkey::default(), &0, vec![AccountMeta::new(keypair.pubkey(), true)], diff --git a/ledger/src/entry.rs b/ledger/src/entry.rs index 9875e5c59b..e354e7cac5 100644 --- a/ledger/src/entry.rs +++ b/ledger/src/entry.rs @@ -685,8 +685,7 @@ mod tests { fn test_verify_tick_hash_count() { let hashes_per_tick = 10; let keypairs: Vec<&Keypair> = Vec::new(); - let tx: Transaction = - Transaction::new(&keypairs, Message::new(Vec::new()), Hash::default()); + let tx: Transaction = Transaction::new(&keypairs, Message::new(&[]), Hash::default()); let tx_entry = Entry::new(&Hash::default(), 1, vec![tx]); let full_tick_entry = Entry::new_tick(hashes_per_tick, &Hash::default()); let partial_tick_entry = Entry::new_tick(hashes_per_tick - 1, &Hash::default()); diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs index 81f5bcb111..1fa3732765 100644 --- a/local-cluster/src/local_cluster.rs +++ b/local-cluster/src/local_cluster.rs @@ -614,7 +614,7 @@ impl LocalCluster { StorageAccountType::Validator }; let message = Message::new_with_payer( - storage_instruction::create_storage_account( + &storage_instruction::create_storage_account( &from_keypair.pubkey(), &from_keypair.pubkey(), &storage_keypair.pubkey(), diff --git a/programs/budget/src/budget_processor.rs b/programs/budget/src/budget_processor.rs index a2facf404c..bcc29c058c 100644 --- a/programs/budget/src/budget_processor.rs +++ b/programs/budget/src/budget_processor.rs @@ -256,7 +256,7 @@ mod tests { budget_instruction::payment(&alice_pubkey, &bob_pubkey, &budget_pubkey, 1); instructions[1].accounts = vec![]; //