Skip to content

[BLD-71] SDK, Dashboard: Fix Supplies shown in ERC721 contract #7803

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.

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

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/lemon-mammals-slide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

Update `getTotalClaimedSupply` and `getTotalUnclaimedSupply` erc721 extensions to consider `startTokenId` if the contract has `startTokenId` set.
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
"use client";
import { useMemo } from "react";
import type { ThirdwebContract } from "thirdweb";
import {
nextTokenIdToMint,
startTokenId,
totalSupply,
getTotalClaimedSupply,
totalSupply as getTotalSupply,
getTotalUnclaimedSupply,
} from "thirdweb/extensions/erc721";
import { useReadContract } from "thirdweb/react";
import { StatCard } from "../../overview/components/stat-card";
Expand All @@ -14,42 +13,34 @@ interface SupplyCardsProps {
}

export const SupplyCards: React.FC<SupplyCardsProps> = ({ contract }) => {
const nextTokenIdQuery = useReadContract(nextTokenIdToMint, {
const totalSupplyQuery = useReadContract(getTotalSupply, {
contract,
});

const totalSupplyQuery = useReadContract(totalSupply, {
const totalClaimedSupplyQuery = useReadContract(getTotalClaimedSupply, {
contract,
});

const startTokenIdQuery = useReadContract(startTokenId, { contract });

const realTotalSupply = useMemo(
() => (nextTokenIdQuery.data || 0n) - (startTokenIdQuery.data || 0n),
[nextTokenIdQuery.data, startTokenIdQuery.data],
);

const unclaimedSupply = useMemo(
() => (realTotalSupply - (totalSupplyQuery?.data || 0n)).toString(),
[realTotalSupply, totalSupplyQuery.data],
);
const totalUnClaimedSupplyQuery = useReadContract(getTotalUnclaimedSupply, {
contract,
});

return (
<div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
<StatCard
isPending={nextTokenIdQuery.isPending}
isPending={totalSupplyQuery.isPending}
label="Total Supply"
value={realTotalSupply.toString()}
value={totalSupplyQuery.data?.toString() || "N/A"}
/>
<StatCard
isPending={totalSupplyQuery.isPending}
isPending={totalClaimedSupplyQuery.isPending}
label="Claimed Supply"
value={totalSupplyQuery?.data?.toString() || "N/A"}
value={totalClaimedSupplyQuery.data?.toString() || "N/A"}
/>
<StatCard
isPending={totalSupplyQuery.isPending || nextTokenIdQuery.isPending}
isPending={totalUnClaimedSupplyQuery.isPending}
label="Unclaimed Supply"
value={unclaimedSupply}
value={totalUnClaimedSupplyQuery.data?.toString() || "N/A"}
/>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { BaseTransactionOptions } from "../../../transaction/types.js";
import { nextTokenIdToClaim } from "../__generated__/IDrop/read/nextTokenIdToClaim.js";
import { startTokenId } from "../__generated__/IERC721A/read/startTokenId.js";

/**
* Retrieves the total claimed supply of ERC721 tokens.
Expand All @@ -20,5 +21,10 @@ import { nextTokenIdToClaim } from "../__generated__/IDrop/read/nextTokenIdToCla
export async function getTotalClaimedSupply(
options: BaseTransactionOptions,
): Promise<bigint> {
return nextTokenIdToClaim(options);
const [startTokenId_, nextTokenIdToClaim_] = await Promise.all([
startTokenId(options).catch(() => 0n),
nextTokenIdToClaim(options),
]);

return nextTokenIdToClaim_ - startTokenId_;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { BaseTransactionOptions } from "../../../transaction/types.js";
import { startTokenId } from "../__generated__/IERC721A/read/startTokenId.js";
import { nextTokenIdToMint } from "../__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
import { getTotalClaimedSupply } from "./getTotalClaimedSupply.js";

Expand All @@ -19,9 +20,12 @@ import { getTotalClaimedSupply } from "./getTotalClaimedSupply.js";
export async function getTotalUnclaimedSupply(
options: BaseTransactionOptions,
): Promise<bigint> {
const [nextTokenIdToMint_, totalClaimedSupply_] = await Promise.all([
nextTokenIdToMint(options),
getTotalClaimedSupply(options),
]);
return nextTokenIdToMint_ - totalClaimedSupply_;
const [startTokenId_, nextTokenIdToMint_, totalClaimedSupply_] =
await Promise.all([
startTokenId(options).catch(() => 0n),
nextTokenIdToMint(options),
getTotalClaimedSupply(options),
]);

return nextTokenIdToMint_ - startTokenId_ - totalClaimedSupply_;
}
Loading