thirdweb 5.89.1 → 5.90.1

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -16,7 +16,6 @@ import {
 } from "../../exports/extensions/erc4337.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
 import { setContractURI } from "../../extensions/marketplace/__generated__/IMarketplace/write/setContractURI.js";
-import { estimateGasCost } from "../../transaction/actions/estimate-gas-cost.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../transaction/actions/send-batch-transaction.js";
 import { waitForReceipt } from "../../transaction/actions/wait-for-tx-receipt.js";
@@ -27,6 +26,7 @@ import { hashTypedData } from "../../utils/hashing/hashTypedData.js";
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
+import { estimateUserOpGasCost } from "./lib/bundler.js";
 import { predictSmartAccountAddress } from "./lib/calls.js";
 import { DEFAULT_ACCOUNT_FACTORY_V0_7 } from "./lib/constants.js";
 import {
@@ -49,11 +49,9 @@ const contract = getContract({
   address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
 });
 
-// FIXME: SKIP ALL OF THIS IT IS FLAKY
-describe.skip(
+describe.sequential(
   "SmartWallet 0.7 core tests",
   {
-    retry: 0,
     timeout: 240_000,
   },
   () => {
@@ -89,6 +87,27 @@ describe.skip(
       expect(predictedAddress).toEqual(smartWalletAddress);
     });
 
+    it("can estimate gas cost", async () => {
+      const gasCost = await estimateUserOpGasCost({
+        transactions: [
+          claimTo({
+            contract,
+            quantity: 1n,
+            to: smartWalletAddress,
+            tokenId: 0n,
+          }),
+        ],
+        adminAccount: personalAccount,
+        client: TEST_CLIENT,
+        smartWalletOptions: {
+          chain,
+          sponsorGas: true,
+          factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
+        },
+      });
+      expect(gasCost.ether).not.toBe("0");
+    });
+
     it("can sign a msg", async () => {
       const signature = await smartAccount.signMessage({
         message: "hello world",
@@ -103,8 +122,7 @@ describe.skip(
       expect(isValid).toEqual(true);
     });
 
-    // FIXME: flaky test - skipped
-    it.skip("should use ERC-1271 signatures after deployment", async () => {
+    it("should use ERC-1271 signatures after deployment", async () => {
       await deploySmartAccount({
         chain,
         client,
@@ -137,8 +155,7 @@ describe.skip(
       expect(isValid).toEqual(true);
     });
 
-    // FIXME: flaky test - skipped
-    it.skip("should use ERC-1271 typed data signatures after deployment", async () => {
+    it("should use ERC-1271 typed data signatures after deployment", async () => {
       await deploySmartAccount({
         chain,
         client,
@@ -206,19 +223,6 @@ describe.skip(
       expect(isDeployed).toEqual(true);
     });
 
-    it("can estimate a tx", async () => {
-      const estimates = await estimateGasCost({
-        transaction: claimTo({
-          contract,
-          quantity: 1n,
-          to: smartWalletAddress,
-          tokenId: 0n,
-        }),
-        account: smartAccount,
-      });
-      expect(estimates.wei.toString()).not.toBe("0");
-    });
-
     it("can execute a batched tx", async () => {
       const tx = await sendBatchTransaction({
         account: smartAccount,

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -29,6 +29,7 @@ import { hashTypedData } from "../../utils/hashing/hashTypedData.js";
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
+import { estimateUserOpGasCost } from "./lib/bundler.js";
 import { predictSmartAccountAddress } from "./lib/calls.js";
 import { deploySmartAccount } from "./lib/signing.js";
 import { smartWallet } from "./smart-wallet.js";
@@ -51,7 +52,6 @@ const factoryAddress = "0x564cf6453a1b0FF8DB603E92EA4BbD410dea45F3"; // pre 712
 describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet core tests",
   {
-    retry: 0,
     timeout: 240_000,
   },
   () => {
@@ -75,6 +75,26 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
     });
 
+    it("can estimate gas cost", async () => {
+      const gasCost = await estimateUserOpGasCost({
+        transactions: [
+          claimTo({
+            contract,
+            quantity: 1n,
+            to: smartWalletAddress,
+            tokenId: 0n,
+          }),
+        ],
+        adminAccount: personalAccount,
+        client: TEST_CLIENT,
+        smartWalletOptions: {
+          chain,
+          sponsorGas: true,
+        },
+      });
+      expect(gasCost.ether).not.toBe("0");
+    });
+
     it("can connect", async () => {
       expect(smartWalletAddress).toHaveLength(42);
       const predictedAddress = await predictSmartAccountAddress({

package/src/wallets/smart/smart-wallet-modular.test.ts

@@ -28,8 +28,7 @@ const client = TEST_CLIENT;
 const DEFAULT_FACTORY_ADDRESS = "0xB1846E893CA01c5Dcdaa40371C1e13f2e0Df5717";
 const DEFAULT_VALIDATOR_ADDRESS = "0x7D3631d823e0De311DC86f580946EeF2eEC81fba";
 
-// FIXME: This test is flaky and needs to be fixed
-describe.skip.sequential(
+describe.sequential(
   "SmartWallet modular tests",
   {
     retry: 0,