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

fix(rs-sdk): remove deprecated multisig_create #139

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −56
Open

fix(rs-sdk): remove deprecated multisig_create #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347891a
fix(rs-sdk): remove deprecated multisig_create
joeymeere Nov 29, 2024
53e90c4
fix(rs-sdk): match version w/ program
joeymeere Nov 29, 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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "squads-multisig"
version = "2.0.1"
0xRigel-squads marked this conversation as resolved.
Show resolved Hide resolved
version = "2.1.0"
description = "An SDK for building automated programs on Solana"
edition = "2021"
license = "MIT OR Apache-2.0"
Expand Down
50 changes: 0 additions & 50 deletions sdk/rs/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pub use squads_multisig_program::accounts::BatchAccountsClose as BatchAccountsCl
pub use squads_multisig_program::accounts::ConfigTransactionAccountsClose as ConfigTransactionAccountsCloseAccounts;
pub use squads_multisig_program::accounts::ConfigTransactionCreate as ConfigTransactionCreateAccounts;
pub use squads_multisig_program::accounts::ConfigTransactionExecute as ConfigTransactionExecuteAccounts;
pub use squads_multisig_program::accounts::MultisigCreate as MultisigCreateAccounts;
pub use squads_multisig_program::accounts::MultisigCreateV2 as MultisigCreateAccountsV2;
pub use squads_multisig_program::accounts::ProposalCreate as ProposalCreateAccounts;
pub use squads_multisig_program::accounts::ProposalVote as ProposalVoteAccounts;
Expand All @@ -27,7 +26,6 @@ pub use squads_multisig_program::instruction::VaultTransactionAccountsClose as V
pub use squads_multisig_program::instruction::VaultTransactionCreate as VaultTransactionCreateData;
pub use squads_multisig_program::instruction::VaultTransactionExecute as VaultTransactionExecuteData;
pub use squads_multisig_program::instructions::ConfigTransactionCreateArgs;
pub use squads_multisig_program::instructions::MultisigCreateArgs;
pub use squads_multisig_program::instructions::MultisigCreateArgsV2;
pub use squads_multisig_program::instructions::ProposalCreateArgs;
pub use squads_multisig_program::instructions::ProposalVoteArgs;
Expand Down Expand Up @@ -73,54 +71,6 @@ pub async fn get_spending_limit(
Ok(spending_limit)
}

/// Creates a new multisig config transaction.
/// Example:
/// ```
/// use squads_multisig::anchor_lang::error::ComparedValues::Pubkeys;
/// use squads_multisig::solana_program::pubkey::Pubkey;
/// use squads_multisig::solana_program::system_program;
/// use squads_multisig::state::{ConfigAction, Member, Permissions, Permission};
/// use squads_multisig::client::{
/// MultisigCreateAccounts,
/// MultisigCreateArgs,
/// multisig_create
/// };
///
/// let ix = multisig_create(
/// MultisigCreateAccounts {
/// multisig: Pubkey::new_unique(),
/// create_key: Pubkey::new_unique(),
/// creator: Pubkey::new_unique(),
/// system_program: system_program::id(),
/// },
/// MultisigCreateArgs {
/// members: vec![
/// Member {
/// key: Pubkey::new_unique(),
/// permissions: Permissions::from_vec(&[Permission::Initiate, Permission::Vote, Permission::Execute]),
/// }
/// ],
/// threshold: 1,
/// time_lock: 0,
/// config_authority: None,
/// memo: Some("Deploy my own Squad".to_string()),
/// },
/// Some(squads_multisig_program::ID)
/// );
/// ```
///
pub fn multisig_create(
accounts: MultisigCreateAccounts,
args: MultisigCreateArgs,
program_id: Option<Pubkey>,
) -> Instruction {
Instruction {
accounts: accounts.to_account_metas(Some(false)),
data: MultisigCreateData { args }.data(),
program_id: program_id.unwrap_or(squads_multisig_program::ID),
}
}

/// Creates a new multisig config transaction.
/// Example:
/// ```
Expand Down
10 changes: 6 additions & 4 deletions sdk/rs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,28 @@ pub mod cpi {
use squads_multisig_program::anchor_lang::prelude::{CpiContext, Pubkey, Result};
pub use squads_multisig_program::cpi::accounts::{
BatchAddTransaction, BatchCreate, BatchExecuteTransaction, ConfigTransactionCreate,
ConfigTransactionExecute, MultisigAddSpendingLimit, MultisigConfig, MultisigCreate,
ConfigTransactionExecute, MultisigAddSpendingLimit, MultisigConfig, MultisigCreateV2,
MultisigRemoveSpendingLimit, ProposalActivate, ProposalCreate, ProposalVote,
SpendingLimitUse, VaultTransactionCreate, VaultTransactionExecute,
};
use squads_multisig_program::Member;

pub fn create_multisig<'info>(
ctx: CpiContext<'_, '_, '_, 'info, MultisigCreate<'info>>,
ctx: CpiContext<'_, '_, '_, 'info, MultisigCreateV2<'info>>,
members: Vec<Member>,
threshold: u16,
config_authority: Option<Pubkey>,
rent_collector: Option<Pubkey>,
time_lock: u32,
memo: Option<String>,
) -> Result<()> {
squads_multisig_program::cpi::multisig_create(
squads_multisig_program::cpi::multisig_create_v2(
ctx,
squads_multisig_program::MultisigCreateArgs {
squads_multisig_program::MultisigCreateArgsV2 {
members,
threshold,
config_authority,
rent_collector,
time_lock,
memo,
},
Expand Down