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
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ import { useTxNotifications } from "hooks/useTxNotifications";
import { CircleAlertIcon } from "lucide-react";
import { useCallback } from "react";
import { useForm } from "react-hook-form";
import {
type PreparedTransaction,
prepareContractCall,
sendAndConfirmTransaction,
} from "thirdweb";
import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
import { MintableERC721, MintableERC1155 } from "thirdweb/modules";
import { grantRoles, hasAllRoles } from "thirdweb/modules";
import { useReadContract } from "thirdweb/react";
import type { NFTMetadataInputLimited } from "types/modified-types";
import { parseAttributes } from "utils/parseAttributes";
Expand Down Expand Up @@ -79,10 +76,10 @@ function MintableModule(props: ModuleInstanceProps) {
contract: contract,
},
);
const hasMinterRole = useReadContract({
const hasMinterRole = useReadContract(hasAllRoles, {
contract: contract,
method: "function hasAllRoles(address user, uint256 roles) returns (bool)",
params: [ownerAccount?.address || "", MINTER_ROLE],
user: ownerAccount?.address || "",
roles: MINTER_ROLE,
});

const isBatchMetadataInstalled = !!props.allModuleContractInfo.find(
Expand All @@ -97,10 +94,10 @@ function MintableModule(props: ModuleInstanceProps) {
}

if (!hasMinterRole.data) {
const grantRoleTx = prepareContractCall({
const grantRoleTx = grantRoles({
contract,
method: "function grantRole(address user, uint256 role) public",
params: [ownerAccount.address || "", MINTER_ROLE],
user: ownerAccount.address,
roles: MINTER_ROLE,
});

await sendAndConfirmTransaction({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function ModuleInstance(props: ModuleInstanceProps) {
return <TransferableModule {...props} />;
}

if (props.contractInfo.name.includes("Mintable-ignore")) {
if (props.contractInfo.name.includes("Mintable")) {
return <MintableModule {...props} />;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@ export function mintWithRole(
return generatedMint({
contract: options.contract,
asyncParams: async () => {
const batchOfUris = await uploadOrExtractURIs(
[options.nft],
options.contract.client,
);
const baseURI = getBaseUriFromBatch(batchOfUris);
let baseURI = "";
if (options.nft) {
const batchOfUris = await uploadOrExtractURIs(
[options.nft],
options.contract.client,
);
baseURI = getBaseUriFromBatch(batchOfUris);
}

const tokenId = options.tokenId ?? maxUint256;
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,14 @@ export function mintWithRole(options: BaseTransactionOptions<NFTMintParams>) {
return generatedMint({
contract: options.contract,
asyncParams: async () => {
const batchOfUris = await uploadOrExtractURIs(
options.nfts,
options.contract.client,
);
const baseURI = getBaseUriFromBatch(batchOfUris);
let baseURI = "";
if (options.nfts?.[0] !== "") {
const batchOfUris = await uploadOrExtractURIs(
options.nfts,
options.contract.client,
);
baseURI = getBaseUriFromBatch(batchOfUris);
}

return {
to: getAddress(options.to),
Expand Down
Loading