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

chore: upgrade spl-token package #299

Merged
merged 16 commits into from
Mar 11, 2022
Merged

chore: upgrade spl-token package #299

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
db7efc5
token-vault: update to use new spl-token API
thlorenz Mar 9, 2022
abc7ada
token-metadata: move test consts to avoid circular ref
thlorenz Mar 10, 2022
88eee51
token-metadata: update to new spl-token API
thlorenz Mar 10, 2022
adc56c8
deps: upgrade spl-token to latest except for fixed-price and core
thlorenz Mar 11, 2022
ea31a77
core: deprecated TokenAcccount and remove spl dep
thlorenz Mar 11, 2022
4a8fb0a
metaplex: replace type + const removed from token-vault
thlorenz Mar 11, 2022
5455eab
Merge branch 'master' into thlorenz/chore/upgrade-spl-token
thlorenz Mar 11, 2022
047e54e
fixed-price: add mpl-core dep
thlorenz Mar 11, 2022
7e63e92
fixed-price: fix type error in test helper
thlorenz Mar 11, 2022
2091639
auction: upgrade to fixed mpl-core and fix type errors
thlorenz Mar 11, 2022
dd69a8a
token-metadata: upgrade to latest mpl-core and fixed types
thlorenz Mar 11, 2022
b29c52c
metaplex: upgrade mpl-core and fix type errors
thlorenz Mar 11, 2022
b798d4c
mpl-core: upgraded in auction-house, candy-machine and token-vault
thlorenz Mar 11, 2022
6af7750
deps: add updated yarn.lock
thlorenz Mar 11, 2022
7e9fc40
deps: add latest typescript dev dep project wide
thlorenz Mar 11, 2022
12ece8c
token-metadata: fix spl-token hidden exports issue via ts-ignore
thlorenz Mar 11, 2022
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
Prev Previous commit
Next Next commit
fixed-price: fix type error in test helper
  • Loading branch information
@thlorenz
thlorenz committed Mar 11, 2022
commit 7e63e92a95ad0251997327bb6e2d55022c58f3c4
2 changes: 2 additions & 0 deletions fixed-price-sale/js/src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { TokenAccount } from '@metaplex-foundation/mpl-core';
import { Edition, MasterEdition, Metadata } from '@metaplex-foundation/mpl-token-metadata';
import { Connection, PublicKey } from '@solana/web3.js';
import { PROGRAM_ID } from '../consts';
import { strict as assert } from 'assert';

const VAULT_OWNER_PREFIX = 'mt_vault';
const HISTORY_PREFIX = 'history';
Expand Down Expand Up @@ -59,6 +60,7 @@ export const validateMembershipToken = async (
me: MasterEdition,
ta: TokenAccount,
) => {
assert(ta.data != null, 'token account data cannot be null');
const edition = (await Metadata.getEdition(connection, ta.data.mint)) as Edition;
return edition.data.parent === me.pubkey.toString();
};