Skip to content

Commit a1d1899

Browse files
authored
Merge pull request #44 from omarkilani/motleylabs/anchor-0.26
Update to Anchor 0.26, Auction House 1.4.0, Token Metadata 1.9.0
2 parents c31aaf1 + d4ff558 commit a1d1899

33 files changed

+12544
-5372
lines changed

cli/Cargo.lock

Lines changed: 2091 additions & 999 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
[package]
22
name = "reward-center-cli"
33
description = "A Metaplex auctioneer program that distributes spl token to the buyer and seller of NFTs"
4-
version = "0.2.4"
4+
version = "0.2.5"
55
edition = "2021"
66
repository = "https://github.com/holaplex/reward-center-program"
77
license = "GPL-3.0-or-later"
88

99
[dependencies]
10-
anchor-lang = "0.24.2"
10+
anchor-lang = "0.26.0"
1111
anyhow = "1.0.65"
1212
bs58 = "0.4.0"
1313
clap = { version = "4.0.18", features = ["derive"] }
1414
dirs = "4.0.0"
15-
env_logger = "0.9.1"
15+
env_logger = "0.10.0"
1616
hpl-reward-center = { path = "../program", features = ["no-entrypoint"] }
1717
hpl-reward-center-sdk = { path = "../sdk/reward-center" }
1818
log = "0.4.17"
19-
mpl-auction-house = { version = "~1.2.4", features = ["cpi", "no-entrypoint"] }
19+
mpl-auction-house = { version = "1.4.0", features = ["cpi", "no-entrypoint"] }
2020
mpl-auction-house-sdk = { path = "../sdk/auction-house" }
21-
mpl-token-metadata = { version = "~1.2.7", features = ["no-entrypoint"] }
21+
mpl-token-metadata = { version = "1.9.0", features = ["no-entrypoint"] }
2222
retry = "2.0.0"
2323
serde = { version = "1.0.145", features = ["derive"] }
2424
serde_json = "1.0.86"
2525
serde_yaml = "0.9.13"
26-
solana-address-lookup-table-program = "1.9.28"
27-
solana-client = "1.9.28"
28-
solana-program = "1.9.28"
29-
solana-sdk = "1.9.28"
30-
spl-associated-token-account = "1.0.3"
31-
spl-token = "3.2.0"
26+
solana-address-lookup-table-program = "1.14"
27+
solana-client = "1.14"
28+
solana-program = "1.14"
29+
solana-sdk = "1.14"
30+
spl-associated-token-account = "1.1.2"
31+
spl-token = { version = "3.5", features = ["no-entrypoint"] }

cli/src/commands/create.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ use solana_sdk::{
2929
signature::Keypair, signer::Signer, system_instruction::create_account,
3030
transaction::Transaction,
3131
};
32-
use spl_associated_token_account::{create_associated_token_account, get_associated_token_address};
32+
use spl_associated_token_account::{
33+
get_associated_token_address, instruction::create_associated_token_account,
34+
};
3335
use spl_token::{instruction::initialize_mint, native_mint, state::Mint};
3436

3537
use crate::{
@@ -97,6 +99,7 @@ pub fn generate_create_rewards_mint_ixs(
9799
rewards_mint_authority,
98100
&mint_auth_rewards_mint_token_account,
99101
rewards_mint,
102+
&spl_token::ID,
100103
);
101104

102105
Ok(vec![

cli/src/commands/create_alt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn process_create_address_table_lookup(
8585
let extend_lookup_table_ix = extend_lookup_table(
8686
address_lookup_table_pubkey,
8787
keypair.pubkey(),
88-
keypair.pubkey(),
88+
Some(keypair.pubkey()),
8989
addresses,
9090
);
9191

0 commit comments

Comments
 (0)