test: Update chain definition in isEIP155Enforced test (#2773)

Author: jnsdls

.github/workflows/CI.yml

@@ -30,7 +30,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest-16
+    runs-on: ubuntu-latest
     name: Build Packages
     steps:
       - name: Check out the code
@@ -63,7 +63,7 @@ jobs:
   test:
     timeout-minutes: 15
     name: Unit Tests
-    runs-on: ubuntu-latest-16
+    runs-on: ubuntu-latest
     steps:
       - name: Check out the code
         uses: actions/checkout@v4
@@ -73,6 +73,9 @@ jobs:
 
       - name: Set up foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-440ec525deb00b4dca138794865c27d1e8ea4d01
+          cache: false
 
       - run: pnpm test
 
@@ -101,14 +104,20 @@ jobs:
     if: github.event_name != 'merge_group'
     timeout-minutes: 15
     name: "Benchmarks"
-    runs-on: ubuntu-latest-16
+    runs-on: ubuntu-latest
     steps:
       - name: Check out the code
         uses: actions/checkout@v4
 
       - name: Setup & Install
         uses: ./.github/composite-actions/install
 
+      - name: Set up foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-440ec525deb00b4dca138794865c27d1e8ea4d01
+          cache: false
+
       - name: Run benchmarks
         uses: CodSpeedHQ/action@v2
         with:
@@ -120,7 +129,7 @@ jobs:
     if: github.event_name == 'pull_request'
     timeout-minutes: 15
     name: "Size"
-    runs-on: ubuntu-latest-16
+    runs-on: ubuntu-latest
     steps:
       - name: Check out the code
         uses: actions/checkout@v4

packages/thirdweb/package.json

@@ -194,7 +194,7 @@
     "push": "yalc push",
     "size": "size-limit",
     "test:watch": "vitest -c ./test/vitest.config.ts dev",
-    "test": "vitest run -c ./test/vitest.config.ts --coverage --bail=1",
+    "test": "vitest run -c ./test/vitest.config.ts",
     "test:cov": "vitest dev -c ./test/vitest.config.ts --coverage",
     "test:dev": "vitest run -c ./test/vitest.config.ts",
     "typedoc": "node scripts/typedoc.mjs",

packages/thirdweb/src/adapters/viem.test.ts

@@ -1,14 +1,12 @@
 import { zeroAddress } from "viem";
 import { beforeAll, describe, expect, test } from "vitest";
+import { ANVIL_PKEY_A } from "~test/test-wallets.js";
+import { typedData } from "~test/typed-data.js";
+import { ANVIL_CHAIN, FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
 import { privateKeyAccount } from "../wallets/private-key.js";
 import { viemAdapter } from "./viem.js";
 
-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 { mainnet } from "../chains/chain-definitions/ethereum.js";
-
 const account = privateKeyAccount({
   privateKey: ANVIL_PKEY_A,
   client: TEST_CLIENT,
@@ -68,7 +66,7 @@ describe("walletClient.toViem", () => {
     walletClient = viemAdapter.walletClient.toViem({
       client: TEST_CLIENT,
       account,
-      chain: mainnet,
+      chain: FORKED_ETHEREUM_CHAIN,
     });
 
     const address = await walletClient.getAddresses();

packages/thirdweb/src/extensions/erc1155/drop1155.test.ts

@@ -206,7 +206,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
           [TransactionError: Error - !Qty
 
-          contract: 0xd91A47278829a0128D7212225FE74BC153A7FAF8
+          contract: ${contract.address}
           chainId: 31337]
         `);
 

packages/thirdweb/src/transaction/prepare-transaction.test.ts

@@ -1,17 +1,15 @@
 import { describe, expect, test as it } from "vitest";
-
 import { TEST_WALLET_A, TEST_WALLET_B } from "../../test/src/addresses.js";
+import { FORKED_ETHEREUM_CHAIN } from "../../test/src/chains.js";
 import { TEST_CLIENT } from "../../test/src/test-clients.js";
-
-import { ethereum } from "../chains/chain-definitions/ethereum.js";
 import { toWei } from "../utils/units.js";
 import { estimateGas } from "./actions/estimate-gas.js";
 import { prepareTransaction } from "./prepare-transaction.js";
 
-describe("prepareTransaction", () => {
+describe.runIf(process.env.TW_SECRET_KEY)("prepareTransaction", () => {
   it("should prepare a transaction", () => {
     const preparedTx = prepareTransaction({
-      chain: ethereum,
+      chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       to: TEST_WALLET_B,
       value: toWei("0.1"),
@@ -26,7 +24,7 @@ describe("prepareTransaction", () => {
     "should estimate the gas correctly",
     async () => {
       const preparedTx = prepareTransaction({
-        chain: ethereum,
+        chain: FORKED_ETHEREUM_CHAIN,
         client: TEST_CLIENT,
         to: TEST_WALLET_B,
         value: toWei("0.1"),

packages/thirdweb/src/utils/any-evm/is-eip155-enforced.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { ethereum } from "../../chains/chain-definitions/ethereum.js";
 import { optimism } from "../../chains/chain-definitions/optimism.js";
 import { isEIP155Enforced } from "./is-eip155-enforced.js";
 
@@ -22,8 +22,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("isEIP155Enforced", () => {
   it("should return false if EIP-155 is not enforced", async () => {
     // Call the isEIP155Enforced function with a chain that does not enforce EIP-155
     const result = await isEIP155Enforced({
-      // ethereum does not enforce eip155
-      chain: ethereum,
+      // localhost does not enforce eip155
+      chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
     });
 

packages/thirdweb/test/globalSetup.ts

@@ -1,53 +1,53 @@
+import { sha256 } from "@noble/hashes/sha256";
 import { startProxy } from "@viem/anvil";
 import { FORK_BLOCK_NUMBER, OPTIMISM_FORK_BLOCK_NUMBER } from "./src/chains.js";
-import { sha256 } from "@noble/hashes/sha256";
 
 require("dotenv-mono").load();
 
 const SECRET_KEY = process.env.TW_SECRET_KEY as string;
 
 const clientId = SECRET_KEY
-	? Buffer.from(sha256(SECRET_KEY)).toString("hex").slice(0, 32)
-	: "";
+  ? Buffer.from(sha256(SECRET_KEY)).toString("hex").slice(0, 32)
+  : "";
 
 export default async function globalSetup() {
-	const shutdownMainnet = await startProxy({
-		port: 8645,
-		options: {
-			chainId: 1,
-			forkUrl: SECRET_KEY
-				? `https://1.rpc.thirdweb.com/${clientId}`
-				: "https://mainnet.gateway.tenderly.co",
-			forkHeader: SECRET_KEY ? { "x-secret-key": SECRET_KEY } : {},
-			forkChainId: 1,
-			forkBlockNumber: FORK_BLOCK_NUMBER,
-			noMining: true,
-			startTimeout: 20000,
-		},
-	});
+  const shutdownMainnet = await startProxy({
+    port: 8645,
+    options: {
+      chainId: 1,
+      forkUrl: SECRET_KEY
+        ? `https://1.rpc.thirdweb.com/${clientId}`
+        : "https://mainnet.gateway.tenderly.co",
+      forkHeader: SECRET_KEY ? { "x-secret-key": SECRET_KEY } : {},
+      forkChainId: 1,
+      forkBlockNumber: FORK_BLOCK_NUMBER,
+      noMining: true,
+      startTimeout: 20000,
+    },
+  });
 
-	const shutdownOptimism = await startProxy({
-		port: 8646,
-		options: {
-			chainId: 10,
-			forkUrl: SECRET_KEY
-				? `https://10.rpc.thirdweb.com/${clientId}`
-				: "https://mainnet.optimism.io/",
-			forkHeader: SECRET_KEY ? { "x-secret-key": SECRET_KEY } : {},
-			forkChainId: 10,
-			forkBlockNumber: OPTIMISM_FORK_BLOCK_NUMBER,
-			noMining: true,
-			startTimeout: 20000,
-		},
-	});
+  const shutdownOptimism = await startProxy({
+    port: 8646,
+    options: {
+      chainId: 10,
+      forkUrl: SECRET_KEY
+        ? `https://10.rpc.thirdweb.com/${clientId}`
+        : "https://mainnet.optimism.io/",
+      forkHeader: SECRET_KEY ? { "x-secret-key": SECRET_KEY } : {},
+      forkChainId: 10,
+      forkBlockNumber: OPTIMISM_FORK_BLOCK_NUMBER,
+      noMining: true,
+      startTimeout: 20000,
+    },
+  });
 
-	const shutdownAnvil = await startProxy({
-		port: 8647,
-	});
+  const shutdownAnvil = await startProxy({
+    port: 8647,
+  });
 
-	return () => {
-		shutdownMainnet();
-		shutdownOptimism();
-		shutdownAnvil();
-	};
+  return async () => {
+    await shutdownMainnet();
+    await shutdownOptimism();
+    await shutdownAnvil();
+  };
 }

packages/thirdweb/test/src/chains.ts

@@ -10,21 +10,21 @@ export const FORKED_OPTIMISM_RPC = `http://127.0.0.1:8646/${poolId}`;
 export const ANVIL_RPC = `http://127.0.0.1:8647/${poolId}`;
 
 export const FORKED_ETHEREUM_CHAIN = defineChain({
-	...ethereum,
-	// override the rpc url
-	rpc: FORKED_ETHEREUM_RPC,
+  ...ethereum,
+  // override the rpc url
+  rpc: FORKED_ETHEREUM_RPC,
 });
 
 export const FORKED_OPTIMISM_CHAIN = defineChain({
-	...optimism,
-	// override the rpc url
-	rpc: FORKED_OPTIMISM_RPC,
+  ...optimism,
+  // override the rpc url
+  rpc: FORKED_OPTIMISM_RPC,
 });
 
 export const ANVIL_CHAIN = defineChain({
-	...anvil,
-	// override the rpc url
-	rpc: ANVIL_RPC,
+  ...anvil,
+  // override the rpc url
+  rpc: ANVIL_RPC,
 });
 
 export const FORK_BLOCK_NUMBER = 19139495n;

packages/thirdweb/test/vitest.config.ts

@@ -1,7 +1,7 @@
 import { join } from "node:path";
-import { defineConfig } from "vitest/config";
 // @ts-expect-error - no types
 import codspeedPlugin from "@codspeed/vitest-plugin";
+import { defineConfig } from "vitest/config";
 
 const plugins = process.env.CI ? [codspeedPlugin()] : [];
 
@@ -34,8 +34,9 @@ export default defineConfig({
     include: ["src/**/*.test.ts"],
     // setupFiles: [join(__dirname, "./setup.ts")],
     globalSetup: [join(__dirname, "./globalSetup.ts")],
-    testTimeout: 30_000,
-    retry: process.env.CI ? 0 : 3,
+    testTimeout: 60_000,
+    retry: 0,
+    bail: 1,
     // clear any mocks between any tests
     clearMocks: true,
     pool: "forks",