fix: handle short storage values in beacon proxy pattern

Author: catalyst17

packages/thirdweb/src/utils/bytecode/handleBeaconProxyPattern.test.ts

@@ -0,0 +1,69 @@
+import type { Abi } from "abitype";
+import type { EIP1193RequestFn, EIP1474Methods } from "viem";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  DUMMY_BYTECODE,
+  ERC1967_PROXY_BYTECODE,
+  ERC1967_PROXY_CONSTRUCTOR_ABI,
+} from "../../../test/src/abis/proxy.js";
+import { ANVIL_CHAIN } from "../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import {
+  BASE_USDC_IMPLEMENTATION,
+  BASE_USDC_PROXY_CONTRACT,
+  NFT_DROP_CONTRACT,
+  NFT_DROP_IMPLEMENTATION,
+  POLYGON_USDT_IMPLEMENTATION,
+  POLYGON_USDT_PROXY_CONTRACT,
+} from "../../../test/src/test-contracts.js";
+import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
+import { getBytecode } from "../../contract/actions/get-bytecode.js";
+import { getContract } from "../../contract/contract.js";
+import { deployContract } from "../../contract/deployment/deploy-with-abi.js";
+import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
+import { getRpcClient } from "../../rpc/rpc.js";
+import { resolveImplementation } from "./resolveImplementation.js";
+
+// Mock dependencies
+vi.mock("../../contract/actions/get-bytecode.js");
+vi.mock("../../rpc/rpc.js");
+vi.mock("../../rpc/actions/eth_getStorageAt.js");
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "Handle beacon proxy pattern",
+  async () => {
+    beforeEach(() => {
+      vi.resetAllMocks();
+    });
+    it("should handle beacon proxy pattern with short storage values", async () => {
+      // This test verifies that the implementation can handle short storage values
+      // which was the original issue we were trying to fix
+      const mockContract = {
+        address: "0x0000000000000000000000000000000000000001",
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+      } as const;
+
+      // Mock getBytecode to return a minimal proxy bytecode that will trigger the beacon check
+      const mockGetBytecode = vi
+        .fn()
+        .mockResolvedValueOnce("") // First call for proxy (empty bytecode triggers beacon check)
+        .mockResolvedValueOnce("0x1234"); // Second call for implementation
+
+      vi.mocked(getBytecode).mockImplementation(mockGetBytecode);
+
+      // Mock eth_getStorageAt to return a short value
+      const mockRpcRequest = { request: vi.fn() };
+      vi.mocked(getRpcClient).mockReturnValue(
+        mockRpcRequest as unknown as EIP1193RequestFn<EIP1474Methods>,
+      );
+      vi.mocked(eth_getStorageAt).mockResolvedValue("0x1234"); // Short storage value
+
+      const result = await resolveImplementation(mockContract);
+
+      // Should not throw and should return some result (even if it's the original address)
+      expect(result).toBeDefined();
+      expect(result.address).toBeDefined();
+    });
+  },
+);

packages/thirdweb/src/utils/bytecode/resolveImplementation.ts

@@ -49,7 +49,7 @@ export async function resolveImplementation(
   // check other proxy types
   let implementationAddress: string | undefined;
 
-  if (beacon && beacon !== AddressZero) {
+  if (beacon && isAddress(beacon) && beacon !== AddressZero) {
     // In case of a BeaconProxy, it is setup as BeaconProxy --> Beacon --> Implementation
     // Hence we replace the proxy address with Beacon address, and continue further resolving below
     // biome-ignore lint/style/noParameterAssign: we purposefully mutate the contract object here