thirdweb 5.90.1 → 5.90.2

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -20,54 +20,57 @@ import { getContract } from "../../contract/contract.js";
 import { deployContract } from "../../contract/deployment/deploy-with-abi.js";
 import { resolveImplementation } from "./resolveImplementation.js";
 
-describe("Resolve implementation", async () => {
-  it("should extract implementation address for minimal proxy contract", async () => {
-    const resolved = resolveImplementation(NFT_DROP_CONTRACT);
-    expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
-  });
-
-  it("should extract implementation address for matic proxy contract", async () => {
-    const resolved = resolveImplementation(POLYGON_USDT_PROXY_CONTRACT);
-    expect((await resolved).address).to.equal(
-      POLYGON_USDT_IMPLEMENTATION.toLowerCase(),
-    );
-  });
-
-  it("should extract implementation address for base USDC proxy contract", async () => {
-    const resolved = resolveImplementation(BASE_USDC_PROXY_CONTRACT);
-    expect((await resolved).address).to.equal(
-      BASE_USDC_IMPLEMENTATION.toLowerCase(),
-    );
-  });
-
-  it("should extract implementation address for ERC1967 proxy contract", async () => {
-    const implementationAddress = await deployContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
-      bytecode: DUMMY_BYTECODE,
-      abi: [],
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "Resolve implementation",
+  async () => {
+    it("should extract implementation address for minimal proxy contract", async () => {
+      const resolved = resolveImplementation(NFT_DROP_CONTRACT);
+      expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
     });
 
-    const proxyAddress = await deployContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
-      bytecode: ERC1967_PROXY_BYTECODE,
-      abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
-      constructorParams: {
-        logic: implementationAddress,
-        data: "0x",
-      },
+    it("should extract implementation address for matic proxy contract", async () => {
+      const resolved = resolveImplementation(POLYGON_USDT_PROXY_CONTRACT);
+      expect((await resolved).address).to.equal(
+        POLYGON_USDT_IMPLEMENTATION.toLowerCase(),
+      );
     });
 
-    const proxy = getContract({
-      chain: ANVIL_CHAIN,
-      address: proxyAddress,
-      client: TEST_CLIENT,
+    it("should extract implementation address for base USDC proxy contract", async () => {
+      const resolved = resolveImplementation(BASE_USDC_PROXY_CONTRACT);
+      expect((await resolved).address).to.equal(
+        BASE_USDC_IMPLEMENTATION.toLowerCase(),
+      );
     });
 
-    const resolved = await resolveImplementation(proxy);
-    expect(resolved.address).to.equal(implementationAddress);
-  });
-});
+    it("should extract implementation address for ERC1967 proxy contract", async () => {
+      const implementationAddress = await deployContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        bytecode: DUMMY_BYTECODE,
+        abi: [],
+      });
+
+      const proxyAddress = await deployContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        bytecode: ERC1967_PROXY_BYTECODE,
+        abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
+        constructorParams: {
+          logic: implementationAddress,
+          data: "0x",
+        },
+      });
+
+      const proxy = getContract({
+        chain: ANVIL_CHAIN,
+        address: proxyAddress,
+        client: TEST_CLIENT,
+      });
+
+      const resolved = await resolveImplementation(proxy);
+      expect(resolved.address).to.equal(implementationAddress);
+    });
+  },
+);

package/src/utils/promise/resolve-promised-value.ts

@@ -10,6 +10,7 @@
 export async function resolvePromisedValue<V>(
   value: V,
 ): Promise<V extends () => Promise<infer R> ? R : V> {
+  // @ts-expect-error - this works fine, but TS doesn't like it since 5.8
   return typeof value === "function" ? await value() : value;
 }
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.90.1";
+export const version = "5.90.2";

package/src/wallets/smart/lib/bundler.ts

@@ -179,6 +179,7 @@ export async function estimateUserOpGasCost(args: {
         client: args.client,
       }),
     ),
+    waitForDeployment: false,
   });
 
   let gasLimit = 0n;

package/src/wallets/smart/lib/userop.ts

@@ -321,7 +321,9 @@ async function populateUserOp_v0_7(args: {
         createAccountOverride: overrides?.createAccount,
       }),
     );
-    markAccountDeploying(accountContract);
+    if (waitForDeployment) {
+      markAccountDeploying(accountContract);
+    }
   }
 
   const partialOp: UserOperationV07 = {
@@ -481,7 +483,9 @@ async function populateUserOp_v0_6(args: {
       accountSalt: overrides?.accountSalt,
       createAccountOverride: overrides?.createAccount,
     });
-    markAccountDeploying(accountContract);
+    if (waitForDeployment) {
+      markAccountDeploying(accountContract);
+    }
   }
 
   const partialOp: UserOperationV06 = {

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

@@ -49,9 +49,10 @@ const contract = getContract({
   address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
 });
 
-describe.sequential(
+describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet 0.7 core tests",
   {
+    retry: 0,
     timeout: 240_000,
   },
   () => {
@@ -200,7 +201,7 @@ describe.sequential(
       });
 
       await expect(tx).rejects.toMatchInlineSnapshot(`
-        [TransactionError: Error - Not authorized
+        [TransactionError: Execution Reverted: {"code":3,"message":"execution reverted: Not authorized"}
 
         contract: ${contract.address}
         chainId: 11155111]

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

@@ -52,6 +52,7 @@ const factoryAddress = "0x564cf6453a1b0FF8DB603E92EA4BbD410dea45F3"; // pre 712
 describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet core tests",
   {
+    retry: 0,
     timeout: 240_000,
   },
   () => {

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

@@ -28,7 +28,7 @@ const client = TEST_CLIENT;
 const DEFAULT_FACTORY_ADDRESS = "0xB1846E893CA01c5Dcdaa40371C1e13f2e0Df5717";
 const DEFAULT_VALIDATOR_ADDRESS = "0x7D3631d823e0De311DC86f580946EeF2eEC81fba";
 
-describe.sequential(
+describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet modular tests",
   {
     retry: 0,