Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
uses: foundry-rs/foundry-toolchain@908c540300062bd5a7e473851cdb4282204cee09 # v1.9.1
with:
cache: false
version: nightly-c4a984fbf2c48b793c8cd53af84f56009dd1070c
version: v1.8.5

- run: pnpm test

Expand Down
10 changes: 5 additions & 5 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@
"@chromatic-com/storybook": "4.0.1",
"@next/bundle-analyzer": "15.5.27",
"@next/eslint-plugin-next": "15.5.27",
"@storybook/addon-docs": "9.1.20",
"@storybook/addon-links": "9.1.20",
"@storybook/addon-onboarding": "9.1.20",
"@storybook/nextjs": "9.1.20",
"@storybook/addon-docs": "9.1.21",
"@storybook/addon-links": "9.1.21",
"@storybook/addon-onboarding": "9.1.21",
"@storybook/nextjs": "9.1.21",
"@types/color": "4.2.0",
"@types/node": "22.14.1",
"@types/papaparse": "^5.3.16",
Expand All @@ -106,7 +106,7 @@
"knip": "5.60.2",
"next-sitemap": "^4.2.3",
"postcss": "8.5.23",
"storybook": "9.1.20",
"storybook": "9.1.21",
"tailwindcss": "3.4.17",
"typescript": "5.8.3"
},
Expand Down
10 changes: 5 additions & 5 deletions apps/nebula/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@biomejs/biome": "2.0.6",
"@chromatic-com/storybook": "4.0.1",
"@next/eslint-plugin-next": "15.5.27",
"@storybook/addon-docs": "9.1.20",
"@storybook/addon-links": "9.1.20",
"@storybook/addon-onboarding": "9.1.20",
"@storybook/nextjs": "9.1.20",
"@storybook/addon-docs": "9.1.21",
"@storybook/addon-links": "9.1.21",
"@storybook/addon-onboarding": "9.1.21",
"@storybook/nextjs": "9.1.21",
"@types/node": "22.14.1",
"@types/react": "19.2.7",
"@types/react-dom": "19.2.3",
Expand All @@ -60,7 +60,7 @@
"knip": "5.60.2",
"next-sitemap": "^4.2.3",
"postcss": "8.5.23",
"storybook": "9.1.20",
"storybook": "9.1.21",
"tailwindcss": "3.4.17",
"typescript": "5.8.3"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/wagmi-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"@wagmi/cli": "2.8.0",
"buffer": "^6.0.3",
"typescript": "5.8.3",
"vite": "7.3.6"
"vite": "7.3.7"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"glob@^11.0.0": "11.1.0",
"handlebars@^4.0.0": "4.7.9",
"linkify-it@^5.0.0": "5.0.2",
"markdown-it@^14.0.0": "14.3.1",
"markdown-it@^14.0.0": "14.3.3",
"minimatch@^3.0.0": "3.1.5",
"minimatch@^8.0.0": "8.0.7",
"minimatch@^9.0.0": "9.0.9",
Expand Down
14 changes: 7 additions & 7 deletions packages/thirdweb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"@react-native-async-storage/async-storage": "2.2.0",
"@size-limit/file": "11.2.0",
"@size-limit/webpack": "11.2.0",
"@storybook/addon-docs": "9.1.20",
"@storybook/addon-links": "9.1.20",
"@storybook/addon-onboarding": "9.1.20",
"@storybook/react": "9.1.20",
"@storybook/react-vite": "9.1.20",
"@storybook/addon-docs": "9.1.21",
"@storybook/addon-links": "9.1.21",
"@storybook/addon-onboarding": "9.1.21",
"@storybook/react": "9.1.21",
"@storybook/react-vite": "9.1.21",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "^14.6.1",
Expand Down Expand Up @@ -91,12 +91,12 @@
"rimraf": "6.0.1",
"sharp": "^0.35.4",
"size-limit": "11.2.0",
"storybook": "9.1.20",
"storybook": "9.1.21",
"tsup": "^8.5.0",
"typedoc": "0.27.9",
"typedoc-better-json": "0.9.4",
"typescript": "5.8.3",
"vite": "7.3.6",
"vite": "7.3.7",
"vitest": "4.1.11"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
TEST_ACCOUNT_B,
TEST_ACCOUNT_C,
} from "../../../../test/src/test-wallets.js";
import { mineBlock } from "../../../../test/src/utils.js";
import {
getContract,
type ThirdwebContract,
Expand Down Expand Up @@ -169,6 +170,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
expect(listingEvent.args.listingCreator).toBe(TEST_ACCOUNT_B.address);
expect(listingEvent.args.assetContract).toBe(erc721Contract.address);

// the listing starts 1s after the latest block, so advance time to make it valid
await mineBlock(chain, 1);

const [
listingsAfter,
validListings,
Expand Down Expand Up @@ -307,6 +311,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("Marketplace Direct Listings", () => {
}),
});

