diff --git a/.changeset/forty-beers-fetch.md b/.changeset/forty-beers-fetch.md new file mode 100644 index 00000000000..24ebebb4152 --- /dev/null +++ b/.changeset/forty-beers-fetch.md @@ -0,0 +1,5 @@ +--- +"@thirdweb-dev/sdk": patch +--- + +Remove barrel files diff --git a/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministic.ts b/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministic.ts index c7ac2c4a322..99a196fd796 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministic.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministic.ts @@ -1,7 +1,7 @@ import { BigNumber, type PopulatedTransaction, type Signer } from "ethers"; import invariant from "tiny-invariant"; import { PrecomputedDeploymentTransaction } from "../../types/any-evm/deploy-data"; -import type { DeployOptions } from "../../types/deploy"; +import type { DeployOptions } from "../../types/deploy/deploy-options"; import { isContractDeployed } from "./isContractDeployed"; /** diff --git a/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministicRaw.ts b/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministicRaw.ts index b47d4d06424..003e00686c0 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministicRaw.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/deployContractDeterministicRaw.ts @@ -5,7 +5,7 @@ import { type Signer, } from "ethers"; import invariant from "tiny-invariant"; -import type { DeployOptions } from "../../types/deploy"; +import type { DeployOptions } from "../../types/deploy/deploy-options"; import { isContractDeployed } from "./isContractDeployed"; import { getInitBytecodeWithSalt } from "./getInitBytecodeWithSalt"; diff --git a/packages/sdk/src/evm/common/any-evm-utils/deployCreate2Factory.ts b/packages/sdk/src/evm/common/any-evm-utils/deployCreate2Factory.ts index b17f57ffa56..81536b29826 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/deployCreate2Factory.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/deployCreate2Factory.ts @@ -1,6 +1,6 @@ import { BigNumber, Signer } from "ethers"; import invariant from "tiny-invariant"; -import type { DeployOptions } from "../../types/deploy"; +import type { DeployOptions } from "../../types/deploy/deploy-options"; import { CUSTOM_GAS_FOR_CHAIN } from "../any-evm-constants"; import { COMMON_FACTORY } from "./constants"; import { isContractDeployed } from "./isContractDeployed"; diff --git a/packages/sdk/src/evm/common/any-evm-utils/deployDirectDeterministic.ts b/packages/sdk/src/evm/common/any-evm-utils/deployDirectDeterministic.ts index 1f2027408d5..874bb181928 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/deployDirectDeterministic.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/deployDirectDeterministic.ts @@ -14,9 +14,9 @@ import { getInitBytecodeWithSalt } from "./getInitBytecodeWithSalt"; import { fetchAndCacheDeployMetadata } from "./fetchAndCacheDeployMetadata"; import { deployCreate2Factory } from "./deployCreate2Factory"; import { convertParamValues } from "./convertParamValues"; -import { AbiInput } from "../../schema"; import { getCreate2FactoryAddress } from "./getCreate2FactoryAddress"; import { fetchPublishedContractFromPolygon } from "./fetchPublishedContractFromPolygon"; +import { AbiInput } from "../../schema/contracts/custom"; /** * Direct deploy a contract at a deterministic address, using Create2 method diff --git a/packages/sdk/src/evm/common/any-evm-utils/deployWithThrowawayDeployer.ts b/packages/sdk/src/evm/common/any-evm-utils/deployWithThrowawayDeployer.ts index 17112692a34..7deac75762b 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/deployWithThrowawayDeployer.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/deployWithThrowawayDeployer.ts @@ -1,6 +1,6 @@ import { ContractFactory, type Signer } from "ethers"; import { PrecomputedDeploymentTransaction } from "../../types/any-evm/deploy-data"; -import type { DeployOptions } from "../../types/deploy"; +import type { DeployOptions } from "../../types/deploy/deploy-options"; import { DEPLOYER_ABI, DEPLOYER_BYTECODE } from "./constants"; import { createTransactionBatches } from "./createTransactionBatches"; diff --git a/packages/sdk/src/evm/common/any-evm-utils/fetchAndCacheDeployMetadata.ts b/packages/sdk/src/evm/common/any-evm-utils/fetchAndCacheDeployMetadata.ts index d49b3732edd..968b3317a3a 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/fetchAndCacheDeployMetadata.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/fetchAndCacheDeployMetadata.ts @@ -1,7 +1,7 @@ import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { fetchExtendedReleaseMetadata } from "../feature-detection/fetchExtendedReleaseMetadata"; import { fetchPreDeployMetadata } from "../feature-detection/fetchPreDeployMetadata"; -import type { DeployMetadata } from "../../types/deploy"; +import type { DeployMetadata } from "../../types/deploy/deploy-options"; const deployMetadataCache: Record = {}; diff --git a/packages/sdk/src/evm/common/any-evm-utils/fetchPublishedContractFromPolygon.ts b/packages/sdk/src/evm/common/any-evm-utils/fetchPublishedContractFromPolygon.ts index 52c6d1a40ac..dcb15cb8ffa 100644 --- a/packages/sdk/src/evm/common/any-evm-utils/fetchPublishedContractFromPolygon.ts +++ b/packages/sdk/src/evm/common/any-evm-utils/fetchPublishedContractFromPolygon.ts @@ -3,13 +3,14 @@ import ContractPublisherAbi from "@thirdweb-dev/contracts-js/dist/abis/ContractP import type { ContractPublisher } from "@thirdweb-dev/contracts-js"; import { getContractPublisherAddress } from "../../constants/addresses/getContractPublisherAddress"; import { getChainProvider } from "../../constants/urls"; -import { AddressOrEns, PublishedContractSchema } from "../../schema"; import { resolveAddress } from "../ens/resolveAddress"; import invariant from "tiny-invariant"; import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { fetchAndCacheDeployMetadata } from "./fetchAndCacheDeployMetadata"; -import { getSupportedChains } from "../../constants"; import { Polygon } from "@thirdweb-dev/chains"; +import { getSupportedChains } from "../../constants/chains/supportedChains"; +import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; +import { PublishedContractSchema } from "../../schema/contracts/custom"; export const THIRDWEB_DEPLOYER = "0xdd99b75f095d0c4d5112aCe938e4e6ed962fb024"; diff --git a/packages/sdk/src/evm/common/index.ts b/packages/sdk/src/evm/common/index.ts deleted file mode 100644 index 83e7924c905..00000000000 --- a/packages/sdk/src/evm/common/index.ts +++ /dev/null @@ -1,94 +0,0 @@ -export * from "./error"; -export * from "./snapshots"; -export * from "./role"; -export * from "./metadata-resolver"; -export * from "./gas-price"; -export * from "./fetchContractMetadata"; - -// feature detection -export * from "./feature-detection/matchesPrebuiltAbi"; -export * from "./feature-detection/hasMatchingAbi"; -export * from "./feature-detection/extractConstructorParams"; -export * from "./feature-detection/extractFunctions"; -export * from "./feature-detection/extractCommentFromMetadata"; -export * from "./feature-detection/extractConstructorParamsFromAbi"; -export * from "./feature-detection/extractFunctionParamsFromAbi"; -export * from "./feature-detection/extractFunctionsFromAbi"; -export * from "./feature-detection/extractEventsFromAbi"; -export * from "./feature-detection/extractMinimalProxyImplementationAddress"; -export * from "./feature-detection/resolveContractUriFromAddress"; -export * from "./feature-detection/extractIPFSHashFromBytecode"; -export * from "./feature-detection/fetchRawPredeployMetadata"; -export * from "./feature-detection/fetchPreDeployMetadata"; -export * from "./feature-detection/fetchExtendedReleaseMetadata"; -export * from "./feature-detection/detectFeatures"; -export * from "./feature-detection/getAllDetectedFeatures"; -export * from "./feature-detection/getAllDetectedFeatureNames"; -export * from "./feature-detection/isFeatureEnabled"; -export * from "./feature-detection/assertEnabled"; -export * from "./feature-detection/detectContractFeature"; -export * from "./feature-detection/hasFunction"; -export * from "./plugin/joinABIs"; -export * from "./plugin/getCompositePluginABI"; - -export * from "./version-checker"; -export * from "./fetchSourceFilesFromMetadata"; - -// currency -export { isNativeToken } from "./currency/isNativeToken"; -export { cleanCurrencyAddress } from "./currency/cleanCurrencyAddress"; -export { normalizePriceValue } from "./currency/normalizePriceValue"; -export { fetchCurrencyMetadata } from "./currency/fetchCurrencyMetadata"; -export { fetchCurrencyValue } from "./currency/fetchCurrencyValue"; -export { setErc20Allowance } from "./currency/setErc20Allowance"; -export { approveErc20Allowance } from "./currency/approveErc20Allowance"; -export { hasERC20Allowance } from "./currency/hasERC20Allowance"; -export { normalizeAmount } from "./currency/normalizeAmount"; -export { toEther } from "./currency/toEther"; -export { toWei } from "./currency/toWei"; -export { toUnits } from "./currency/toUnits"; -export { toDisplayValue } from "./currency/toDisplayValue"; - -export * from "./verification"; - -// any-evm-utils -export * from "./any-evm-utils/constants"; -export * from "./any-evm-utils/isContractDeployed"; -export * from "./any-evm-utils/isEIP155Enforced"; -export * from "./any-evm-utils/getCreate2FactoryAddress"; -export * from "./any-evm-utils/getSaltHash"; -export * from "./any-evm-utils/getInitBytecodeWithSalt"; -export * from "./any-evm-utils/computeDeploymentAddress"; -export * from "./any-evm-utils/computeEOAForwarderAddress"; -export * from "./any-evm-utils/computeForwarderAddress"; -export * from "./any-evm-utils/computeCloneFactoryAddress"; -export * from "./any-evm-utils/computeNativeTokenAddress"; -export * from "./any-evm-utils/getThirdwebContractAddress"; -export * from "./any-evm-utils/predictThirdwebContractAddress"; -export * from "./any-evm-utils/getEncodedConstructorParamsForThirdwebContract"; -export * from "./any-evm-utils/getKeylessTxn"; -export * from "./any-evm-utils/deployCreate2Factory"; -export * from "./any-evm-utils/deployDirectDeterministic"; -export * from "./any-evm-utils/deployContractDeterministicRaw"; -export * from "./any-evm-utils/deployContractDeterministic"; -export * from "./any-evm-utils/getDeploymentInfo"; -export * from "./any-evm-utils/deployWithThrowawayDeployer"; -export * from "./any-evm-utils/computeDeploymentInfo"; -export * from "./any-evm-utils/convertParamValues"; -export * from "./any-evm-utils/getCreate2FactoryDeploymentInfo"; -export * from "./any-evm-utils/fetchPublishedContractFromPolygon"; -export * from "./any-evm-utils/fetchAndCacheDeployMetadata"; -export * from "./any-evm-utils/estimateGasForDeploy"; -export * from "./any-evm-utils/createTransactionBatches"; - -export * from "./deploy"; - -// claim-conditions -export { convertToReadableQuantity } from "./claim-conditions/convertToReadableQuantity"; -export { fetchSnapshotEntryForAddress } from "./claim-conditions/fetchSnapshotEntryForAddress"; - -export { getCachedAbiForContract } from "./abi"; - -// ens -export * from "./ens/resolveEns"; -export * from "./ens/resolveAddress"; diff --git a/packages/sdk/src/evm/common/marketplace.ts b/packages/sdk/src/evm/common/marketplace.ts index 24e2348e909..b40e84917da 100644 --- a/packages/sdk/src/evm/common/marketplace.ts +++ b/packages/sdk/src/evm/common/marketplace.ts @@ -17,13 +17,11 @@ import { InterfaceId_IERC721, } from "../constants/contract"; import { ContractWrapper } from "../core/classes/contract-wrapper"; -import { - NewAuctionListing, - NewDirectListing, - Offer, - UnmappedOffer, -} from "../types/marketplace"; import { fetchCurrencyValue } from "./currency/fetchCurrencyValue"; +import { NewDirectListing } from "../types/marketplace/NewDirectListing"; +import { NewAuctionListing } from "../types/marketplace/NewAuctionListing"; +import { UnmappedOffer } from "../types/marketplace/UnmappedOffer"; +import { Offer } from "../types/marketplace/Offer"; /** * This method checks if the given token is approved for the transferrerContractAddress contract. diff --git a/packages/sdk/src/evm/common/metadata-resolver.ts b/packages/sdk/src/evm/common/metadata-resolver.ts index 3adb7214b1c..62fa7bd3367 100644 --- a/packages/sdk/src/evm/common/metadata-resolver.ts +++ b/packages/sdk/src/evm/common/metadata-resolver.ts @@ -9,7 +9,7 @@ import { getMultichainRegistryAddress } from "../constants/addresses/getMulticha import { getChainProvider } from "../constants/urls"; import type { TWMultichainRegistryLogic } from "@thirdweb-dev/contracts-js"; import { constructAbiFromBytecode } from "./feature-detection/getAllDetectedFeatures"; -import { SDKOptions } from "../schema"; +import { SDKOptions } from "../schema/sdk-options"; import { Polygon } from "@thirdweb-dev/chains"; // Internal static cache diff --git a/packages/sdk/src/evm/constants/index.ts b/packages/sdk/src/evm/constants/index.ts deleted file mode 100644 index 3be9c90e674..00000000000 --- a/packages/sdk/src/evm/constants/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -// addresses -export * from "./addresses/LOCAL_NODE_PKEY"; -export * from "./addresses/CONTRACT_ADDRESSES"; -export * from "./addresses/APPROVED_IMPLEMENTATIONS"; -export * from "./addresses/getApprovedImplementation"; -export * from "./addresses/getContractAddressByChainId"; -export * from "./addresses/getContractPublisherAddress"; -export * from "./addresses/getMultichainRegistryAddress"; -export * from "./addresses/getDefaultTrustedForwarders"; - -// chains -export * from "./chains/ChainId"; -export * from "./chains/SUPPORTED_CHAIN_ID"; -export * from "./chains/SUPPORTED_CHAIN_IDS"; -export * from "./chains/supportedChains"; - -export * from "./contract"; -export * from "./currency"; -export * from "./events"; -export * from "./urls"; -export * from "./contract-features"; diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts index 8f1a4fa2af5..a1612a2633b 100644 --- a/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts +++ b/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts @@ -25,16 +25,18 @@ import { MarketplaceDirect } from "../../core/classes/marketplace-direct"; import { Transaction } from "../../core/classes/transactions"; import { UpdateableNetwork } from "../../core/interfaces/contract"; import { NetworkInput } from "../../core/types"; -import { ListingType } from "../../enums"; import { Abi, AbiInput, AbiSchema } from "../../schema/contracts/custom"; import { MarketplaceContractSchema } from "../../schema/contracts/marketplace"; import { SDKOptions } from "../../schema/sdk-options"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { Price } from "../../types/currency"; -import { AuctionListing, DirectListing, Offer } from "../../types/marketplace"; import { MarketplaceFilter } from "../../types/marketplace/MarketPlaceFilter"; import { UnmappedOffer } from "../../types/marketplace/UnmappedOffer"; import { MARKETPLACE_CONTRACT_ROLES } from "../contractRoles"; +import { ListingType } from "../../enums/marketplace/ListingType"; +import { AuctionListing } from "../../types/marketplace/AuctionListing"; +import { DirectListing } from "../../types/marketplace/DirectListing"; +import { Offer } from "../../types/marketplace/Offer"; /** * Create your own whitelabel marketplace that enables users to buy and sell any digital assets. diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts index 2e23db42347..2943b90dbc4 100644 --- a/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts +++ b/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts @@ -23,7 +23,6 @@ import { GasCostEstimator } from "../../core/classes/gas-cost-estimator"; import { Transaction } from "../../core/classes/transactions"; import { UpdateableNetwork } from "../../core/interfaces/contract"; import { NetworkInput, TransactionResultWithId } from "../../core/types"; -import { VoteType } from "../../enums"; import { Abi, AbiInput, AbiSchema } from "../../schema/contracts/custom"; import { VoteContractSchema } from "../../schema/contracts/vote"; import { SDKOptions } from "../../schema/sdk-options"; @@ -36,6 +35,7 @@ import { ProposalVote, VoteSettings, } from "../../types/vote"; +import { VoteType } from "../../enums/vote/Vote"; /** * Create a decentralized organization for token holders to vote on proposals. diff --git a/packages/sdk/src/evm/core/classes/account-permissions.ts b/packages/sdk/src/evm/core/classes/account-permissions.ts index 8246a6819fc..819d621e42e 100644 --- a/packages/sdk/src/evm/core/classes/account-permissions.ts +++ b/packages/sdk/src/evm/core/classes/account-permissions.ts @@ -10,10 +10,11 @@ import type { IAccountPermissions_V1, } from "@thirdweb-dev/contracts-js"; import invariant from "tiny-invariant"; -import { detectContractFeature, resolveAddress } from "../../common"; +import { detectContractFeature } from "../../common/feature-detection/detectContractFeature"; +import { resolveAddress } from "../../common/ens/resolveAddress"; import { resolveOrGenerateId } from "../../common/signature-minting"; import { buildTransactionFunction } from "../../common/transactions"; -import { AddressOrEns } from "../../schema"; +import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { AdminFlag, DEFAULT_PERMISSIONS, @@ -29,7 +30,7 @@ import { SignerPermissionsOutput, SignerPermissionsSchema, SignerWithPermissions, -} from "../../types"; +} from "../../types/account"; import { AddressZero } from "../../constants/addresses/AddressZero"; export class AccountPermissions implements DetectableFeature { diff --git a/packages/sdk/src/evm/core/classes/account.ts b/packages/sdk/src/evm/core/classes/account.ts index 3dca7a87b2c..c8f6aa14655 100644 --- a/packages/sdk/src/evm/core/classes/account.ts +++ b/packages/sdk/src/evm/core/classes/account.ts @@ -6,15 +6,16 @@ import { DetectableFeature } from "../interfaces/DetectableFeature"; import { ContractWrapper } from "./contract-wrapper"; import type { IAccountCore } from "@thirdweb-dev/contracts-js"; -import { assertEnabled, detectContractFeature } from "../../common"; -import { AddressOrEns } from "../../schema"; +import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { PermissionSnapshotInput, SignerPermissionsInput, SignerWithPermissions, -} from "../../types"; +} from "../../types/account"; import { buildTransactionFunction } from "../../common/transactions"; import { AccountPermissions } from "./account-permissions"; +import { detectContractFeature } from "../../common/feature-detection/detectContractFeature"; +import { assertEnabled } from "../../common/feature-detection/assertEnabled"; // eslint-disable-next-line @typescript-eslint/no-unused-vars -- TO BE REMOVED IN V4 export class Account diff --git a/packages/sdk/src/evm/core/classes/airdrop-erc1155.ts b/packages/sdk/src/evm/core/classes/airdrop-erc1155.ts index 2a909ad3752..fddc5e07fd4 100644 --- a/packages/sdk/src/evm/core/classes/airdrop-erc1155.ts +++ b/packages/sdk/src/evm/core/classes/airdrop-erc1155.ts @@ -5,8 +5,11 @@ import type { import { AirdropFailedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/AirdropERC1155"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_AIRDROP_ERC1155 } from "../../constants/thirdweb-features"; -import { Address } from "../../schema"; -import { Airdrop1155Content, Airdrop1155Output } from "../../types"; +import { Address } from "../../schema/shared/Address"; +import { + Airdrop1155Content, + Airdrop1155Output, +} from "../../types/airdrop/airdrop"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; diff --git a/packages/sdk/src/evm/core/classes/airdrop-erc20.ts b/packages/sdk/src/evm/core/classes/airdrop-erc20.ts index 6955ec55716..80ed17d80e3 100644 --- a/packages/sdk/src/evm/core/classes/airdrop-erc20.ts +++ b/packages/sdk/src/evm/core/classes/airdrop-erc20.ts @@ -2,11 +2,11 @@ import type { AirdropERC20, IAirdropERC20 } from "@thirdweb-dev/contracts-js"; import { AirdropFailedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/AirdropERC1155"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_AIRDROP_ERC20 } from "../../constants/thirdweb-features"; -import { Address } from "../../schema"; -import { Airdrop20Content, Airdrop20Output } from "../../types"; +import { Address } from "../../schema/shared/Address"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; +import { Airdrop20Content, Airdrop20Output } from "../../types/airdrop/airdrop"; /** * @public diff --git a/packages/sdk/src/evm/core/classes/airdrop-erc721.ts b/packages/sdk/src/evm/core/classes/airdrop-erc721.ts index 9a8404c87b9..cd696f3ab30 100644 --- a/packages/sdk/src/evm/core/classes/airdrop-erc721.ts +++ b/packages/sdk/src/evm/core/classes/airdrop-erc721.ts @@ -2,8 +2,11 @@ import type { AirdropERC721, IAirdropERC721 } from "@thirdweb-dev/contracts-js"; import { AirdropFailedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/AirdropERC1155"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_AIRDROP_ERC721 } from "../../constants/thirdweb-features"; -import { Address } from "../../schema"; -import { Airdrop721Content, Airdrop721Output } from "../../types"; +import { Address } from "../../schema/shared/Address"; +import { + Airdrop721Content, + Airdrop721Output, +} from "../../types/airdrop/airdrop"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; diff --git a/packages/sdk/src/evm/core/classes/contract-published-metadata.ts b/packages/sdk/src/evm/core/classes/contract-published-metadata.ts index 935e5b08977..21fe96d9495 100644 --- a/packages/sdk/src/evm/core/classes/contract-published-metadata.ts +++ b/packages/sdk/src/evm/core/classes/contract-published-metadata.ts @@ -11,7 +11,7 @@ import { PublishedMetadata, } from "../../schema/contracts/custom"; import { ContractWrapper } from "./contract-wrapper"; -import { fetchSourceFilesFromMetadata } from "../../common"; +import { fetchSourceFilesFromMetadata } from "../../common/fetchSourceFilesFromMetadata"; /** * Handles publish metadata for a contract diff --git a/packages/sdk/src/evm/core/classes/contract-publisher.ts b/packages/sdk/src/evm/core/classes/contract-publisher.ts index 1425ecd1ed3..f171d73f75a 100644 --- a/packages/sdk/src/evm/core/classes/contract-publisher.ts +++ b/packages/sdk/src/evm/core/classes/contract-publisher.ts @@ -7,11 +7,6 @@ import { ContractPublishedEvent } from "@thirdweb-dev/contracts-js/dist/declarat import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { constants, utils } from "ethers"; import invariant from "tiny-invariant"; -import { - fetchAndCacheDeployMetadata, - fetchPublishedContractFromPolygon, - isFeatureEnabled, -} from "../../common"; import { resolveAddress } from "../../common/ens/resolveAddress"; import { extractConstructorParams } from "../../common/feature-detection/extractConstructorParams"; import { extractFunctions } from "../../common/feature-detection/extractFunctions"; @@ -50,6 +45,9 @@ import { NetworkInput, TransactionResult } from "../types"; import { ContractWrapper } from "./contract-wrapper"; import { RPCConnectionHandler } from "./rpc-connection-handler"; import { Transaction } from "./transactions"; +import { fetchAndCacheDeployMetadata } from "../../common/any-evm-utils/fetchAndCacheDeployMetadata"; +import { fetchPublishedContractFromPolygon } from "../../common/any-evm-utils/fetchPublishedContractFromPolygon"; +import { isFeatureEnabled } from "../../common/feature-detection/isFeatureEnabled"; /** * Handles publishing contracts (EXPERIMENTAL) diff --git a/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts index c63aeec7fbc..f301d628881 100644 --- a/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts +++ b/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts @@ -35,7 +35,6 @@ import { hasFunction } from "../../common/feature-detection/hasFunction"; import { SnapshotFormatVersion } from "../../common/sharded-merkle-tree"; import { buildTransactionFunction } from "../../common/transactions"; import { isNode } from "../../common/utils"; -import { ClaimEligibility } from "../../enums"; import { AbstractClaimConditionContractStruct } from "../../schema/contracts/common/claim-conditions"; import { SnapshotEntryWithProof } from "../../schema/contracts/common/snapshots"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; @@ -57,6 +56,7 @@ import { ContractEncoder } from "./contract-encoder"; import { ContractMetadata } from "./contract-metadata"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; +import { ClaimEligibility } from "../../enums/ClaimEligibility"; /** * Manages claim conditions for NFT Drop contracts diff --git a/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts index 66ec8457f1a..5118a1a5711 100644 --- a/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts +++ b/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts @@ -31,7 +31,6 @@ import { hasFunction } from "../../common/feature-detection/hasFunction"; import { SnapshotFormatVersion } from "../../common/sharded-merkle-tree"; import { buildTransactionFunction } from "../../common/transactions"; import { isNode } from "../../common/utils"; -import { ClaimEligibility } from "../../enums"; import { AbstractClaimConditionContractStruct } from "../../schema/contracts/common/claim-conditions"; import { SnapshotEntryWithProof } from "../../schema/contracts/common/snapshots"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; @@ -51,6 +50,7 @@ import { ContractEncoder } from "./contract-encoder"; import { ContractMetadata } from "./contract-metadata"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; +import { ClaimEligibility } from "../../enums/ClaimEligibility"; /** * Manages claim conditions for Edition Drop contracts diff --git a/packages/sdk/src/evm/core/classes/erc-721-claim-zora.ts b/packages/sdk/src/evm/core/classes/erc-721-claim-zora.ts index df4dd49b181..490502d889c 100644 --- a/packages/sdk/src/evm/core/classes/erc-721-claim-zora.ts +++ b/packages/sdk/src/evm/core/classes/erc-721-claim-zora.ts @@ -8,8 +8,8 @@ import { NFT } from "../../../core/schema/nft"; import { toWei } from "../../common/currency/toWei"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_NFT_CLAIM_ZORA } from "../../constants/erc721-features"; -import { AddressOrEns } from "../../schema"; -import type { ClaimOptions } from "../../types"; +import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; +import type { ClaimOptions } from "../../types/claim-conditions/claim-conditions"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { TransactionResultWithId } from "../types"; import { ContractWrapper } from "./contract-wrapper"; diff --git a/packages/sdk/src/evm/core/classes/erc-721-tiered-drop.ts b/packages/sdk/src/evm/core/classes/erc-721-tiered-drop.ts index 96c85c76316..62822e22869 100644 --- a/packages/sdk/src/evm/core/classes/erc-721-tiered-drop.ts +++ b/packages/sdk/src/evm/core/classes/erc-721-tiered-drop.ts @@ -15,8 +15,8 @@ import { setErc20Allowance } from "../../common/currency/setErc20Allowance"; import { getBaseUriFromBatch, uploadOrExtractURIs } from "../../common/nft"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_NFT_TIERED_DROP } from "../../constants/erc721-features"; -import { GenericRequest } from "../../schema/contracts/common"; import { + GenericRequest, TieredDropPayloadInput, TieredDropPayloadOutput, TieredDropPayloadSchema, diff --git a/packages/sdk/src/evm/core/classes/extension-manager.ts b/packages/sdk/src/evm/core/classes/extension-manager.ts index 42bef229d69..8832b2dd2e6 100644 --- a/packages/sdk/src/evm/core/classes/extension-manager.ts +++ b/packages/sdk/src/evm/core/classes/extension-manager.ts @@ -12,25 +12,26 @@ import { import { FEATURE_DYNAMIC_CONTRACT } from "../../constants/thirdweb-features"; import { ContractInterface } from "ethers"; import { generateExtensionFunctions } from "../../common/plugin/generatePluginFunctions"; -import { Abi, AbiSchema, CommonContractSchema } from "../../schema"; import { utils } from "ethers"; import invariant from "tiny-invariant"; -import { - THIRDWEB_DEPLOYER, - deployContractDeterministic, - deployWithThrowawayDeployer, - fetchContractMetadataFromAddress, - fetchPublishedContractFromPolygon, - getDeploymentInfo, -} from "../../common"; import { joinABIs } from "../../common/plugin/joinABIs"; import { TransactionReceipt } from "@ethersproject/abstract-provider"; -import { DynamicContractExtensionMetadataOrUri } from "../../types"; +import { DynamicContractExtensionMetadataOrUri } from "../../types/deploy/deploy-metadata"; import { ExtensionAddedEvent, ExtensionRemovedEvent, ExtensionReplacedEvent, } from "@thirdweb-dev/contracts-js/dist/declarations/src/BaseRouter"; +import { fetchContractMetadataFromAddress } from "../../common/metadata-resolver"; +import { + THIRDWEB_DEPLOYER, + fetchPublishedContractFromPolygon, +} from "../../common/any-evm-utils/fetchPublishedContractFromPolygon"; +import { getDeploymentInfo } from "../../common/any-evm-utils/getDeploymentInfo"; +import { deployWithThrowawayDeployer } from "../../common/any-evm-utils/deployWithThrowawayDeployer"; +import { deployContractDeterministic } from "../../common/any-evm-utils/deployContractDeterministic"; +import { Abi, AbiSchema } from "../../schema/contracts/custom"; +import { CommonContractSchema } from "../../schema/contracts/common"; export class ExtensionManager implements DetectableFeature { featureName = FEATURE_DYNAMIC_CONTRACT.name; diff --git a/packages/sdk/src/evm/core/classes/factory.ts b/packages/sdk/src/evm/core/classes/factory.ts index 2888a128974..726f555c50f 100644 --- a/packages/sdk/src/evm/core/classes/factory.ts +++ b/packages/sdk/src/evm/core/classes/factory.ts @@ -37,7 +37,8 @@ import { } from "../../contracts"; import { SDKOptions } from "../../schema/sdk-options"; import { Address } from "../../schema/shared/Address"; -import type { DeployEvents, DeployOptions } from "../../types/deploy"; +import type { DeployOptions } from "../../types/deploy/deploy-options"; +import type { DeployEvents } from "../../types/deploy/deploy-events"; import { NetworkInput } from "../types"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; diff --git a/packages/sdk/src/evm/core/classes/index.ts b/packages/sdk/src/evm/core/classes/index.ts deleted file mode 100644 index de12249aaa9..00000000000 --- a/packages/sdk/src/evm/core/classes/index.ts +++ /dev/null @@ -1,54 +0,0 @@ -export * from "./contract-encoder"; -export * from "./contract-metadata"; -export * from "./contract-roles"; -export * from "./contract-royalty"; -export * from "./contract-sales"; -export * from "./delayed-reveal"; -export * from "./drop-claim-conditions"; -export * from "./drop-erc1155-claim-conditions"; -export * from "./drop-erc1155-history"; -export * from "./erc-20-batch-mintable"; -export * from "./erc-20-burnable"; -export * from "./erc-20-claim-conditions"; -export * from "./erc-20-droppable"; -export * from "./erc-20-mintable"; -export * from "./erc-20-signature-mintable"; -export * from "./erc-20"; -export * from "./erc-20-history"; -export * from "./erc-20-standard"; -export * from "./erc-721-batch-mintable"; -export * from "./erc-721-claim-conditions"; -export * from "./erc-721-claimable"; -export * from "./erc-721-lazy-mintable"; -export * from "./erc-721-mintable"; -export * from "./erc-721-supply"; -export * from "./erc-721-enumerable"; -export * from "./erc-721-tiered-drop"; -export * from "./erc-721"; -export * from "./erc-721-with-quantity-signature-mintable"; -export * from "./erc-721-burnable"; -export * from "./erc-721-standard"; -export * from "./erc-1155-batch-mintable"; -export * from "./erc-1155-burnable"; -export * from "./erc-1155-enumerable"; -export * from "./erc-1155-lazy-mintable"; -export * from "./erc-1155-mintable"; -export * from "./erc-1155"; -export * from "./erc-1155-signature-mintable"; -export * from "./erc-1155-standard"; -export * from "./marketplace-direct"; -export * from "./marketplace-auction"; -export * from "./marketplacev3-direct-listings"; -export * from "./marketplacev3-english-auction"; -export * from "./marketplacev3-offers"; -export * from "./gas-cost-estimator"; -export * from "./delayed-reveal"; -export * from "./contract-events"; -export * from "./contract-interceptor"; -export * from "./contract-platform-fee"; -export * from "./contract-published-metadata"; -export * from "./contract-owner"; -export * from "./transactions"; -export * from "./contract-appuri"; -export * from "./account"; -export * from "./account-factory"; diff --git a/packages/sdk/src/evm/core/classes/marketplace-auction.ts b/packages/sdk/src/evm/core/classes/marketplace-auction.ts index c16acdb75fb..30c1b8a3e69 100644 --- a/packages/sdk/src/evm/core/classes/marketplace-auction.ts +++ b/packages/sdk/src/evm/core/classes/marketplace-auction.ts @@ -26,18 +26,16 @@ import { } from "../../common/marketplace"; import { fetchTokenMetadataForContract } from "../../common/nft"; import { buildTransactionFunction } from "../../common/transactions"; -import { ListingType } from "../../enums"; import { CurrencyValue, Price } from "../../types/currency"; -import { - AuctionListing, - NewAuctionListing, - Offer, -} from "../../types/marketplace"; import { TransactionResultWithId } from "../types"; import { ContractEncoder } from "./contract-encoder"; import { ContractEvents } from "./contract-events"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; +import { ListingType } from "../../enums/marketplace/ListingType"; +import { AuctionListing } from "../../types/marketplace/AuctionListing"; +import { Offer } from "../../types/marketplace/Offer"; +import { NewAuctionListing } from "../../types/marketplace/NewAuctionListing"; /** * Handles auction listings diff --git a/packages/sdk/src/evm/core/classes/marketplace-direct.ts b/packages/sdk/src/evm/core/classes/marketplace-direct.ts index 1195a0b8ca6..d11f0fec2a9 100644 --- a/packages/sdk/src/evm/core/classes/marketplace-direct.ts +++ b/packages/sdk/src/evm/core/classes/marketplace-direct.ts @@ -40,17 +40,15 @@ import { InterfaceId_IERC1155, InterfaceId_IERC721, } from "../../constants/contract"; -import { ListingType } from "../../enums"; +import { ListingType } from "../../enums/marketplace/ListingType"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { Price } from "../../types/currency"; -import { - DirectListing, - NewDirectListing, - Offer, -} from "../../types/marketplace"; import { TransactionResultWithId } from "../types"; import { ContractWrapper } from "./contract-wrapper"; import { Transaction } from "./transactions"; +import { DirectListing } from "../../types/marketplace/DirectListing"; +import { Offer } from "../../types/marketplace/Offer"; +import { NewDirectListing } from "../../types/marketplace/NewDirectListing"; /** * Handles direct listings diff --git a/packages/sdk/src/evm/core/classes/marketplacev3-direct-listings.ts b/packages/sdk/src/evm/core/classes/marketplacev3-direct-listings.ts index 4c336690c35..9a7c82f9efe 100644 --- a/packages/sdk/src/evm/core/classes/marketplacev3-direct-listings.ts +++ b/packages/sdk/src/evm/core/classes/marketplacev3-direct-listings.ts @@ -33,14 +33,13 @@ import { InterfaceId_IERC721, } from "../../constants/contract"; import { FEATURE_DIRECT_LISTINGS } from "../../constants/thirdweb-features"; -import { Status } from "../../enums"; import { DirectListingInputParams, DirectListingInputParamsSchema, } from "../../schema/marketplacev3/direct-listings"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; -import type { MarketplaceFilterWithoutOfferor } from "../../types/marketplace"; -import type { DirectListingV3 } from "../../types/marketplacev3"; +import type { MarketplaceFilterWithoutOfferor } from "../../types/marketplace/MarketPlaceFilter"; +import type { DirectListingV3 } from "../../types/marketplacev3/DirectListingV3"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { TransactionResultWithId } from "../types"; import { ContractEncoder } from "./contract-encoder"; @@ -49,6 +48,7 @@ import { ContractInterceptor } from "./contract-interceptor"; import { ContractWrapper } from "./contract-wrapper"; import { GasCostEstimator } from "./gas-cost-estimator"; import { Transaction } from "./transactions"; +import { Status } from "../../enums/marketplace/Status"; /** * Handles direct listings diff --git a/packages/sdk/src/evm/core/classes/marketplacev3-english-auction.ts b/packages/sdk/src/evm/core/classes/marketplacev3-english-auction.ts index 9d5a7c0a0d6..2d5d4f78e70 100644 --- a/packages/sdk/src/evm/core/classes/marketplacev3-english-auction.ts +++ b/packages/sdk/src/evm/core/classes/marketplacev3-english-auction.ts @@ -19,7 +19,7 @@ import { getAllInBatches, handleTokenApproval } from "../../common/marketplace"; import { fetchTokenMetadataForContract } from "../../common/nft"; import { buildTransactionFunction } from "../../common/transactions"; import { FEATURE_ENGLISH_AUCTIONS } from "../../constants/thirdweb-features"; -import { Status } from "../../enums"; +import { Status } from "../../enums/marketplace/Status"; import { EnglishAuctionInputParams, EnglishAuctionInputParamsSchema, @@ -27,8 +27,9 @@ import { import { Address } from "../../schema/shared/Address"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { CurrencyValue, Price } from "../../types/currency"; -import type { MarketplaceFilterWithoutOfferor } from "../../types/marketplace"; -import { Bid, EnglishAuction } from "../../types/marketplacev3"; +import type { MarketplaceFilterWithoutOfferor } from "../../types/marketplace/MarketPlaceFilter"; +import { EnglishAuction } from "../../types/marketplacev3/EnglishAuction"; +import { Bid } from "../../types/marketplacev3/Bid"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { TransactionResultWithId } from "../types"; import { ContractEncoder } from "./contract-encoder"; diff --git a/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts b/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts index d5cad3c437e..dfeee8906c1 100644 --- a/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts +++ b/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts @@ -14,13 +14,13 @@ import { buildTransactionFunction } from "../../common/transactions"; import { SUPPORTED_CHAIN_ID } from "../../constants/chains/SUPPORTED_CHAIN_ID"; import { NATIVE_TOKENS } from "../../constants/currency"; import { FEATURE_OFFERS } from "../../constants/thirdweb-features"; -import { Status } from "../../enums"; +import { Status } from "../../enums/marketplace/Status"; import { OfferInputParams, OfferInputParamsSchema, } from "../../schema/marketplacev3/offer"; -import type { MarketplaceFilterWithoutSeller } from "../../types/marketplace"; -import { OfferV3 } from "../../types/marketplacev3"; +import type { MarketplaceFilterWithoutSeller } from "../../types/marketplace/MarketPlaceFilter"; +import { OfferV3 } from "../../types/marketplacev3/OfferV3"; import { DetectableFeature } from "../interfaces/DetectableFeature"; import { TransactionResultWithId } from "../types"; import { ContractEncoder } from "./contract-encoder"; diff --git a/packages/sdk/src/evm/core/classes/transactions.ts b/packages/sdk/src/evm/core/classes/transactions.ts index 36db47ddfa2..eb96e571667 100644 --- a/packages/sdk/src/evm/core/classes/transactions.ts +++ b/packages/sdk/src/evm/core/classes/transactions.ts @@ -29,7 +29,7 @@ import { import { BigNumber } from "ethers"; import invariant from "tiny-invariant"; import EventEmitter from "eventemitter3"; -import type { DeployEvents } from "../../types/deploy"; +import type { DeployEvents } from "../../types/deploy/deploy-events"; import { ForwardRequestMessage, PermitRequestMessage } from "../types"; import { computeEOAForwarderAddress } from "../../common/any-evm-utils/computeEOAForwarderAddress"; import { computeForwarderAddress } from "../../common/any-evm-utils/computeForwarderAddress"; diff --git a/packages/sdk/src/evm/core/index.ts b/packages/sdk/src/evm/core/index.ts deleted file mode 100644 index d6a10bd8159..00000000000 --- a/packages/sdk/src/evm/core/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "./types"; -export * from "./classes"; -export * from "./wallet"; -export * from "./sdk"; diff --git a/packages/sdk/src/evm/core/sdk.ts b/packages/sdk/src/evm/core/sdk.ts index c8889686bf6..eed2df3a873 100644 --- a/packages/sdk/src/evm/core/sdk.ts +++ b/packages/sdk/src/evm/core/sdk.ts @@ -77,21 +77,6 @@ import { } from "../contracts"; import { Address } from "../schema/shared/Address"; import type { CurrencyValue } from "../types/currency"; -import type { - DeployEvents, - NFTContractDeployMetadata, - MultiwrapContractDeployMetadata, - TokenContractDeployMetadata, - MarketplaceContractDeployMetadata, - MarketplaceV3ContractDeployMetadata, - SplitContractDeployMetadata, - VoteContractDeployMetadata, - DeployOptions, - DeployMetadata, - DeployEvent, - OpenEditionContractDeployMetadata, - AirdropContractDeployMetadata, -} from "../types/deploy"; import type { ContractWithMetadata } from "../types/registry"; import { DeploySchemaForPrebuiltContractType } from "../contracts"; import { ContractFactory } from "./classes/factory"; @@ -112,15 +97,28 @@ import { } from "../types/any-evm/deploy-data"; import { fetchContractMetadataFromAddress } from "../common/metadata-resolver"; import { LoyaltyCardContractDeploy } from "../schema/contracts/loyalty-card"; -import { getDefaultTrustedForwarders } from "../constants"; import { checkClientIdOrSecretKey } from "../../core/utils/apiKey"; import { getProcessEnv } from "../../core/utils/process"; -import { DropErc721ContractSchema } from "../schema"; +import { DropErc721ContractSchema } from "../schema/contracts/drop-erc721"; import { AirdropContractDeploy } from "../schema/contracts/airdrop"; import { directDeployDeterministicPublished, predictAddressDeterministicPublished, -} from "../common"; +} from "../common/any-evm-utils/deployDirectDeterministic"; +import { getDefaultTrustedForwarders } from "../constants/addresses/getDefaultTrustedForwarders"; +import { DeployEvent, DeployEvents } from "../types/deploy/deploy-events"; +import { + AirdropContractDeployMetadata, + MarketplaceContractDeployMetadata, + MarketplaceV3ContractDeployMetadata, + MultiwrapContractDeployMetadata, + NFTContractDeployMetadata, + OpenEditionContractDeployMetadata, + SplitContractDeployMetadata, + TokenContractDeployMetadata, + VoteContractDeployMetadata, +} from "../types/deploy/deploy-metadata"; +import { DeployMetadata, DeployOptions } from "../types/deploy/deploy-options"; /** * The main entry point for the thirdweb SDK diff --git a/packages/sdk/src/evm/core/types.ts b/packages/sdk/src/evm/core/types.ts index 64ca25e2b3b..e238d859b2f 100644 --- a/packages/sdk/src/evm/core/types.ts +++ b/packages/sdk/src/evm/core/types.ts @@ -7,7 +7,7 @@ import type { Signer, providers, } from "ethers"; -import { ChainInfo } from "../schema"; +import { ChainInfo } from "../schema/shared/ChainInfo"; // --- utility types extracted from from ts-toolbelt --- // diff --git a/packages/sdk/src/evm/core/wallet/index.ts b/packages/sdk/src/evm/core/wallet/index.ts deleted file mode 100644 index f2011799fdb..00000000000 --- a/packages/sdk/src/evm/core/wallet/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./user-wallet"; diff --git a/packages/sdk/src/evm/core/wallet/user-wallet.ts b/packages/sdk/src/evm/core/wallet/user-wallet.ts index 77fc650008a..027dc1b0301 100644 --- a/packages/sdk/src/evm/core/wallet/user-wallet.ts +++ b/packages/sdk/src/evm/core/wallet/user-wallet.ts @@ -13,7 +13,6 @@ import { } from "ethers"; import EventEmitter from "eventemitter3"; import invariant from "tiny-invariant"; -import { getDefaultGasOverrides } from "../../common"; import { fetchCurrencyValue } from "../../common/currency/fetchCurrencyValue"; import { isNativeToken } from "../../common/currency/isNativeToken"; import { normalizePriceValue } from "../../common/currency/normalizePriceValue"; @@ -30,6 +29,7 @@ import type { Amount, CurrencyValue } from "../../types/currency"; import { ContractWrapper } from "../classes/contract-wrapper"; import { RPCConnectionHandler } from "../classes/rpc-connection-handler"; import { NetworkInput, TransactionResult } from "../types"; +import { getDefaultGasOverrides } from "../../common/gas-price"; /** * * {@link UserWallet} events that you can subscribe to using `sdk.wallet.events`. diff --git a/packages/sdk/src/evm/enums/index.ts b/packages/sdk/src/evm/enums/index.ts deleted file mode 100644 index 497fe822710..00000000000 --- a/packages/sdk/src/evm/enums/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./marketplace"; -export * from "./vote"; -export * from "./ClaimEligibility"; diff --git a/packages/sdk/src/evm/enums/marketplace/index.ts b/packages/sdk/src/evm/enums/marketplace/index.ts deleted file mode 100644 index c01622114ac..00000000000 --- a/packages/sdk/src/evm/enums/marketplace/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./ListingType"; -export * from "./Status"; diff --git a/packages/sdk/src/evm/enums/vote/index.ts b/packages/sdk/src/evm/enums/vote/index.ts deleted file mode 100644 index db2a254233a..00000000000 --- a/packages/sdk/src/evm/enums/vote/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./ProposalState"; -export * from "./Vote"; diff --git a/packages/sdk/src/evm/index.ts b/packages/sdk/src/evm/index.ts index 0927ee73537..15bba0f65a3 100644 --- a/packages/sdk/src/evm/index.ts +++ b/packages/sdk/src/evm/index.ts @@ -2,40 +2,10 @@ // eslint-disable-next-line better-tree-shaking/no-top-level-side-effects globalThis.global = globalThis; -export type { NetworkInput } from "./core/types"; export type { ContractType } from "./contracts"; export type { Role } from "./common/role"; -export * from "./schema/contracts/custom"; -export * from "./schema/contracts/common/claim-conditions"; -export * from "./schema/tokens/common/properties"; -export * from "./schema/tokens/token"; -export * from "./schema/tokens/edition"; -export * from "./schema/contracts/common"; - -// shared -export * from "./schema/shared/BigNumberSchema"; -export * from "./schema/shared/AddressSchema"; -export * from "./schema/shared/AddressOrEnsSchema"; -export * from "./schema/shared/RawDateSchema"; -export * from "./schema/shared/CallOverrideSchema"; -export * from "./schema/shared/ChainInfo"; -export * from "./schema/shared/Ens"; -export * from "./schema/shared/Address"; - -export type { - SDKOptions, - SDKOptionsSchema, - SDKOptionsOutput, -} from "./schema/sdk-options"; -export type { FeatureWithEnabled } from "./constants/contract-features"; - -export * from "./core"; -export * from "./types"; -export * from "./enums"; -export * from "./common"; -export * from "./constants"; export * from "./contracts"; export { StaticJsonRpcBatchProvider } from "./lib/static-batch-rpc"; @@ -62,6 +32,236 @@ export type { SmartContract } from "./contracts/smart-contract"; // re-export from functions entry point export * from "./functions"; -// marketplace v3 types +//#region @r/packages/sdk/src/evm/core +export * from "./core/types"; +export * from "./core/classes/contract-encoder"; +export * from "./core/classes/contract-metadata"; +export * from "./core/classes/contract-roles"; +export * from "./core/classes/contract-royalty"; +export * from "./core/classes/contract-sales"; +export * from "./core/classes/delayed-reveal"; +export * from "./core/classes/drop-claim-conditions"; +export * from "./core/classes/drop-erc1155-claim-conditions"; +export * from "./core/classes/drop-erc1155-history"; +export * from "./core/classes/erc-20-batch-mintable"; +export * from "./core/classes/erc-20-burnable"; +export * from "./core/classes/erc-20-claim-conditions"; +export * from "./core/classes/erc-20-droppable"; +export * from "./core/classes/erc-20-mintable"; +export * from "./core/classes/erc-20-signature-mintable"; +export * from "./core/classes/erc-20"; +export * from "./core/classes/erc-20-history"; +export * from "./core/classes/erc-20-standard"; +export * from "./core/classes/erc-721-batch-mintable"; +export * from "./core/classes/erc-721-claim-conditions"; +export * from "./core/classes/erc-721-claimable"; +export * from "./core/classes/erc-721-lazy-mintable"; +export * from "./core/classes/erc-721-mintable"; +export * from "./core/classes/erc-721-supply"; +export * from "./core/classes/erc-721-enumerable"; +export * from "./core/classes/erc-721-tiered-drop"; +export * from "./core/classes/erc-721"; +export * from "./core/classes/erc-721-with-quantity-signature-mintable"; +export * from "./core/classes/erc-721-burnable"; +export * from "./core/classes/erc-721-standard"; +export * from "./core/classes/erc-1155-batch-mintable"; +export * from "./core/classes/erc-1155-burnable"; +export * from "./core/classes/erc-1155-enumerable"; +export * from "./core/classes/erc-1155-lazy-mintable"; +export * from "./core/classes/erc-1155-mintable"; +export * from "./core/classes/erc-1155"; +export * from "./core/classes/erc-1155-signature-mintable"; +export * from "./core/classes/erc-1155-standard"; +export * from "./core/classes/marketplace-direct"; +export * from "./core/classes/marketplace-auction"; +export * from "./core/classes/marketplacev3-direct-listings"; +export * from "./core/classes/marketplacev3-english-auction"; +export * from "./core/classes/marketplacev3-offers"; +export * from "./core/classes/gas-cost-estimator"; +export * from "./core/classes/delayed-reveal"; +export * from "./core/classes/contract-events"; +export * from "./core/classes/contract-interceptor"; +export * from "./core/classes/contract-platform-fee"; +export * from "./core/classes/contract-published-metadata"; +export * from "./core/classes/contract-owner"; +export * from "./core/classes/transactions"; +export * from "./core/classes/contract-appuri"; +export * from "./core/classes/account"; +export * from "./core/classes/account-factory"; +export * from "./core/wallet/user-wallet"; +export * from "./core/sdk"; +//#endregion @r/packages/sdk/src/evm/core + +//#region @r/packages/sdk/src/evm/common/* +export * from "./common/error"; +export * from "./common/snapshots"; +export * from "./common/role"; +export * from "./common/metadata-resolver"; +export * from "./common/gas-price"; +export * from "./common/fetchContractMetadata"; +export * from "./common/feature-detection/matchesPrebuiltAbi"; +export * from "./common/feature-detection/hasMatchingAbi"; +export * from "./common/feature-detection/extractConstructorParams"; +export * from "./common/feature-detection/extractFunctions"; +export * from "./common/feature-detection/extractCommentFromMetadata"; +export * from "./common/feature-detection/extractConstructorParamsFromAbi"; +export * from "./common/feature-detection/extractFunctionParamsFromAbi"; +export * from "./common/feature-detection/extractFunctionsFromAbi"; +export * from "./common/feature-detection/extractEventsFromAbi"; +export * from "./common/feature-detection/extractMinimalProxyImplementationAddress"; +export * from "./common/feature-detection/resolveContractUriFromAddress"; +export * from "./common/feature-detection/extractIPFSHashFromBytecode"; +export * from "./common/feature-detection/fetchRawPredeployMetadata"; +export * from "./common/feature-detection/fetchPreDeployMetadata"; +export * from "./common/feature-detection/fetchExtendedReleaseMetadata"; +export * from "./common/feature-detection/detectFeatures"; +export * from "./common/feature-detection/getAllDetectedFeatures"; +export * from "./common/feature-detection/getAllDetectedFeatureNames"; +export * from "./common/feature-detection/isFeatureEnabled"; +export * from "./common/feature-detection/assertEnabled"; +export * from "./common/feature-detection/detectContractFeature"; +export * from "./common/feature-detection/hasFunction"; +export * from "./common/plugin/joinABIs"; +export * from "./common/plugin/getCompositePluginABI"; +export * from "./common/version-checker"; +export * from "./common/fetchSourceFilesFromMetadata"; +export { isNativeToken } from "./common/currency/isNativeToken"; +export { cleanCurrencyAddress } from "./common/currency/cleanCurrencyAddress"; +export { normalizePriceValue } from "./common/currency/normalizePriceValue"; +export { fetchCurrencyMetadata } from "./common/currency/fetchCurrencyMetadata"; +export { fetchCurrencyValue } from "./common/currency/fetchCurrencyValue"; +export { setErc20Allowance } from "./common/currency/setErc20Allowance"; +export { approveErc20Allowance } from "./common/currency/approveErc20Allowance"; +export { hasERC20Allowance } from "./common/currency/hasERC20Allowance"; +export { normalizeAmount } from "./common/currency/normalizeAmount"; +export { toEther } from "./common/currency/toEther"; +export { toWei } from "./common/currency/toWei"; +export { toUnits } from "./common/currency/toUnits"; +export { toDisplayValue } from "./common/currency/toDisplayValue"; +export * from "./common/verification"; +export * from "./common/any-evm-utils/constants"; +export * from "./common/any-evm-utils/isContractDeployed"; +export * from "./common/any-evm-utils/isEIP155Enforced"; +export * from "./common/any-evm-utils/getCreate2FactoryAddress"; +export * from "./common/any-evm-utils/getSaltHash"; +export * from "./common/any-evm-utils/getInitBytecodeWithSalt"; +export * from "./common/any-evm-utils/computeDeploymentAddress"; +export * from "./common/any-evm-utils/computeEOAForwarderAddress"; +export * from "./common/any-evm-utils/computeForwarderAddress"; +export * from "./common/any-evm-utils/computeCloneFactoryAddress"; +export * from "./common/any-evm-utils/computeNativeTokenAddress"; +export * from "./common/any-evm-utils/getThirdwebContractAddress"; +export * from "./common/any-evm-utils/predictThirdwebContractAddress"; +export * from "./common/any-evm-utils/getEncodedConstructorParamsForThirdwebContract"; +export * from "./common/any-evm-utils/getKeylessTxn"; +export * from "./common/any-evm-utils/deployCreate2Factory"; +export * from "./common/any-evm-utils/deployDirectDeterministic"; +export * from "./common/any-evm-utils/deployContractDeterministicRaw"; +export * from "./common/any-evm-utils/deployContractDeterministic"; +export * from "./common/any-evm-utils/getDeploymentInfo"; +export * from "./common/any-evm-utils/deployWithThrowawayDeployer"; +export * from "./common/any-evm-utils/computeDeploymentInfo"; +export * from "./common/any-evm-utils/convertParamValues"; +export * from "./common/any-evm-utils/getCreate2FactoryDeploymentInfo"; +export * from "./common/any-evm-utils/fetchPublishedContractFromPolygon"; +export * from "./common/any-evm-utils/fetchAndCacheDeployMetadata"; +export * from "./common/any-evm-utils/estimateGasForDeploy"; +export * from "./common/any-evm-utils/createTransactionBatches"; +export * from "./common/deploy"; +export { convertToReadableQuantity } from "./common/claim-conditions/convertToReadableQuantity"; +export { fetchSnapshotEntryForAddress } from "./common/claim-conditions/fetchSnapshotEntryForAddress"; +export { getCachedAbiForContract } from "./common/abi"; +export * from "./common/ens/resolveEns"; +export * from "./common/ens/resolveAddress"; +//#endregion @r/packages/sdk/src/evm/common/* + +//#region @r/packages/sdk/src/evm/constants/* +export * from "./constants/addresses/LOCAL_NODE_PKEY"; +export * from "./constants/addresses/CONTRACT_ADDRESSES"; +export * from "./constants/addresses/APPROVED_IMPLEMENTATIONS"; +export * from "./constants/addresses/getApprovedImplementation"; +export * from "./constants/addresses/getContractAddressByChainId"; +export * from "./constants/addresses/getContractPublisherAddress"; +export * from "./constants/addresses/getMultichainRegistryAddress"; +export * from "./constants/addresses/getDefaultTrustedForwarders"; +export * from "./constants/chains/ChainId"; +export * from "./constants/chains/SUPPORTED_CHAIN_ID"; +export * from "./constants/chains/SUPPORTED_CHAIN_IDS"; +export * from "./constants/chains/supportedChains"; +export * from "./constants/contract"; +export * from "./constants/currency"; +export * from "./constants/events"; +export * from "./constants/urls"; +export * from "./constants/contract-features"; +//#endregion @r/packages/sdk/src/evm/constants/* + +//#region @r/packages/sdk/src/evm/enums +export * from "./enums/marketplace/ListingType"; +export * from "./enums/marketplace/Status"; +export * from "./enums/vote/ProposalState"; +export * from "./enums/vote/Vote"; +export * from "./enums/ClaimEligibility"; +//#endregion @r/packages/sdk/src/evm/enums + +//#region @r/packages/sdk/src/evm/types +export * from "./types/claim-conditions/claim-conditions"; +export * from "./types/airdrop/airdrop"; +export * from "./types/marketplace/NewDirectListing"; +export * from "./types/marketplace/DirectListing"; +export * from "./types/marketplace/MarketPlaceFilter"; +export * from "./types/marketplace/NewAuctionListing"; +export * from "./types/marketplace/AuctionListing"; +export * from "./types/marketplace/Offer"; +export * from "./types/marketplace/UnmappedOffer"; +export * from "./types/marketplacev3/DirectListingV3"; +export * from "./types/marketplacev3/EnglishAuction"; +export * from "./types/marketplacev3/Bid"; +export * from "./types/marketplacev3/OfferV3"; +export * from "./types/currency"; +export * from "./types/delayed-reveal"; +export * from "./types/vote"; +export * from "./types/SplitRecipient"; +export * from "./types/deploy/deploy-metadata"; +export * from "./types/deploy/deploy-events"; +export * from "./types/deploy/deploy-options"; +export * from "./types/events"; +export * from "./types/multiwrap"; +export * from "./types/registry"; +export * from "./types/transactions"; +export * from "./types/contract"; +export * from "./types/account"; +//#endregion + +//#region @r/packages/sdk/src/evm/schema +export * from "./schema/shared/BigNumberSchema"; +export * from "./schema/shared/AddressSchema"; +export * from "./schema/shared/AddressOrEnsSchema"; +export * from "./schema/shared/RawDateSchema"; +export * from "./schema/shared/CallOverrideSchema"; +export * from "./schema/shared/ChainInfo"; +export * from "./schema/shared/Ens"; +export * from "./schema/shared/Address"; +export * from "./schema/sdk-options"; +export * from "./schema/contracts/custom"; +export * from "./schema/contracts/common/index"; +export * from "./schema/contracts/common/claim-conditions"; +export * from "./schema/contracts/common/currency"; +export * from "./schema/contracts/common/signature"; +export * from "./schema/contracts/common/snapshots"; +export * from "./schema/contracts/drop-erc721"; +export * from "./schema/contracts/drop-erc1155"; +export * from "./schema/contracts/marketplace"; +export * from "./schema/contracts/packs"; +export * from "./schema/contracts/splits"; +export * from "./schema/contracts/token-erc20"; +export * from "./schema/contracts/token-erc721"; +export * from "./schema/contracts/token-erc1155"; +export * from "./schema/contracts/vote"; +export * from "./schema/tokens/common/properties"; +export * from "./schema/tokens/common/wrap"; +export * from "./schema/tokens/edition"; +export * from "./schema/tokens/token"; +export * from "./schema/tokens/pack"; export type { DirectListingInputParams } from "./schema/marketplacev3/direct-listings"; export type { EnglishAuctionInputParams } from "./schema/marketplacev3/english-auctions"; +//#endregion @r/packages/sdk/src/evm/schema diff --git a/packages/sdk/src/evm/schema/contracts/common/index.ts b/packages/sdk/src/evm/schema/contracts/common/index.ts index bef3077cbde..6208d750600 100644 --- a/packages/sdk/src/evm/schema/contracts/common/index.ts +++ b/packages/sdk/src/evm/schema/contracts/common/index.ts @@ -97,8 +97,3 @@ export const CommonSymbolSchema = /* @__PURE__ */ (() => z.object({ symbol: z.string().default(""), }))(); - -export * from "./claim-conditions"; -export * from "./currency"; -export * from "./signature"; -export * from "./snapshots"; diff --git a/packages/sdk/src/evm/schema/contracts/custom.ts b/packages/sdk/src/evm/schema/contracts/custom.ts index cd797351e73..fdd81d295d0 100644 --- a/packages/sdk/src/evm/schema/contracts/custom.ts +++ b/packages/sdk/src/evm/schema/contracts/custom.ts @@ -13,10 +13,10 @@ import { CommonRoyaltySchema, CommonSymbolSchema, CommonTrustedForwarderSchema, - MerkleSchema, } from "./common"; import { BigNumberish } from "ethers"; import { z } from "zod"; +import { MerkleSchema } from "./common/snapshots"; /** * @internal diff --git a/packages/sdk/src/evm/schema/contracts/index.ts b/packages/sdk/src/evm/schema/contracts/index.ts deleted file mode 100644 index f97fb74423e..00000000000 --- a/packages/sdk/src/evm/schema/contracts/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from "./custom"; -export * from "./common"; -export * from "./drop-erc721"; -export * from "./drop-erc1155"; -export * from "./marketplace"; -export * from "./packs"; -export * from "./splits"; -export * from "./token-erc20"; -export * from "./token-erc721"; -export * from "./token-erc1155"; -export * from "./vote"; diff --git a/packages/sdk/src/evm/schema/contracts/tiered-drop.ts b/packages/sdk/src/evm/schema/contracts/tiered-drop.ts index 770e88cecf2..9de9738e5c4 100644 --- a/packages/sdk/src/evm/schema/contracts/tiered-drop.ts +++ b/packages/sdk/src/evm/schema/contracts/tiered-drop.ts @@ -1,9 +1,9 @@ import { BasisPointsSchema } from "../../../core/schema/shared"; import { BigNumberSchema } from "../shared/BigNumberSchema"; import { AddressOrEnsSchema } from "../shared/AddressOrEnsSchema"; -import { BaseSignaturePayloadInput } from "./common"; import { constants } from "ethers"; import { z } from "zod"; +import { BaseSignaturePayloadInput } from "./common/signature"; /** * @internal diff --git a/packages/sdk/src/evm/schema/index.ts b/packages/sdk/src/evm/schema/index.ts deleted file mode 100644 index 14a7c1cde51..00000000000 --- a/packages/sdk/src/evm/schema/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -// shared -export * from "./shared/BigNumberSchema"; -export * from "./shared/AddressSchema"; -export * from "./shared/AddressOrEnsSchema"; -export * from "./shared/RawDateSchema"; -export * from "./shared/CallOverrideSchema"; -export * from "./shared/ChainInfo"; -export * from "./shared/Ens"; -export * from "./shared/Address"; - -export * from "./sdk-options"; -export * from "./contracts"; -export * from "./tokens"; -export * from "./sdk-options"; diff --git a/packages/sdk/src/evm/schema/tokens/index.ts b/packages/sdk/src/evm/schema/tokens/index.ts deleted file mode 100644 index 10d44fc3b68..00000000000 --- a/packages/sdk/src/evm/schema/tokens/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "./common/properties"; -export * from "./common/wrap"; -export * from "./edition"; -export * from "./token"; -export * from "./pack"; diff --git a/packages/sdk/src/evm/types/account.ts b/packages/sdk/src/evm/types/account.ts index 1459528587e..40e2f0fadbb 100644 --- a/packages/sdk/src/evm/types/account.ts +++ b/packages/sdk/src/evm/types/account.ts @@ -5,8 +5,8 @@ import type { import { BigNumber, BytesLike } from "ethers"; import { z } from "zod"; import { AmountSchema } from "../../core/schema/shared"; -import { EndDateSchema, StartDateSchema } from "../schema"; -import { AddressOrEnsSchema } from "../schema"; +import { AddressOrEnsSchema } from "../schema/shared/AddressOrEnsSchema"; +import { EndDateSchema, StartDateSchema } from "../schema/shared/RawDateSchema"; export type SignerPermissions = { startDate: Date; diff --git a/packages/sdk/src/evm/types/any-evm/deploy-data.ts b/packages/sdk/src/evm/types/any-evm/deploy-data.ts index fcac1fcd4f1..48a4f0e76a2 100644 --- a/packages/sdk/src/evm/types/any-evm/deploy-data.ts +++ b/packages/sdk/src/evm/types/any-evm/deploy-data.ts @@ -1,6 +1,6 @@ import { BytesLike } from "ethers"; import { PreDeployMetadataFetched } from "../../schema/contracts/custom"; -import { AddressOrEns } from "../../schema"; +import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; export type PrecomputedDeploymentTransaction = { predictedAddress: string; diff --git a/packages/sdk/src/evm/types/deploy/deploy-metadata.ts b/packages/sdk/src/evm/types/deploy/deploy-metadata.ts index 5b5a14521c5..eddefca3b7d 100644 --- a/packages/sdk/src/evm/types/deploy/deploy-metadata.ts +++ b/packages/sdk/src/evm/types/deploy/deploy-metadata.ts @@ -1,7 +1,7 @@ import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { FileOrBufferOrString } from "@thirdweb-dev/storage"; import type { BigNumberish, Bytes } from "ethers"; -import { CommonContractSchemaInput } from "../../schema"; +import { CommonContractSchemaInput } from "../../schema/contracts/common"; /** * Options for deploying an NFT contract diff --git a/packages/sdk/src/evm/types/deploy/index.ts b/packages/sdk/src/evm/types/deploy/index.ts deleted file mode 100644 index d6f79142b13..00000000000 --- a/packages/sdk/src/evm/types/deploy/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./deploy-metadata"; -export * from "./deploy-events"; -export * from "./deploy-options"; diff --git a/packages/sdk/src/evm/types/index.ts b/packages/sdk/src/evm/types/index.ts deleted file mode 100644 index 3b16601e55d..00000000000 --- a/packages/sdk/src/evm/types/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -export * from "./claim-conditions/claim-conditions"; -export * from "./airdrop/airdrop"; -export * from "./marketplace"; -export * from "./marketplacev3"; -export * from "./currency"; -export * from "./delayed-reveal"; -export * from "./vote"; -export * from "./SplitRecipient"; -export * from "./deploy"; -export * from "./events"; -export * from "./multiwrap"; -export * from "./registry"; -export * from "./transactions"; -export * from "./contract"; -export * from "./account"; diff --git a/packages/sdk/src/evm/types/marketplace/AuctionListing.ts b/packages/sdk/src/evm/types/marketplace/AuctionListing.ts index 38cdad8043b..244b585c224 100644 --- a/packages/sdk/src/evm/types/marketplace/AuctionListing.ts +++ b/packages/sdk/src/evm/types/marketplace/AuctionListing.ts @@ -1,5 +1,5 @@ import { NFTMetadata } from "../../../core/schema/nft"; -import { ListingType } from "../../enums/marketplace"; +import { ListingType } from "../../enums/marketplace/ListingType"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { CurrencyValue } from "../currency"; import { BigNumber, BigNumberish } from "ethers"; diff --git a/packages/sdk/src/evm/types/marketplace/DirectListing.ts b/packages/sdk/src/evm/types/marketplace/DirectListing.ts index 8841db44104..d0f0721ca6d 100644 --- a/packages/sdk/src/evm/types/marketplace/DirectListing.ts +++ b/packages/sdk/src/evm/types/marketplace/DirectListing.ts @@ -1,5 +1,5 @@ import { NFTMetadata } from "../../../core/schema/nft"; -import { ListingType } from "../../enums/marketplace"; +import { ListingType } from "../../enums/marketplace/ListingType"; import { AddressOrEns } from "../../schema/shared/AddressOrEnsSchema"; import { CurrencyValue } from "../currency"; import { BigNumber, BigNumberish } from "ethers"; diff --git a/packages/sdk/src/evm/types/marketplace/index.ts b/packages/sdk/src/evm/types/marketplace/index.ts deleted file mode 100644 index c229b38a836..00000000000 --- a/packages/sdk/src/evm/types/marketplace/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from "./NewDirectListing"; -export * from "./DirectListing"; -export * from "./MarketPlaceFilter"; -export * from "./NewAuctionListing"; -export * from "./AuctionListing"; -export * from "./Offer"; -export * from "./UnmappedOffer"; diff --git a/packages/sdk/src/evm/types/marketplacev3/DirectListingV3.ts b/packages/sdk/src/evm/types/marketplacev3/DirectListingV3.ts index 59152882859..1b5b4b68f9a 100644 --- a/packages/sdk/src/evm/types/marketplacev3/DirectListingV3.ts +++ b/packages/sdk/src/evm/types/marketplacev3/DirectListingV3.ts @@ -1,5 +1,5 @@ import { NFTMetadata } from "../../../core/schema/nft"; -import { Status } from "../../enums"; +import { Status } from "../../enums/marketplace/Status"; import { Address } from "../../schema/shared/Address"; import { CurrencyValue } from "../currency"; diff --git a/packages/sdk/src/evm/types/marketplacev3/EnglishAuction.ts b/packages/sdk/src/evm/types/marketplacev3/EnglishAuction.ts index 8de360fd197..a477cc13100 100644 --- a/packages/sdk/src/evm/types/marketplacev3/EnglishAuction.ts +++ b/packages/sdk/src/evm/types/marketplacev3/EnglishAuction.ts @@ -1,5 +1,5 @@ import { NFTMetadata } from "../../../core/schema/nft"; -import { Status } from "../../enums"; +import { Status } from "../../enums/marketplace/Status"; import { Address } from "../../schema/shared/Address"; import { CurrencyValue } from "../currency"; diff --git a/packages/sdk/src/evm/types/marketplacev3/OfferV3.ts b/packages/sdk/src/evm/types/marketplacev3/OfferV3.ts index 1fd24a6cbe8..5cdae9cd126 100644 --- a/packages/sdk/src/evm/types/marketplacev3/OfferV3.ts +++ b/packages/sdk/src/evm/types/marketplacev3/OfferV3.ts @@ -1,5 +1,5 @@ import { NFTMetadata } from "../../../core/schema/nft"; -import { Status } from "../../enums"; +import { Status } from "../../enums/marketplace/Status"; import { CurrencyValue } from "../currency"; /** diff --git a/packages/sdk/src/evm/types/marketplacev3/index.ts b/packages/sdk/src/evm/types/marketplacev3/index.ts deleted file mode 100644 index c0f1938434c..00000000000 --- a/packages/sdk/src/evm/types/marketplacev3/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "./DirectListingV3"; -export * from "./EnglishAuction"; -export * from "./Bid"; -export * from "./OfferV3"; diff --git a/packages/sdk/src/evm/types/transactions.ts b/packages/sdk/src/evm/types/transactions.ts index 3db4f57da98..6e7ef927ee0 100644 --- a/packages/sdk/src/evm/types/transactions.ts +++ b/packages/sdk/src/evm/types/transactions.ts @@ -12,7 +12,7 @@ import type { ContractFactory, } from "ethers"; import EventEmitter from "eventemitter3"; -import { DeployEvents } from "./deploy"; +import { DeployEvents } from "./deploy/deploy-events"; export type ParseTransactionReceipt = | ((receipt: providers.TransactionReceipt) => TResult) diff --git a/packages/sdk/src/evm/types/vote.ts b/packages/sdk/src/evm/types/vote.ts index fd82aeaea14..be93b59276c 100644 --- a/packages/sdk/src/evm/types/vote.ts +++ b/packages/sdk/src/evm/types/vote.ts @@ -1,4 +1,5 @@ -import { ProposalState, VoteType } from "../enums"; +import { ProposalState } from "../enums/vote/ProposalState"; +import { VoteType } from "../enums/vote/Vote"; import { Currency } from "./currency"; import { BigNumber, BigNumberish, BytesLike } from "ethers"; diff --git a/packages/sdk/src/evm/zksync/zksync-deploy-utils.ts b/packages/sdk/src/evm/zksync/zksync-deploy-utils.ts index 2696919c9a8..0556b49ce0d 100644 --- a/packages/sdk/src/evm/zksync/zksync-deploy-utils.ts +++ b/packages/sdk/src/evm/zksync/zksync-deploy-utils.ts @@ -9,7 +9,7 @@ import { extractConstructorParamsFromAbi } from "../common/feature-detection/ext import { extractFunctionParamsFromAbi } from "../common/feature-detection/extractFunctionParamsFromAbi"; import { type BytesLike, Contract, type Signer, utils, Wallet } from "ethers"; import { ThirdwebStorage } from "@thirdweb-dev/storage"; -import type { DeployOptions } from "../types/deploy"; +import type { DeployOptions } from "../types/deploy/deploy-options"; import { ThirdwebSDK } from "../core/sdk"; import { getImplementation } from "./constants/addresses"; import { DeploymentTransaction } from "../types/any-evm/deploy-data";