From 1c118249487eecf903bc3cf99ddaa914205f4100 Mon Sep 17 00:00:00 2001 From: farhanW3 Date: Wed, 6 Mar 2024 17:20:45 -0800 Subject: [PATCH] fixed chain/get & chain/getAll to check chainOverride --- package.json | 2 +- src/server/routes/chain/get.ts | 18 +++++- src/server/routes/chain/getAll.ts | 28 +++++++- .../extensions/erc1155/read/canClaim.ts | 2 +- .../contract/extensions/erc1155/read/get.ts | 2 +- .../erc1155/read/getActiveClaimConditions.ts | 2 +- .../extensions/erc1155/read/getAll.ts | 2 +- .../erc1155/read/getAllClaimConditions.ts | 2 +- .../read/getClaimIneligibilityReasons.ts | 2 +- .../erc1155/read/getClaimerProofs.ts | 2 +- .../extensions/erc1155/read/getOwned.ts | 2 +- .../extensions/erc1155/read/totalCount.ts | 2 +- .../extensions/erc1155/read/totalSupply.ts | 2 +- .../extensions/erc20/read/canClaim.ts | 2 +- .../contract/extensions/erc20/read/get.ts | 2 +- .../erc20/read/getActiveClaimConditions.ts | 2 +- .../erc20/read/getAllClaimConditions.ts | 2 +- .../read/getClaimIneligibilityReasons.ts | 2 +- .../extensions/erc20/read/getClaimerProofs.ts | 2 +- .../extensions/erc20/read/totalSupply.ts | 2 +- .../extensions/erc721/read/canClaim.ts | 2 +- .../contract/extensions/erc721/read/get.ts | 2 +- .../erc721/read/getActiveClaimConditions.ts | 2 +- .../contract/extensions/erc721/read/getAll.ts | 2 +- .../erc721/read/getAllClaimConditions.ts | 2 +- .../read/getClaimIneligibilityReasons.ts | 2 +- .../erc721/read/getClaimerProofs.ts | 2 +- .../extensions/erc721/read/getOwned.ts | 2 +- .../erc721/read/totalClaimedSupply.ts | 2 +- .../extensions/erc721/read/totalCount.ts | 2 +- .../erc721/read/totalUnclaimedSupply.ts | 2 +- .../directListings/read/getAll.ts | 2 +- .../directListings/read/getAllValid.ts | 2 +- .../directListings/read/getListing.ts | 2 +- .../directListings/read/getTotalCount.ts | 2 +- .../read/isBuyerApprovedForListing.ts | 2 +- .../read/isCurrencyApprovedForListing.ts | 2 +- .../englishAuctions/read/getAll.ts | 2 +- .../englishAuctions/read/getAllValid.ts | 2 +- .../englishAuctions/read/getAuction.ts | 2 +- .../englishAuctions/read/getBidBufferBps.ts | 2 +- .../englishAuctions/read/getMinimumNextBid.ts | 2 +- .../englishAuctions/read/getTotalCount.ts | 2 +- .../englishAuctions/read/getWinner.ts | 2 +- .../englishAuctions/read/getWinningBid.ts | 2 +- .../englishAuctions/read/isWinningBid.ts | 2 +- .../marketplaceV3/offers/read/getAll.ts | 2 +- .../marketplaceV3/offers/read/getAllValid.ts | 2 +- .../marketplaceV3/offers/read/getOffer.ts | 2 +- .../offers/read/getTotalCount.ts | 2 +- src/server/schemas/chain/index.ts | 64 ++++++++++--------- yarn.lock | 10 +-- 52 files changed, 126 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index 40be52294..cbc2b79bc 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@sinclair/typebox": "^0.31.28", "@t3-oss/env-core": "^0.6.0", "@thirdweb-dev/auth": "^4.1.27", - "@thirdweb-dev/chains": "0.1.70", + "@thirdweb-dev/chains": "^0.1.77", "@thirdweb-dev/sdk": "4.0.36-nightly-fa637c2e3-20240214074441", "@thirdweb-dev/service-utils": "0.4.17", "@thirdweb-dev/wallets": "^2.1.5", diff --git a/src/server/routes/chain/get.ts b/src/server/routes/chain/get.ts index 0a34397e2..27220f751 100644 --- a/src/server/routes/chain/get.ts +++ b/src/server/routes/chain/get.ts @@ -1,11 +1,13 @@ import { Static, Type } from "@sinclair/typebox"; import { + Chain, getChainByChainIdAsync, getChainBySlugAsync, minimizeChain, } from "@thirdweb-dev/chains"; import { FastifyInstance } from "fastify"; import { StatusCodes } from "http-status-codes"; +import { getConfig } from "../../../utils/cache/getConfig"; import { createCustomError } from "../../middleware/error"; import { chainRequestQuerystringSchema, @@ -13,7 +15,7 @@ import { } from "../../schemas/chain"; import { standardResponseSchema } from "../../schemas/sharedApiSchemas"; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: chainResponseSchema, }); @@ -58,10 +60,20 @@ export async function getChainData(fastify: FastifyInstance) { }, handler: async (request, reply) => { const { chain } = request.query; + const config = await getConfig(); + + let chainData: Chain | null = null; + if (config.chainOverrides) { + chainData = JSON.parse(config.chainOverrides).find( + (dt: Chain) => dt.slug === chain || dt.chainId === parseInt(chain), + ); + } - let chainData = await getChainBySlugAsync(chain); if (!chainData) { - chainData = await getChainByChainIdAsync(parseInt(chain)); + chainData = await getChainBySlugAsync(chain); + if (!chainData) { + chainData = await getChainByChainIdAsync(parseInt(chain)); + } } if (!chainData) { diff --git a/src/server/routes/chain/getAll.ts b/src/server/routes/chain/getAll.ts index dc9fcdf45..0fe78a850 100644 --- a/src/server/routes/chain/getAll.ts +++ b/src/server/routes/chain/getAll.ts @@ -1,11 +1,12 @@ import { Static, Type } from "@sinclair/typebox"; -import { allChains, minimizeChain } from "@thirdweb-dev/chains"; +import { Chain, fetchChains, minimizeChain } from "@thirdweb-dev/chains"; import { FastifyInstance } from "fastify"; import { StatusCodes } from "http-status-codes"; +import { getConfig } from "../../../utils/cache/getConfig"; import { chainResponseSchema } from "../../schemas/chain"; import { standardResponseSchema } from "../../schemas/sharedApiSchemas"; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(chainResponseSchema), }); @@ -63,7 +64,10 @@ export async function getAllChainData(fastify: FastifyInstance) { }, }, handler: async (request, reply) => { - const chain = allChains.map((chain) => { + const allChainsData = await fetchChains(); + const config = await getConfig(); + + let chain = (allChainsData ?? ([] as Chain[])).map((chain) => { const minimizeChainData = minimizeChain(chain); if (chain.rpc.length === 0) { return { ...minimizeChainData, rpc: [""] }; @@ -71,6 +75,24 @@ export async function getAllChainData(fastify: FastifyInstance) { return { ...minimizeChainData, rpc: [minimizeChainData.rpc[0]] }; }); + let chainOverrides: typeof chain = []; + + if (config.chainOverrides) { + chainOverrides = (JSON.parse(config.chainOverrides) as Chain[]).map( + (overrideChain) => { + const shortName = overrideChain.shortName + ? overrideChain.shortName + : ""; + const rpc = + overrideChain.rpc.length === 0 ? [""] : [overrideChain.rpc[0]]; + return { ...overrideChain, shortName, rpc }; + }, + ); + } + + // Concatenate chain and chainOverrides + chain = chain.concat(chainOverrides); + reply.status(StatusCodes.OK).send({ result: chain, }); diff --git a/src/server/routes/contract/extensions/erc1155/read/canClaim.ts b/src/server/routes/contract/extensions/erc1155/read/canClaim.ts index 003086499..3d88b5878 100644 --- a/src/server/routes/contract/extensions/erc1155/read/canClaim.ts +++ b/src/server/routes/contract/extensions/erc1155/read/canClaim.ts @@ -26,7 +26,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/get.ts b/src/server/routes/contract/extensions/erc1155/read/get.ts index 7f3ff68d3..f7afe097f 100644 --- a/src/server/routes/contract/extensions/erc1155/read/get.ts +++ b/src/server/routes/contract/extensions/erc1155/read/get.ts @@ -20,7 +20,7 @@ const querystringSchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: nftSchema, }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getActiveClaimConditions.ts b/src/server/routes/contract/extensions/erc1155/read/getActiveClaimConditions.ts index dc2e7b116..7910ac2f1 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getActiveClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getActiveClaimConditions.ts @@ -23,7 +23,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimConditionOutputSchema, }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getAll.ts b/src/server/routes/contract/extensions/erc1155/read/getAll.ts index 7ce0da303..7317a2d12 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getAll.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getAll.ts @@ -26,7 +26,7 @@ const querystringSchema = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(nftSchema), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getAllClaimConditions.ts b/src/server/routes/contract/extensions/erc1155/read/getAllClaimConditions.ts index 6611f1320..1e4fa497f 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getAllClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getAllClaimConditions.ts @@ -24,7 +24,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(claimConditionOutputSchema), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getClaimIneligibilityReasons.ts b/src/server/routes/contract/extensions/erc1155/read/getClaimIneligibilityReasons.ts index 3e65b5bed..7b95c01df 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getClaimIneligibilityReasons.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getClaimIneligibilityReasons.ts @@ -27,7 +27,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(Type.Union([Type.String(), Type.Enum(ClaimEligibility)])), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getClaimerProofs.ts b/src/server/routes/contract/extensions/erc1155/read/getClaimerProofs.ts index c5356d3e1..12560c44a 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getClaimerProofs.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getClaimerProofs.ts @@ -21,7 +21,7 @@ const requestQueryString = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimerProofSchema, }); diff --git a/src/server/routes/contract/extensions/erc1155/read/getOwned.ts b/src/server/routes/contract/extensions/erc1155/read/getOwned.ts index 11e5bd487..a4135d417 100644 --- a/src/server/routes/contract/extensions/erc1155/read/getOwned.ts +++ b/src/server/routes/contract/extensions/erc1155/read/getOwned.ts @@ -18,7 +18,7 @@ const querystringSchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(nftSchema), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/totalCount.ts b/src/server/routes/contract/extensions/erc1155/read/totalCount.ts index ad3712ea8..a0dc44641 100644 --- a/src/server/routes/contract/extensions/erc1155/read/totalCount.ts +++ b/src/server/routes/contract/extensions/erc1155/read/totalCount.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = erc1155ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(Type.String()), }); diff --git a/src/server/routes/contract/extensions/erc1155/read/totalSupply.ts b/src/server/routes/contract/extensions/erc1155/read/totalSupply.ts index 4ab1f1048..1f4d36160 100644 --- a/src/server/routes/contract/extensions/erc1155/read/totalSupply.ts +++ b/src/server/routes/contract/extensions/erc1155/read/totalSupply.ts @@ -17,7 +17,7 @@ const querystringSchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(Type.String()), }); diff --git a/src/server/routes/contract/extensions/erc20/read/canClaim.ts b/src/server/routes/contract/extensions/erc20/read/canClaim.ts index 8afe56498..7d7120aaf 100644 --- a/src/server/routes/contract/extensions/erc20/read/canClaim.ts +++ b/src/server/routes/contract/extensions/erc20/read/canClaim.ts @@ -23,7 +23,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/erc20/read/get.ts b/src/server/routes/contract/extensions/erc20/read/get.ts index 8997d9c03..a23e4bf92 100644 --- a/src/server/routes/contract/extensions/erc20/read/get.ts +++ b/src/server/routes/contract/extensions/erc20/read/get.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = erc20ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Object({ name: Type.String(), diff --git a/src/server/routes/contract/extensions/erc20/read/getActiveClaimConditions.ts b/src/server/routes/contract/extensions/erc20/read/getActiveClaimConditions.ts index 0c44b56c1..f181422fe 100644 --- a/src/server/routes/contract/extensions/erc20/read/getActiveClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc20/read/getActiveClaimConditions.ts @@ -20,7 +20,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimConditionOutputSchema, }); diff --git a/src/server/routes/contract/extensions/erc20/read/getAllClaimConditions.ts b/src/server/routes/contract/extensions/erc20/read/getAllClaimConditions.ts index 61e49fa37..9d80407bc 100644 --- a/src/server/routes/contract/extensions/erc20/read/getAllClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc20/read/getAllClaimConditions.ts @@ -20,7 +20,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(claimConditionOutputSchema), }); diff --git a/src/server/routes/contract/extensions/erc20/read/getClaimIneligibilityReasons.ts b/src/server/routes/contract/extensions/erc20/read/getClaimIneligibilityReasons.ts index 1806c1bc1..4cd9b3ad2 100644 --- a/src/server/routes/contract/extensions/erc20/read/getClaimIneligibilityReasons.ts +++ b/src/server/routes/contract/extensions/erc20/read/getClaimIneligibilityReasons.ts @@ -23,7 +23,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(Type.Union([Type.String(), Type.Enum(ClaimEligibility)])), }); diff --git a/src/server/routes/contract/extensions/erc20/read/getClaimerProofs.ts b/src/server/routes/contract/extensions/erc20/read/getClaimerProofs.ts index be1f42f84..d58fbd681 100644 --- a/src/server/routes/contract/extensions/erc20/read/getClaimerProofs.ts +++ b/src/server/routes/contract/extensions/erc20/read/getClaimerProofs.ts @@ -17,7 +17,7 @@ const requestQueryString = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimerProofSchema, }); diff --git a/src/server/routes/contract/extensions/erc20/read/totalSupply.ts b/src/server/routes/contract/extensions/erc20/read/totalSupply.ts index ac5727c31..da3d6b8a3 100644 --- a/src/server/routes/contract/extensions/erc20/read/totalSupply.ts +++ b/src/server/routes/contract/extensions/erc20/read/totalSupply.ts @@ -12,7 +12,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = erc20ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: erc20MetadataSchema, }); diff --git a/src/server/routes/contract/extensions/erc721/read/canClaim.ts b/src/server/routes/contract/extensions/erc721/read/canClaim.ts index 2675b327d..e52b26636 100644 --- a/src/server/routes/contract/extensions/erc721/read/canClaim.ts +++ b/src/server/routes/contract/extensions/erc721/read/canClaim.ts @@ -23,7 +23,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/erc721/read/get.ts b/src/server/routes/contract/extensions/erc721/read/get.ts index e2ac379e6..c1825afef 100644 --- a/src/server/routes/contract/extensions/erc721/read/get.ts +++ b/src/server/routes/contract/extensions/erc721/read/get.ts @@ -18,7 +18,7 @@ const querystringSchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: nftSchema, }); diff --git a/src/server/routes/contract/extensions/erc721/read/getActiveClaimConditions.ts b/src/server/routes/contract/extensions/erc721/read/getActiveClaimConditions.ts index 5e685ce76..4ad59567f 100644 --- a/src/server/routes/contract/extensions/erc721/read/getActiveClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc721/read/getActiveClaimConditions.ts @@ -20,7 +20,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimConditionOutputSchema, }); diff --git a/src/server/routes/contract/extensions/erc721/read/getAll.ts b/src/server/routes/contract/extensions/erc721/read/getAll.ts index 88f7d73ca..2244b540a 100644 --- a/src/server/routes/contract/extensions/erc721/read/getAll.ts +++ b/src/server/routes/contract/extensions/erc721/read/getAll.ts @@ -26,7 +26,7 @@ const querystringSchema = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(nftSchema), }); diff --git a/src/server/routes/contract/extensions/erc721/read/getAllClaimConditions.ts b/src/server/routes/contract/extensions/erc721/read/getAllClaimConditions.ts index c91a19fa0..0ec57437e 100644 --- a/src/server/routes/contract/extensions/erc721/read/getAllClaimConditions.ts +++ b/src/server/routes/contract/extensions/erc721/read/getAllClaimConditions.ts @@ -20,7 +20,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(claimConditionOutputSchema), }); diff --git a/src/server/routes/contract/extensions/erc721/read/getClaimIneligibilityReasons.ts b/src/server/routes/contract/extensions/erc721/read/getClaimIneligibilityReasons.ts index df565e84a..9fd51c74b 100644 --- a/src/server/routes/contract/extensions/erc721/read/getClaimIneligibilityReasons.ts +++ b/src/server/routes/contract/extensions/erc721/read/getClaimIneligibilityReasons.ts @@ -23,7 +23,7 @@ const requestQueryString = Type.Object({ ), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(Type.Union([Type.String(), Type.Enum(ClaimEligibility)])), }); diff --git a/src/server/routes/contract/extensions/erc721/read/getClaimerProofs.ts b/src/server/routes/contract/extensions/erc721/read/getClaimerProofs.ts index b9e69f4ac..c6ead001e 100644 --- a/src/server/routes/contract/extensions/erc721/read/getClaimerProofs.ts +++ b/src/server/routes/contract/extensions/erc721/read/getClaimerProofs.ts @@ -17,7 +17,7 @@ const requestQueryString = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: claimerProofSchema, }); diff --git a/src/server/routes/contract/extensions/erc721/read/getOwned.ts b/src/server/routes/contract/extensions/erc721/read/getOwned.ts index 09c9faf2c..6811a144d 100644 --- a/src/server/routes/contract/extensions/erc721/read/getOwned.ts +++ b/src/server/routes/contract/extensions/erc721/read/getOwned.ts @@ -18,7 +18,7 @@ const querystringSchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(nftSchema), }); diff --git a/src/server/routes/contract/extensions/erc721/read/totalClaimedSupply.ts b/src/server/routes/contract/extensions/erc721/read/totalClaimedSupply.ts index 27eb812a4..58c2cd4f5 100644 --- a/src/server/routes/contract/extensions/erc721/read/totalClaimedSupply.ts +++ b/src/server/routes/contract/extensions/erc721/read/totalClaimedSupply.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = contractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(Type.String()), }); diff --git a/src/server/routes/contract/extensions/erc721/read/totalCount.ts b/src/server/routes/contract/extensions/erc721/read/totalCount.ts index fb571b0a4..8f1cb100a 100644 --- a/src/server/routes/contract/extensions/erc721/read/totalCount.ts +++ b/src/server/routes/contract/extensions/erc721/read/totalCount.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = contractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(Type.String()), }); diff --git a/src/server/routes/contract/extensions/erc721/read/totalUnclaimedSupply.ts b/src/server/routes/contract/extensions/erc721/read/totalUnclaimedSupply.ts index 28f422646..12259076c 100644 --- a/src/server/routes/contract/extensions/erc721/read/totalUnclaimedSupply.ts +++ b/src/server/routes/contract/extensions/erc721/read/totalUnclaimedSupply.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../utils/chain"; // INPUT const requestSchema = contractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(Type.String()), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAll.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAll.ts index fd115dc19..1967250a3 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAll.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAll.ts @@ -15,7 +15,7 @@ import { formatDirectListingV3Result } from "../../../../../../utils/marketplace const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["offeror"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(directListingV3OutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAllValid.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAllValid.ts index 1d1a9c737..7da63c4b1 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAllValid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getAllValid.ts @@ -15,7 +15,7 @@ import { formatDirectListingV3Result } from "../../../../../../utils/marketplace const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["offeror"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(directListingV3OutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getListing.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getListing.ts index fd282337a..b58ec8624 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getListing.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getListing.ts @@ -18,7 +18,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: directListingV3OutputSchema, }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getTotalCount.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getTotalCount.ts index 0d6332cc3..e47838537 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getTotalCount.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/getTotalCount.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../../utils/chain"; // INPUT const requestSchema = marketplaceV3ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.String(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isBuyerApprovedForListing.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isBuyerApprovedForListing.ts index 05b145847..edc4d7187 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isBuyerApprovedForListing.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isBuyerApprovedForListing.ts @@ -20,7 +20,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isCurrencyApprovedForListing.ts b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isCurrencyApprovedForListing.ts index 3c38a375c..3bf6e688c 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isCurrencyApprovedForListing.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/directListings/read/isCurrencyApprovedForListing.ts @@ -19,7 +19,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAll.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAll.ts index aab6947d4..f0046fa9f 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAll.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAll.ts @@ -15,7 +15,7 @@ import { formatEnglishAuctionResult } from "../../../../../../utils/marketplaceV const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["offeror"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(englishAuctionOutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAllValid.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAllValid.ts index 03850caa2..253de0ee4 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAllValid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAllValid.ts @@ -15,7 +15,7 @@ import { formatEnglishAuctionResult } from "../../../../../../utils/marketplaceV const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["offeror"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(englishAuctionOutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAuction.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAuction.ts index f57e43e86..9db79d2a6 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAuction.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getAuction.ts @@ -18,7 +18,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: englishAuctionOutputSchema, }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getBidBufferBps.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getBidBufferBps.ts index d13c1c80d..2a05b3482 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getBidBufferBps.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getBidBufferBps.ts @@ -16,7 +16,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Number({ description: diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getMinimumNextBid.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getMinimumNextBid.ts index d8cbd8745..5567033d6 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getMinimumNextBid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getMinimumNextBid.ts @@ -17,7 +17,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: currencyValueSchema, }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getTotalCount.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getTotalCount.ts index 2638a0537..2c90634ad 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getTotalCount.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getTotalCount.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../../utils/chain"; // INPUT const requestSchema = marketplaceV3ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.String(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinner.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinner.ts index fdf806007..086c26478 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinner.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinner.ts @@ -16,7 +16,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.String(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinningBid.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinningBid.ts index 6ab51b418..51288ca41 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinningBid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/getWinningBid.ts @@ -17,7 +17,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Optional(bidSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/isWinningBid.ts b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/isWinningBid.ts index 9daa170b9..1796bf017 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/isWinningBid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/englishAuctions/read/isWinningBid.ts @@ -19,7 +19,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Boolean(), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAll.ts b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAll.ts index eb594b2e5..7946865c8 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAll.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAll.ts @@ -15,7 +15,7 @@ import { formatOffersV3Result } from "../../../../../../utils/marketplaceV3"; const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["seller"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(OfferV3OutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAllValid.ts b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAllValid.ts index 6d1a86c26..bc5f0f2f1 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAllValid.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getAllValid.ts @@ -15,7 +15,7 @@ import { formatOffersV3Result } from "../../../../../../utils/marketplaceV3"; const requestSchema = marketplaceV3ContractParamSchema; const requestQuerySchema = Type.Omit(marketplaceFilterSchema, ["seller"]); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.Array(OfferV3OutputSchema), }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getOffer.ts b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getOffer.ts index a339f472b..947866f94 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getOffer.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getOffer.ts @@ -18,7 +18,7 @@ const requestQuerySchema = Type.Object({ }), }); -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: OfferV3OutputSchema, }); diff --git a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getTotalCount.ts b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getTotalCount.ts index 177f67355..56d19f7b4 100644 --- a/src/server/routes/contract/extensions/marketplaceV3/offers/read/getTotalCount.ts +++ b/src/server/routes/contract/extensions/marketplaceV3/offers/read/getTotalCount.ts @@ -11,7 +11,7 @@ import { getChainIdFromChain } from "../../../../../../utils/chain"; // INPUT const requestSchema = marketplaceV3ContractParamSchema; -// OUPUT +// OUTPUT const responseSchema = Type.Object({ result: Type.String(), }); diff --git a/src/server/schemas/chain/index.ts b/src/server/schemas/chain/index.ts index 9c52ed85f..93100c4e3 100644 --- a/src/server/schemas/chain/index.ts +++ b/src/server/schemas/chain/index.ts @@ -8,39 +8,41 @@ export const chainRequestQuerystringSchema = Type.Object({ }), }); -export const chainResponseSchema = Type.Object({ - name: Type.String({ - description: "Chain name", - }), - chain: Type.String({ - description: "Chain name", - }), - rpc: Type.Array( - Type.String({ - description: "RPC URL", - }), - ), - nativeCurrency: Type.Object({ +export const chainResponseSchema = Type.Partial( + Type.Object({ name: Type.String({ - description: "Native currency name", + description: "Chain name", }), - symbol: Type.String({ - description: "Native currency symbol", + chain: Type.String({ + description: "Chain name", }), - decimals: Type.Number({ - description: "Native currency decimals", + rpc: Type.Array( + Type.String({ + description: "RPC URL", + }), + ), + nativeCurrency: Type.Object({ + name: Type.String({ + description: "Native currency name", + }), + symbol: Type.String({ + description: "Native currency symbol", + }), + decimals: Type.Number({ + description: "Native currency decimals", + }), + }), + shortName: Type.String({ + description: "Chain short name", + }), + chainId: Type.Number({ + description: "Chain ID", + }), + testnet: Type.Boolean({ + description: "Is testnet", + }), + slug: Type.String({ + description: "Chain slug", }), }), - shortName: Type.String({ - description: "Chain short name", - }), - chainId: Type.Number({ - description: "Chain ID", - }), - testnet: Type.Boolean({ - description: "Is testnet", - }), - slug: Type.String({ - description: "Chain slug", - }), -}); +); diff --git a/yarn.lock b/yarn.lock index 8cc532711..bb500149b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4017,16 +4017,16 @@ resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.67.tgz#e34a684c47f71187225e92beaf27d2477e3880bf" integrity sha512-mQ4P737lXNopB/WQgKq+t6LbsmxhKNNLgtPAiP9z3EoUlBTgDHWYRHi7DWNGqKhImV6ARr37pyp00ROe6TeEMg== -"@thirdweb-dev/chains@0.1.70": - version "0.1.70" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.70.tgz#b3a83314146753c494be3ca59a832df05f366e6b" - integrity sha512-VP+JE70wNpbFa0rnKifTxxCXZwbKROf54z7qclxfb9tT1SY0/aIhVee0PYSxPXMd82NTkFkEidGFWS7TbYoldg== - "@thirdweb-dev/chains@0.1.73-nightly-fa637c2e3-20240214074441": version "0.1.73-nightly-fa637c2e3-20240214074441" resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.73-nightly-fa637c2e3-20240214074441.tgz#525e429030014ca6598d687d58b79b8940a9d302" integrity sha512-auxe2eGXKDFYxkktGZLcDo4ZOOXZU3xgh1KijSUR540p1Vpmv3srEKlJbOr/2oJW4OSOn70OQ6rXy7Ej/N0XWQ== +"@thirdweb-dev/chains@^0.1.77": + version "0.1.77" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.77.tgz#7d938a71f27e39666704048840aaaacc1e51e86e" + integrity sha512-Sn58vGCAVMUrzkEncgSIl7y1Ee04e8WzQPbL2UEZF6FyWi4bJgS69iZcKJyIJH7iczoChJ8wCZHHMzBtY8pJZQ== + "@thirdweb-dev/contracts-js@1.3.16": version "1.3.16" resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.16.tgz#264727b40b0f320c01eefcb4295e89c9e9947002"