diff --git a/.github/workflows/apply-version-update.yml b/.github/workflows/apply-version-update.yml index 8906edd857..dc3c7183c9 100644 --- a/.github/workflows/apply-version-update.yml +++ b/.github/workflows/apply-version-update.yml @@ -13,7 +13,7 @@ permissions: env: NODE_VERSION: 17.0.1 - ANCHOR_VERSION: 0.26.0 + ANCHOR_VERSION: 0.27.0 SOLANA_VERSION_STABLE: 1.14.13 RUST_TOOLCHAIN: stable diff --git a/.github/workflows/publish-on-pr-merge.yml b/.github/workflows/publish-on-pr-merge.yml index 0240fbffc8..20f05c877a 100644 --- a/.github/workflows/publish-on-pr-merge.yml +++ b/.github/workflows/publish-on-pr-merge.yml @@ -10,7 +10,7 @@ permissions: env: NODE_VERSION: 17.0.1 - ANCHOR_VERSION: 0.26.0 + ANCHOR_VERSION: 0.27.0 SOLANA_VERSION_STABLE: 1.14.13 RUST_TOOLCHAIN: stable diff --git a/.github/workflows/verify-lib-on-pr-open.yml b/.github/workflows/verify-lib-on-pr-open.yml index 3ceb1f96e3..fd7d572d4c 100644 --- a/.github/workflows/verify-lib-on-pr-open.yml +++ b/.github/workflows/verify-lib-on-pr-open.yml @@ -14,7 +14,7 @@ permissions: env: NODE_VERSION: 17.0.1 - ANCHOR_VERSION: 0.26.0 + ANCHOR_VERSION: 0.27.0 SOLANA_VERSION_STABLE: 1.14.13 RUST_TOOLCHAIN: stable diff --git a/README.md b/README.md index 82a3110b82..84aeb67ebc 100644 --- a/README.md +++ b/README.md @@ -231,3 +231,4 @@ under either the [MIT][mit-license] or the [Apache][apache-license] licenses. [apache-license]: https://www.apache.org/licenses/LICENSE-2.0.txt [mit-license]: https://www.mit.edu/~amini/LICENSE.md + diff --git a/hydra/program/src/error.rs b/hydra/program/src/error.rs index 3d30d1b5db..2750d7ffa2 100644 --- a/hydra/program/src/error.rs +++ b/hydra/program/src/error.rs @@ -92,6 +92,6 @@ pub enum HydraError { #[msg("Before you remove a wallet or NFT member please transfer the shares to another member")] RemoveSharesMustBeZero, - #[msg("Sending Sol to a SPL token destination will render the sol unusable")] + #[msg("Sending Sol to a non-Native Account destination will render the sol unusable")] InvalidCloseAccountDestination, } diff --git a/hydra/program/src/processors/remove_member/process_remove_member.rs b/hydra/program/src/processors/remove_member/process_remove_member.rs index 3751ecf746..cfb61dbfa3 100644 --- a/hydra/program/src/processors/remove_member/process_remove_member.rs +++ b/hydra/program/src/processors/remove_member/process_remove_member.rs @@ -38,7 +38,12 @@ pub fn remove_member(ctx: Context) -> Result<()> { assert_owned_by(&fanout.to_account_info(), &crate::ID)?; assert_owned_by(&member_voucher.to_account_info(), &crate::ID)?; update_fanout_for_remove(fanout)?; - if assert_owned_by(&ctx.accounts.member, &spl_token::id()).is_ok() { + if assert_owned_by( + &ctx.accounts.destination, + &anchor_lang::solana_program::system_program::id(), + ) + .is_err() + { return Err(HydraError::InvalidCloseAccountDestination.into()); } if fanout.membership_model != MembershipModel::NFT