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 @@ -14,7 +14,12 @@ import { Flex, FormControl } from "@chakra-ui/react";
import { useMutation, useQuery } from "@tanstack/react-query";
import { verifyContract } from "app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage";
import { NetworkSelectorButton } from "components/selects/NetworkSelectorButton";
import { DEFAULT_FEE_BPS, DEFAULT_FEE_RECIPIENT } from "constants/addresses";
import {
DEFAULT_FEE_BPS,
DEFAULT_FEE_BPS_NEW,
DEFAULT_FEE_RECIPIENT,
THIRDWEB_PUBLISHER_ADDRESS,
} from "constants/addresses";
import { SolidityInput } from "contract-ui/components/solidity-inputs";
import { useTrack } from "hooks/analytics/useTrack";
import { useTxNotifications } from "hooks/useTxNotifications";
Expand Down Expand Up @@ -161,6 +166,13 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
const constructorParams =
metadata.abi.find((a) => a.type === "constructor")?.inputs || [];

const defaultFeeRecipientFunction = metadata.abi.find(
(a) => a.type === "function" && a.name === "DEFAULT_FEE_RECIPIENT",
);
const hasInbuiltDefaultFeeConfig =
defaultFeeRecipientFunction &&
metadata.publisher === THIRDWEB_PUBLISHER_ADDRESS;

const [customFactoryNetwork, customFactoryAddress] = Object.entries(
metadata?.factoryDeploymentData?.customFactoryInput
?.customFactoryAddresses || {},
Expand Down Expand Up @@ -457,7 +469,9 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
name: params.contractMetadata?.name || "",
contractURI: _contractURI,
defaultAdmin: params.deployParams._defaultAdmin as string,
platformFeeBps: DEFAULT_FEE_BPS,
platformFeeBps: hasInbuiltDefaultFeeConfig
? DEFAULT_FEE_BPS_NEW
: DEFAULT_FEE_BPS,
platformFeeRecipient: DEFAULT_FEE_RECIPIENT,
trustedForwarders: params.deployParams._trustedForwarders
? JSON.parse(params.deployParams._trustedForwarders as string)
Expand All @@ -473,8 +487,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
payees,
shares,
_contractURI,
_platformFeeBps: DEFAULT_FEE_BPS,
_platformFeeRecipient: DEFAULT_FEE_RECIPIENT,
platformFeeBps: hasInbuiltDefaultFeeConfig
? DEFAULT_FEE_BPS_NEW
: DEFAULT_FEE_BPS,
platformFeeRecipient: DEFAULT_FEE_RECIPIENT,
};

const salt = params.deployDeterministic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ interface PlatformFeeFieldsetProps {
isMarketplace: boolean;
}

export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = (
props,
) => {
export const PlatformFeeFieldset: React.FC<PlatformFeeFieldsetProps> = ({
isMarketplace,
}) => {
return (
<Fieldset legend="Platform fees">
<div className="flex flex-col gap-4 md:flex-row">
{props.isMarketplace ? (
{isMarketplace ? (
<p className="mb-3 pt-4 text-muted-foreground text-sm italic">
A 2.5% platform fee is deducted from each sale to support ongoing
platform operations and improvements.{" "}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ export const ContractFunctionsPanel: React.FC<ContractFunctionsPanelProps> = ({
twAccount,
}) => {
// TODO: clean this up

const functionsWithExtension = useMemo(() => {
const allFunctions = fnsOrEvents.filter((f) => f.type === "function");
const results: ExtensionFunctions[] = [];
Expand Down
4 changes: 4 additions & 0 deletions apps/dashboard/src/constants/addresses.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
export const THIRDWEB_DEPLOYER_ADDRESS =
"0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024";

export const THIRDWEB_PUBLISHER_ADDRESS =
"0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024";

export const DEFAULT_FEE_RECIPIENT =
"0x1af20c6b23373350ad464700b5965ce4b0d2ad94";

export const DEFAULT_FEE_BPS = 250;
export const DEFAULT_FEE_BPS_NEW = 150;
Loading