gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgradeable programs needs program account's address as program id (#14417)

Browse Source
This commit is contained in:
Jack May
2021-01-04 13:45:05 -08:00
committed by GitHub
parent a41b5137f6
commit 0619805806
6 changed files with 48 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
programs/bpf_loader/src/lib.rs
View File

@@ -273,6 +273,7 @@ fn process_instruction_common(
};
executor.execute(
loader_id,
first_account.unsigned_key(),
keyed_accounts,
instruction_data,
invoke_context,
@@ -664,6 +665,7 @@ impl Executor for BPFExecutor {
fn execute(
&self,
loader_id: &Pubkey,
program_id: &Pubkey,
keyed_accounts: &[KeyedAccount],
instruction_data: &[u8],
invoke_context: &mut dyn InvokeContext,
@@ -676,12 +678,8 @@ impl Executor for BPFExecutor {
let program = next_keyed_account(&mut keyed_accounts_iter)?;
let parameter_accounts = keyed_accounts_iter.as_slice();
let mut parameter_bytes = serialize_parameters(
loader_id,
program.unsigned_key(),
parameter_accounts,
&instruction_data,
)?;
let mut parameter_bytes =
serialize_parameters(loader_id, program_id, parameter_accounts, &instruction_data)?;
{
let compute_meter = invoke_context.get_compute_meter();
let mut vm = match create_vm(