Skip to content

Commit eb17f21

Browse files
committed
Merge branch 'main' into yash/insight-events
2 parents 6e7493f + 316cef1 commit eb17f21

File tree

50 files changed

+854
-573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+854
-573
lines changed

.changeset/blue-geese-refuse.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
public-hoist-pattern[]=*import-in-the-middle*
2+
public-hoist-pattern[]=*require-in-the-middle*

apps/dashboard/next.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ function getConfig(): NextConfig {
203203
type: "memory",
204204
});
205205
}
206-
config.externals.push("pino-pretty");
207206
config.module = {
208207
...config.module,
209208
exprContextCritical: false,

apps/dashboard/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"papaparse": "^5.5.2",
7979
"pluralize": "^8.0.0",
8080
"posthog-js": "1.67.1",
81+
"prettier": "3.5.3",
8182
"qrcode": "^1.5.3",
8283
"react": "19.1.0",
8384
"react-children-utilities": "^2.10.0",

apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import invariant from "tiny-invariant";
1515
import type { EngineStatus } from "../../../app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/transactions-table";
1616
import { engineKeys } from "../cache-keys";
1717

18-
export type EngineTier = "STARTER" | "PREMIUM" | "ENTERPRISE";
19-
2018
// Engine instances
2119
export type EngineInstance = {
2220
id: string;
2321
accountId: string;
2422
name: string;
2523
url: string;
2624
lastAccessedAt: string;
25+
isCloudHosted: boolean;
26+
isPlanEngine: boolean;
2727
status:
2828
| "active"
2929
| "pending"
15.9 KB
Loading
10 KB
Loading

apps/dashboard/src/app/(dashboard)/(chain)/utils.ts

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ import zeroGCTA from "./temp-assets/0gCTA.png";
66
import zeroGBanner from "./temp-assets/0gLabsBanner.png";
77
import alephZeroBaner from "./temp-assets/AlephZeroBanner.jpg";
88
import alephZeroCTA from "./temp-assets/AlephZeroCTA.jpg";
9-
import ancient8Banner from "./temp-assets/ancient8-banner.png";
10-
import assetChainBanner from "./temp-assets/assetChainBanner.png";
11-
import assetChainCTABG from "./temp-assets/assetChainCTABanner.png";
12-
9+
import cotiBanner from "./temp-assets/COTI_Banner.jpg";
10+
import cotiCTA from "./temp-assets/COTI_CTA.jpg";
1311
import hemiSepoliaBanner from "./temp-assets/HemiBanner.png";
1412
import hemiSepoliaCTA from "./temp-assets/HemiCTA.png";
13+
import ancient8Banner from "./temp-assets/ancient8-banner.png";
1514
import appChainBanner from "./temp-assets/appChainBanner.jpg";
1615
// TEMPORARY
1716
import appchainCTA from "./temp-assets/appchainCTA.png";
17+
import assetChainBanner from "./temp-assets/assetChainBanner.png";
18+
import assetChainCTABG from "./temp-assets/assetChainCTABanner.png";
1819
import baseBanner from "./temp-assets/base-banner.jpeg";
1920
import superchainCTABG from "./temp-assets/cta-bg-superchain.png";
2021
import xaiCTABg from "./temp-assets/cta-bg-xai-connect.png";
@@ -340,6 +341,30 @@ const chainMetaRecord = {
340341
buttonText: "Learn More",
341342
},
342343
},
344+
//COTI Mainnet
345+
2632500: {
346+
headerImgUrl: cotiBanner.src,
347+
about:
348+
"COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
349+
cta: {
350+
backgroundImageUrl: cotiCTA.src,
351+
title: "The Fastest, Lightest Privacy Layer in Web3",
352+
buttonLink: "https://thirdweb.com/coti",
353+
buttonText: "Learn More",
354+
},
355+
},
356+
//COTI Testnet
357+
7082400: {
358+
headerImgUrl: cotiBanner.src,
359+
about:
360+
"COTI is the fastest, lightest privacy layer in Web3, powered by the breakthrough cryptographic protocol Garbled Circuits. Build with privacy. Scale with speed.",
361+
cta: {
362+
backgroundImageUrl: cotiCTA.src,
363+
title: "The Fastest, Lightest Privacy Layer in Web3",
364+
buttonLink: "https://thirdweb.com/coti",
365+
buttonText: "Learn More",
366+
},
367+
},
343368
//Donatuz
344369
42026: {
345370
headerImgUrl: thirdwebBanner.src,

apps/dashboard/src/app/(dashboard)/contracts/deploy/[compiler_uri]/page.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default async function DirectDeployPage(props: DirectDeployPageProps) {
3333
/>
3434
<DeployFormForUri
3535
contractMetadata={metadata}
36+
contractMetadataNoFee={metadata}
3637
modules={null}
3738
pathname={`/contracts/deploy/${params.compiler_uri}`}
3839
/>

apps/dashboard/src/app/(dashboard)/published-contract/components/publish-based-deploy.tsx

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
fetchPublishedContractVersion,
44
fetchPublishedContractVersions,
55
} from "components/contract-components/fetch-contracts-with-versions";
6+
import { ZERO_FEE_VERSIONS } from "constants/fee-config";
67
import { isAddress } from "thirdweb";
78
import { fetchDeployMetadata } from "thirdweb/contract";
89
import { resolveAddress } from "thirdweb/extensions/ens";
@@ -46,29 +47,41 @@ export async function DeployFormForPublishInfo(props: PublishBasedDeployProps) {
4647
publishedContractVersions.find((v) => v.version === props.version) ||
4748
publishedContractVersions[0];
4849

50+
const publishedContractNoFee = publishedContractVersions.find(
51+
(v) => v.version === ZERO_FEE_VERSIONS[v.name],
52+
);
53+
4954
if (!publishedContract) {
5055
return null;
5156
}
5257

5358
const moduleUris = modules
5459
.filter((m) => m !== null && m !== undefined)
5560
.map((m) => m.publishMetadataUri);
56-
const [contractMetadata, ...fetchedModules] = await Promise.all([
57-
fetchDeployMetadata({
58-
client,
59-
// force `ipfs://` prefix
60-
uri: publishedContract.publishMetadataUri.startsWith("ipfs://")
61-
? publishedContract.publishMetadataUri
62-
: `ipfs://${publishedContract.publishMetadataUri}`,
63-
}).catch(() => null),
64-
...(moduleUris || []).map((uri) =>
61+
const [contractMetadata, contractMetadataNoFee, ...fetchedModules] =
62+
await Promise.all([
6563
fetchDeployMetadata({
6664
client,
6765
// force `ipfs://` prefix
68-
uri: uri.startsWith("ipfs://") ? uri : `ipfs://${uri}`,
66+
uri: publishedContract.publishMetadataUri.startsWith("ipfs://")
67+
? publishedContract.publishMetadataUri
68+
: `ipfs://${publishedContract.publishMetadataUri}`,
6969
}).catch(() => null),
70-
),
71-
]);
70+
fetchDeployMetadata({
71+
client,
72+
// force `ipfs://` prefix
73+
uri: publishedContractNoFee?.publishMetadataUri.startsWith("ipfs://")
74+
? publishedContractNoFee.publishMetadataUri
75+
: `ipfs://${publishedContractNoFee?.publishMetadataUri}`,
76+
}).catch(() => null),
77+
...(moduleUris || []).map((uri) =>
78+
fetchDeployMetadata({
79+
client,
80+
// force `ipfs://` prefix
81+
uri: uri.startsWith("ipfs://") ? uri : `ipfs://${uri}`,
82+
}).catch(() => null),
83+
),
84+
]);
7285

7386
return (
7487
<div className="mx-auto flex w-full max-w-[1000px] flex-col gap-8 pb-20">
@@ -79,6 +92,7 @@ export async function DeployFormForPublishInfo(props: PublishBasedDeployProps) {
7992
/>
8093
<DeployFormForUri
8194
contractMetadata={contractMetadata}
95+
contractMetadataNoFee={contractMetadataNoFee}
8296
modules={fetchedModules.filter((m) => m !== null)}
8397
pathname={`/${props.publisher}/${props.contract_id}${props.version ? `/${props.version}` : ""}/deploy`}
8498
/>

0 commit comments

Comments
 (0)