thirdweb 5.80.1-nightly-a7b6cb3211e8b5232e77965cb8dd8ff96b369424-20241228000338 → 5.80.1-nightly-03bf859809de255d20f4ed8285a3bb75cef17252-20241229000354

package/src/utils/promise/withCache.test.ts

@@ -95,3 +95,76 @@ it("behavior: programmatic removal", async () => {
 
   expect(fn).toBeCalledTimes(2);
 });
+
+describe("getCache", () => {
+  it("should return an object with clear, get, and set methods", () => {
+    const cacheKey = "testKey";
+    const cache = getCache<string>(cacheKey);
+
+    expect(typeof cache.clear).toBe("function");
+    expect(typeof cache.promise.get).toBe("function");
+    expect(typeof cache.promise.set).toBe("function");
+    expect(typeof cache.response.get).toBe("function");
+    expect(typeof cache.response.set).toBe("function");
+  });
+
+  it("should allow setting and getting values from the promise cache", () => {
+    const cacheKey = "testKey";
+    const cache = getCache<string>(cacheKey);
+    const testPromise = Promise.resolve("testValue");
+
+    cache.promise.set(testPromise);
+    expect(cache.promise.get()).toBe(testPromise);
+  });
+
+  it("should allow clearing the cache", () => {
+    const cacheKey = "testKey";
+    const cache = getCache<string>(cacheKey);
+    const testPromise = Promise.resolve("testValue");
+
+    cache.promise.set(testPromise);
+    cache.clear();
+    expect(cache.promise.get()).toBeUndefined();
+  });
+});
+
+describe("withCache", () => {
+  it("should execute the function and cache the result", async () => {
+    const cacheKey = "testKey1";
+    const fn = vi.fn().mockResolvedValue("testValue");
+
+    const result1 = await withCache(fn, { cacheKey });
+    const result2 = await withCache(fn, { cacheKey });
+
+    expect(result1).toBe("testValue");
+    expect(result2).toBe("testValue");
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+
+  it("should not return expired cache data", async () => {
+    const cacheKey = "testKey2";
+    const fn = vi.fn().mockResolvedValue("newValue");
+
+    const result1 = await withCache(fn, { cacheKey, cacheTime: 10 });
+    await new Promise((resolve) => setTimeout(resolve, 20)); // Wait for cache to expire
+    const result2 = await withCache(fn, { cacheKey, cacheTime: 10 });
+
+    expect(result1).toBe("newValue");
+    expect(result2).toBe("newValue");
+    expect(fn).toHaveBeenCalledTimes(2);
+  });
+
+  it("should deduplicate concurrent calls to the same cache key", async () => {
+    const cacheKey = "testKey3";
+    const fn = vi.fn().mockResolvedValue("testValue");
+
+    const [result1, result2] = await Promise.all([
+      withCache(fn, { cacheKey, cacheTime: 100 }),
+      withCache(fn, { cacheKey, cacheTime: 100 }),
+    ]);
+
+    expect(result1).toBe("testValue");
+    expect(result2).toBe("testValue");
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+});

package/src/utils/semver.test.ts

@@ -0,0 +1,72 @@
+import { describe, expect, it } from "vitest";
+import { isIncrementalVersion, toSemver } from "./semver.js";
+
+describe("toSemver", () => {
+  it("should parse a valid semantic version", () => {
+    const result = toSemver("1.2.3");
+    expect(result).toEqual({
+      major: 1,
+      minor: 2,
+      patch: 3,
+      versionString: "1.2.3",
+    });
+  });
+
+  it("should handle versions with leading/trailing spaces", () => {
+    const result = toSemver("  1.0.0  ");
+    expect(result).toEqual({
+      major: 1,
+      minor: 0,
+      patch: 0,
+      versionString: "1.0.0",
+    });
+  });
+
+  it("should throw an error for versions exceeding max length", () => {
+    const longVersion = "1".repeat(257); // 257 characters
+    expect(() => toSemver(longVersion)).toThrow(
+      "version is longer than 256 characters",
+    );
+  });
+
+  it("should throw an error for invalid semantic version formats", () => {
+    const invalidVersions = ["testd", "1....2", "test.1.0"];
+    for (const version of invalidVersions) {
+      expect(() => toSemver(version)).toThrowError(
+        `${version} is not a valid semantic version. Should be in the format of major.minor.patch. Ex: 0.4.1`,
+      );
+    }
+  });
+});
+
+describe("isIncrementalVersion", () => {
+  it("should return true for valid incremental versions", () => {
+    expect(isIncrementalVersion("1.0.0", "2.0.0")).toBe(true); // Major increment
+    expect(isIncrementalVersion("1.0.0", "1.1.0")).toBe(true); // Minor increment
+    expect(isIncrementalVersion("1.1.0", "1.1.1")).toBe(true); // Patch increment
+  });
+
+  it("should return false for non-incremental versions", () => {
+    expect(isIncrementalVersion("2.0.0", "1.0.0")).toBe(false); // Major decrement
+    expect(isIncrementalVersion("1.1.0", "1.0.0")).toBe(false); // Minor decrement
+    expect(isIncrementalVersion("1.1.1", "1.1.0")).toBe(false); // Patch decrement
+    expect(isIncrementalVersion("1.1.1", "1.1.1")).toBe(false); // Same version
+  });
+
+  it("should handle whitespace around version strings", () => {
+    expect(isIncrementalVersion("  1.0.0", "2.0.0  ")).toBe(true);
+  });
+
+  it("should throw errors for invalid version inputs", () => {
+    expect(() => isIncrementalVersion("invalid", "1.0.0")).toThrow();
+    expect(() => isIncrementalVersion("1.0.0", "invalid")).toThrow();
+    expect(() => isIncrementalVersion("invalid", "invalid")).toThrow();
+  });
+
+  it("should correctly handle complex version comparisons", () => {
+    expect(isIncrementalVersion("1.0.0", "1.1.0")).toBe(true);
+    expect(isIncrementalVersion("1.1.0", "1.1.1")).toBe(true);
+    expect(isIncrementalVersion("1.1.1", "2.0.0")).toBe(true);
+    expect(isIncrementalVersion("1.1.1", "0.9.9")).toBe(false);
+  });
+});

package/src/utils/semver.ts

@@ -17,7 +17,7 @@ type Semver = {
  * @internal
  * @param version - The version to convert to a Semver
  */
-function toSemver(version: string): Semver {
+export function toSemver(version: string): Semver {
   if (version.length > MAX_LENGTH) {
     throw new Error(`version is longer than ${MAX_LENGTH} characters`);
   }

package/src/utils/url.test.ts

@@ -1,5 +1,12 @@
 import { describe, expect, it } from "vitest";
-import { formatWalletConnectUrl } from "./url.js";
+import {
+  formatExplorerAddressUrl,
+  formatExplorerTxUrl,
+  formatNativeUrl,
+  formatUniversalUrl,
+  formatWalletConnectUrl,
+  isHttpUrl,
+} from "./url.js";
 
 describe("formatWalletConnectUrl", () => {
   it("should format a wallet connect URL for an HTTP app URL", () => {
@@ -30,3 +37,85 @@ describe("formatWalletConnectUrl", () => {
     `);
   });
 });
+
+describe("Utility functions tests", () => {
+  describe("isHttpUrl", () => {
+    it("should return true for valid HTTP/HTTPS URLs", () => {
+      expect(isHttpUrl("http://example.com")).toBe(true);
+      expect(isHttpUrl("https://example.com")).toBe(true);
+    });
+
+    it("should return false for non-HTTP URLs", () => {
+      expect(isHttpUrl("ftp://example.com")).toBe(false);
+      expect(isHttpUrl("example://custom")).toBe(false);
+      expect(isHttpUrl("example.com")).toBe(false);
+    });
+  });
+
+  describe("formatUniversalUrl", () => {
+    it("should format a valid HTTP URL with a WalletConnect URI", () => {
+      const result = formatUniversalUrl("https://example.com", "wc:uri");
+      expect(result).toEqual({
+        redirect: "https://example.com/wc?uri=wc%3Auri",
+        href: "https://example.com/",
+      });
+    });
+  });
+
+  describe("formatNativeUrl", () => {
+    it("should format a valid native URL with a WalletConnect URI", () => {
+      const result = formatNativeUrl("custom://example", "wc:uri");
+      expect(result).toEqual({
+        redirect: "custom://example/wc?uri=wc%3Auri",
+        href: "custom://example/",
+      });
+    });
+  });
+
+  describe("formatWalletConnectUrl", () => {
+    it("should call formatUniversalUrl for HTTP URLs", () => {
+      const result = formatWalletConnectUrl("https://example.com", "wc:uri");
+      expect(result).toEqual({
+        redirect: "https://example.com/wc?uri=wc%3Auri",
+        href: "https://example.com/",
+      });
+    });
+
+    it("should call formatNativeUrl for non-HTTP URLs", () => {
+      const result = formatWalletConnectUrl("custom://example", "wc:uri");
+      expect(result).toEqual({
+        redirect: "custom://example/wc?uri=wc%3Auri",
+        href: "custom://example/",
+      });
+    });
+  });
+
+  describe("formatExplorerTxUrl", () => {
+    it("should correctly format transaction URLs", () => {
+      const result = formatExplorerTxUrl("https://explorer.com", "tx123");
+      expect(result).toBe("https://explorer.com/tx/tx123");
+
+      const resultWithSlash = formatExplorerTxUrl(
+        "https://explorer.com/",
+        "tx123",
+      );
+      expect(resultWithSlash).toBe("https://explorer.com/tx/tx123");
+    });
+  });
+
+  describe("formatExplorerAddressUrl", () => {
+    it("should correctly format address URLs", () => {
+      const result = formatExplorerAddressUrl(
+        "https://explorer.com",
+        "addr123",
+      );
+      expect(result).toBe("https://explorer.com/address/addr123");
+
+      const resultWithSlash = formatExplorerAddressUrl(
+        "https://explorer.com/",
+        "addr123",
+      );
+      expect(resultWithSlash).toBe("https://explorer.com/address/addr123");
+    });
+  });
+});

package/src/utils/url.ts

@@ -1,7 +1,7 @@
 /**
  * @internal
  */
-function isHttpUrl(url: string) {
+export function isHttpUrl(url: string) {
   return url.startsWith("http://") || url.startsWith("https://");
 }
 
@@ -13,7 +13,10 @@ type LinkingRecord = {
 /**
  * @internal
  */
-function formatUniversalUrl(appUrl: string, wcUri: string): LinkingRecord {
+export function formatUniversalUrl(
+  appUrl: string,
+  wcUri: string,
+): LinkingRecord {
   if (!isHttpUrl(appUrl)) {
     return formatNativeUrl(appUrl, wcUri);
   }
@@ -32,7 +35,7 @@ function formatUniversalUrl(appUrl: string, wcUri: string): LinkingRecord {
 /**
  * @internal
  */
-function formatNativeUrl(appUrl: string, wcUri: string): LinkingRecord {
+export function formatNativeUrl(appUrl: string, wcUri: string): LinkingRecord {
   if (isHttpUrl(appUrl)) {
     return formatUniversalUrl(appUrl, wcUri);
   }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.80.1-nightly-a7b6cb3211e8b5232e77965cb8dd8ff96b369424-20241228000338";
+export const version = "5.80.1-nightly-03bf859809de255d20f4ed8285a3bb75cef17252-20241229000354";

package/src/wallets/eip5792/get-calls-status.test.ts

@@ -92,7 +92,7 @@ describe.sequential("injected wallet", async () => {
       bundleId: "test",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       `[Error: Failed to get call status, no account found for wallet ${wallet.id}]`,
     );
   });
@@ -130,7 +130,7 @@ describe.sequential("injected wallet", async () => {
       bundleId: "test",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: io.metamask does not support wallet_getCallsStatus, reach out to them directly to request EIP-5792 support.]",
     );
   });
@@ -224,7 +224,7 @@ describe.sequential("in-app wallet", async () => {
       bundleId: "unknown",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Failed to get calls status, unknown bundle id]",
     );
   });
@@ -238,7 +238,7 @@ describe.sequential("in-app wallet", async () => {
       bundleId: "test",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Failed to get calls status, no active chain found]",
     );
   });

package/src/wallets/eip5792/send-calls.test.ts

@@ -85,22 +85,22 @@ describe.sequential("injected wallet", () => {
     vi.clearAllMocks();
   });
 
-  test("with no chain should fail to send calls", () => {
+  test("with no chain should fail to send calls", async () => {
     wallet.getChain = vi.fn().mockReturnValue(undefined);
     wallet.getAccount = vi.fn().mockReturnValue(TEST_ACCOUNT_A);
 
     const promise = sendCalls({ wallet, ...SEND_CALLS_OPTIONS });
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Cannot send calls, no active chain found for wallet: io.metamask]",
     );
   });
 
-  test("with no account should fail to send calls", () => {
+  test("with no account should fail to send calls", async () => {
     wallet.getChain = vi.fn().mockReturnValue(ANVIL_CHAIN);
     wallet.getAccount = vi.fn().mockReturnValue(undefined);
 
     const promise = sendCalls({ wallet, ...SEND_CALLS_OPTIONS });
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Cannot send calls, no account connected for wallet: io.metamask]",
     );
   });
@@ -227,7 +227,7 @@ describe.sequential("injected wallet", () => {
       ...SEND_CALLS_OPTIONS,
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: io.metamask does not support wallet_sendCalls, reach out to them directly to request EIP-5792 support.]",
     );
   });
@@ -252,7 +252,7 @@ describe.sequential("in-app wallet", () => {
   test("without account should fail", async () => {
     wallet.getAccount = vi.fn().mockReturnValue(undefined);
     const promise = sendCalls({ wallet, ...SEND_CALLS_OPTIONS });
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Cannot send calls, no account connected for wallet: inApp]",
     );
   });
@@ -260,7 +260,7 @@ describe.sequential("in-app wallet", () => {
   test("without account should fail", async () => {
     wallet.getAccount = vi.fn().mockReturnValue(undefined);
     const promise = sendCalls({ wallet, ...SEND_CALLS_OPTIONS });
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: Cannot send calls, no account connected for wallet: inApp]",
     );
   });

package/src/wallets/eip5792/show-calls-status.test.ts

@@ -41,7 +41,7 @@ describe.sequential("injected wallet", async () => {
       bundleId: "test",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: io.metamask does not support wallet_showCallsStatus, reach out to them directly to request EIP-5792 support.]",
     );
   });
@@ -56,7 +56,7 @@ describe.sequential("other wallets", async () => {
       bundleId: "test",
     });
 
-    expect(promise).rejects.toMatchInlineSnapshot(
+    await expect(promise).rejects.toMatchInlineSnapshot(
       "[Error: showCallsStatus is currently unsupported for this wallet type]",
     );
   });

package/dist/cjs/utils/bytecode/extractMnimalProxyImplementationAddress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractMnimalProxyImplementationAddress.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/extractMnimalProxyImplementationAddress.ts"],"names":[],"mappings":";;AAYA,4FA6CC;AAzDD;;;;;;;;;;;GAWG;AACH,SAAgB,wCAAwC,CACtD,QAAgB;IAEhB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,kDAAkD;QAClD,QAAQ,GAAG,KAAK,QAAQ,EAAE,CAAC;IAC7B,CAAC;IACD,yEAAyE;IACzE,IAAI,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAClD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,yKAAyK;IACzK,IAAI,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC9C,qBAAqB;QACrB,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;QAC5D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,0FAA0F;IAC1F,IAAI,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACpD,qBAAqB;QACrB,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,oHAAoH;IACpH,IAAI,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC,EAAE,CAAC;QAC5D,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,EAAE,CAAC;QACxD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,qFAAqF;IACrF,IAAI,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAChD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/esm/utils/bytecode/extractMnimalProxyImplementationAddress.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractMnimalProxyImplementationAddress.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/extractMnimalProxyImplementationAddress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,wCAAwC,CACtD,QAAgB;IAEhB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,kDAAkD;QAClD,QAAQ,GAAG,KAAK,QAAQ,EAAE,CAAC;IAC7B,CAAC;IACD,yEAAyE;IACzE,IAAI,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAClD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,yKAAyK;IACzK,IAAI,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC9C,qBAAqB;QACrB,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;QAC5D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,0FAA0F;IAC1F,IAAI,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;QACpD,qBAAqB;QACrB,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,oHAAoH;IACpH,IAAI,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC,EAAE,CAAC;QAC5D,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,EAAE,CAAC;QACxD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1D,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,qFAAqF;IACrF,IAAI,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAChD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,KAAK,qBAAqB,EAAE,CAAC;IACtC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/types/utils/bytecode/extractMnimalProxyImplementationAddress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extractMnimalProxyImplementationAddress.d.ts","sourceRoot":"","sources":["../../../../src/utils/bytecode/extractMnimalProxyImplementationAddress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,wCAAwC,CACtD,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CA2CpB"}