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.

Sign up for GitHub

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

Jump to bottom

cli: Fix upgradeable program clones #3010

Merged
merged 3 commits into from
Jun 7, 2024
Merged

cli: Fix upgradeable program clones #3010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bb54db
cli: Fix upgradeable program clones
acheroncrypto Jun 6, 2024
bf80531
Only use `--clone-upgradeable-program` option for program accounts
acheroncrypto Jun 6, 2024
9344f67
Update CHANGELOG
acheroncrypto Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ The minor version will be incremented upon a breaking change and the patch versi
- idl: Fix `unexpected_cfgs` build warning ([#2992](https://github.com/coral-xyz/anchor/pull/2992)).
- lang: Make tuple struct fields public in `declare_program!` ([#2994](https://github.com/coral-xyz/anchor/pull/2994)).
- Remove `rust-version` from crate manifests ([#3000](https://github.com/coral-xyz/anchor/pull/3000)).
- cli: Fix upgradeable program clones ([#3010](https://github.com/coral-xyz/anchor/pull/3010)).

### Breaking

Expand Down
49 changes: 23 additions & 26 deletions cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3361,7 +3361,7 @@ fn validator_flags(
));
};

let mut pubkeys = value
let pubkeys = value
.as_array()
.unwrap()
.iter()
Expand All @@ -3370,36 +3370,33 @@ fn validator_flags(
Pubkey::from_str(address)
.map_err(|_| anyhow!("Invalid pubkey {}", address))
})
.collect::<Result<HashSet<Pubkey>>>()?;

let accounts_keys = pubkeys.iter().cloned().collect::<Vec<_>>();
let accounts = client.get_multiple_accounts(&accounts_keys)?;

// Check if there are program accounts
for (account, acc_key) in accounts.iter().zip(accounts_keys) {
if let Some(account) = account {
if account.owner == bpf_loader_upgradeable::id() {
let upgradable: UpgradeableLoaderState = account
.deserialize_data()
.map_err(|_| anyhow!("Invalid program account {}", acc_key))?;

if let UpgradeableLoaderState::Program {
programdata_address,
} = upgradable
.collect::<Result<HashSet<Pubkey>>>()?
.into_iter()
.collect::<Vec<_>>();
let accounts = client.get_multiple_accounts(&pubkeys)?;

for (pubkey, account) in pubkeys.into_iter().zip(accounts) {
match account {
Some(account) => {
// Use a different flag for program accounts to fix the problem
// described in https://github.com/anza-xyz/agave/issues/522
if account.owner == bpf_loader_upgradeable::id()
// Only programs are supported with `--clone-upgradeable-program`
&& matches!(
account.deserialize_data::<UpgradeableLoaderState>()?,
UpgradeableLoaderState::Program { .. }
)
{
pubkeys.insert(programdata_address);
flags.push("--clone-upgradeable-program".to_string());
flags.push(pubkey.to_string());
} else {
flags.push("--clone".to_string());
flags.push(pubkey.to_string());
}
}
} else {
return Err(anyhow!("Account {} not found", acc_key));
_ => return Err(anyhow!("Account {} not found", pubkey)),
}
}

for pubkey in &pubkeys {
// Push the clone flag for each array entry
flags.push("--clone".to_string());
flags.push(pubkey.to_string());
}
} else if key == "deactivate_feature" {
// Verify that the feature flags are valid pubkeys
let pubkeys_result: Result<Vec<Pubkey>, _> = value
Expand Down
Loading