// the listing starts 1s after the latest block, so advance time to make it valid
await mineBlock(chain, 1);

const [
listings1155After,
validListings1155,
Expand Down
2 changes: 1 addition & 1 deletion packages/thirdweb/src/transaction/read-contract.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("transaction: read", () => {
});
} catch (e) {
expect((e as Error).message).eq(
"execution reverted: revert: ERC721Metadata: URI query for nonexistent token",
"execution reverted: ERC721Metadata: URI query for nonexistent token",
);
}
});
Expand Down
13 changes: 7 additions & 6 deletions packages/thirdweb/src/wallets/private-key.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ANVIL_PKEY_A } from "~test/test-wallets.js";
import { typedData } from "~test/typed-data.js";
import { ANVIL_CHAIN } from "../../test/src/chains.js";
import { sendTransaction } from "../exports/thirdweb.js";
import { waitForReceipt } from "../transaction/actions/wait-for-tx-receipt.js";
import { prepareTransaction } from "../transaction/prepare-transaction.js";
import { toUnits } from "../utils/units.js";
import { privateKeyToAccount } from "./private-key.js";
Expand Down Expand Up @@ -95,12 +96,12 @@ test("send transaction", async () => {
value: toUnits("1", 18),
});

expect(
await sendTransaction({
account,
transaction: tx,
}),
).toBeDefined();
const result = await sendTransaction({
account,
transaction: tx,
});
expect(result).toBeDefined();
await waitForReceipt(result);

const endingBalance = await getWalletBalance({
address: account.address,
Expand Down
4 changes: 4 additions & 0 deletions packages/thirdweb/test/globalSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export default async function globalSetup() {
forkBlockNumber: FORK_BLOCK_NUMBER,
noMining: true,
startTimeout: 60000,
// biome-ignore lint/suspicious/noExplicitAny: Let me do it
hardfork: "prague" as any,
},
});

Expand All @@ -42,6 +44,8 @@ export default async function globalSetup() {
// ey, i'm mining here!
noMining: false,
startTimeout: 60000,
// biome-ignore lint/suspicious/noExplicitAny: Let me do it
hardfork: "prague" as any,
},
});

Expand Down
9 changes: 7 additions & 2 deletions packages/thirdweb/test/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ import { wait } from "../../src/utils/promise/wait.js";
import { FORKED_ETHEREUM_CHAIN } from "./chains.js";
import { TEST_CLIENT } from "./test-clients.js";

export async function mineBlock(chain = FORKED_ETHEREUM_CHAIN) {
export async function mineBlock(
chain = FORKED_ETHEREUM_CHAIN,
intervalSeconds?: number,
) {
const rpcClient = getRpcClient({
chain,
client: TEST_CLIENT,
});
const res = await rpcClient({
method: "anvil_mine" as any,
params: ["0x1"],
params: intervalSeconds
? ["0x1", `0x${intervalSeconds.toString(16)}`]
: ["0x1"],
});
await wait(500); // wait for block to be fully mined
return res;
Expand Down
10 changes: 5 additions & 5 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
},
"devDependencies": {
"@chromatic-com/storybook": "4.0.1",
"@storybook/addon-docs": "9.1.20",
"@storybook/addon-links": "9.1.20",
"@storybook/addon-onboarding": "9.1.20",
"@storybook/nextjs": "9.1.20",
"@storybook/addon-docs": "9.1.21",
"@storybook/addon-links": "9.1.21",
"@storybook/addon-onboarding": "9.1.21",
"@storybook/nextjs": "9.1.21",
"@types/react": "19.2.7",
"@types/react-dom": "19.2.3",
"autoprefixer": "^10.4.21",
"postcss": "8.5.23",
"storybook": "9.1.20",
"storybook": "9.1.21",
"tailwindcss": "3.4.17",
"typescript": "5.8.3"
}
Expand Down
Loading
Loading