Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/gold-tigers-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@thirdweb-dev/solana": patch
---

enforce creator value to include the creator at a minimum
45 changes: 16 additions & 29 deletions packages/solana/src/classes/deployer.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import {
NFTCollectionMetadataInput,
NFTCollectionMetadataInputSchema,
TokenMetadataInput,
TokenMetadataInputSchema,
} from "../types/contracts";
import {
NFTDropContractSchema,
NFTDropMetadataInput,
} from "../types/contracts/nft-drop";
import { enforceCreator } from "./helpers/creators-helper";
import { findMetadataPda, Metaplex, token } from "@metaplex-foundation/js";
import {
createCreateMetadataAccountV2Instruction,
Expand Down Expand Up @@ -46,13 +48,7 @@ export class Deployer {
symbol: tokenMetadataParsed.symbol || "",
sellerFeeBasisPoints: 0,
uri,
creators: [
{
address: owner,
share: 100,
verified: false,
},
],
creators: enforceCreator([], this.metaplex.identity().publicKey),
collection: null,
uses: null,
};
Expand All @@ -77,20 +73,21 @@ export class Deployer {
async createNftCollection(
collectionMetadata: NFTCollectionMetadataInput,
): Promise<string> {
const uri = await this.storage.uploadMetadata(collectionMetadata);
const parsed = NFTCollectionMetadataInputSchema.parse(collectionMetadata);
const uri = await this.storage.uploadMetadata(parsed);

const { nft: collectionNft } = await this.metaplex
.nfts()
.create({
name: collectionMetadata.name,
symbol: collectionMetadata.symbol,
name: parsed.name,
symbol: parsed.symbol,
sellerFeeBasisPoints: 0,
uri,
isCollection: true,
creators: collectionMetadata.creators?.map((creator) => ({
address: new PublicKey(creator.address),
share: creator.share,
})),
creators: enforceCreator(
parsed.creators,
this.metaplex.identity().publicKey,
),
})
.run();
return collectionNft.mint.address.toBase58();
Expand All @@ -101,26 +98,16 @@ export class Deployer {

// TODO make it a single tx
const collection = await this.createNftCollection(metadata);
const creators =
parsed.creators.length > 0
? parsed.creators.map((creator) => ({
address: new PublicKey(creator.address),
share: creator.share,
verified: creator.verified,
}))
: [
{
address: this.metaplex.identity().publicKey,
share: 100,
verified: true,
},
];

const { candyMachine: nftDrop } = await this.metaplex
.candyMachines()
.create({
...parsed,
collection: new PublicKey(collection),
creators,
creators: enforceCreator(
parsed.creators,
this.metaplex.identity().publicKey,
),
})
.run();

Expand Down
22 changes: 22 additions & 0 deletions packages/solana/src/classes/helpers/creators-helper.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { NFTCollectionMetadataInput } from "../../types/contracts";
import type { Creator } from "@metaplex-foundation/js";
import { PublicKey } from "@solana/web3.js";

export function enforceCreator(
creators: NFTCollectionMetadataInput["creators"] = [],
owner: PublicKey,
): Creator[] {
if (creators.length === 0) {
// If no creators are specified, we assume the owner is the creator
creators = creators.concat({
address: owner.toBase58(),
share: 100,
verified: true,
});
}
return creators.map((creator) => ({
...creator,
verified: creator.verified || false,
address: new PublicKey(creator.address),
}));
}