Merge branch 'main' into feat/wc-uri-connection

Author: joaquim-verges

.changeset/rich-steaks-guess.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Handle zk sync direct deploys in `deployContract`

apps/dashboard/src/@/components/ui/tabs.tsx

@@ -159,12 +159,6 @@ function useUnderline<El extends HTMLElement>() {
         setTimeout(() => {
           lineEl.style.transition = "transform 0.3s, width 0.3s";
         }, 0);
-
-        activeTabEl.scrollIntoView({
-          behavior: "smooth",
-          block: "nearest",
-          inline: "center",
-        });
       } else if (lineRef.current) {
         lineRef.current.style.width = "0px";
       }

packages/thirdweb/scripts/generate/abis/modules/BatchMetadataERC1155.json

@@ -1,6 +1,10 @@
 [
   "function encodeBytesOnInstall() pure returns (bytes)",
   "function getAllMetadataBatches() view returns ((uint256 startTokenIdInclusive, uint256 endTokenIdInclusive, string baseURI)[])",
+  "function getBatchIndex(uint256 _tokenId) view returns (uint256)",
+  "function getMetadataBatch(uint256 _batchIndex) view returns ((uint256 startTokenIdInclusive, uint256 endTokenIdInclusive, string baseURI))",
+  "function getModuleConfig() pure returns ((bool registerInstallationCallback, bytes4[] requiredInterfaces, bytes4[] supportedInterfaces, (bytes4 selector)[] callbackFunctions, (bytes4 selector, uint256 permissionBits)[] fallbackFunctions) config)",
+  "function setBaseURI(uint256 _batchIndex, string _baseURI)",
   "function uploadMetadata(uint256 _amount, string _baseURI)",
-  "event BatchMetadataUpdate(uint256 _fromTokenId, uint256 _toTokenId)"
+  "event BatchMetadataUpdate(uint256 startTokenIdIncluside, uint256 endTokenIdInclusive, string baseURI)"
 ]

packages/thirdweb/scripts/generate/abis/modules/BatchMetadataERC721.json

@@ -1,6 +1,10 @@
 [
   "function encodeBytesOnInstall() pure returns (bytes)",
   "function getAllMetadataBatches() view returns ((uint256 startTokenIdInclusive, uint256 endTokenIdInclusive, string baseURI)[])",
+  "function getBatchIndex(uint256 _tokenId) view returns (uint256)",
+  "function getMetadataBatch(uint256 _batchIndex) view returns ((uint256 startTokenIdInclusive, uint256 endTokenIdInclusive, string baseURI))",
+  "function getModuleConfig() pure returns ((bool registerInstallationCallback, bytes4[] requiredInterfaces, bytes4[] supportedInterfaces, (bytes4 selector)[] callbackFunctions, (bytes4 selector, uint256 permissionBits)[] fallbackFunctions) config)",
+  "function setBaseURI(uint256 _batchIndex, string _baseURI)",
   "function uploadMetadata(uint256 _amount, string _baseURI)",
-  "event BatchMetadataUpdate(uint256 _fromTokenId, uint256 _toTokenId)"
+  "event BatchMetadataUpdate(uint256 startTokenIdIncluside, uint256 endTokenIdInclusive, string baseURI)"
 ]

packages/thirdweb/scripts/generate/abis/modules/SequentialTokenIdERC1155.json

@@ -1,6 +1,6 @@
 [
-  "function encodeBytesOnInstall() pure returns (bytes)",
+  "function encodeBytesOnInstall(uint256 startTokenId) pure returns (bytes)",
+  "function getModuleConfig() pure returns ((bool registerInstallationCallback, bytes4[] requiredInterfaces, bytes4[] supportedInterfaces, (bytes4 selector)[] callbackFunctions, (bytes4 selector, uint256 permissionBits)[] fallbackFunctions) config)",
   "function getNextTokenId() view returns (uint256)",
-  "error SequentialTokenIdInvalidTokenId()",
-  "error UpdateTokenIdCallbackERC1155NotImplemented()"
+  "function updateTokenIdERC1155(uint256 _tokenId) payable returns (uint256)"
 ]

packages/thirdweb/src/contract/deployment/deploy-with-abi.ts

@@ -5,6 +5,7 @@ import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
 import { computeDeploymentAddress } from "../../utils/any-evm/compute-deployment-address.js";
 import { computeDeploymentInfoFromBytecode } from "../../utils/any-evm/compute-published-contract-deploy-info.js";
+import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
 import { ensureBytecodePrefix } from "../../utils/bytecode/prefix.js";
 import { concatHex } from "../../utils/encoding/helpers/concat-hex.js";
@@ -13,6 +14,7 @@ import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChain } from "../../utils/types.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { getContract } from "../contract.js";
+import { zkDeployContract } from "./zksync/zkDeployContract.js";
 
 /**
  * @extension DEPLOY
@@ -121,6 +123,18 @@ export async function deployContract(
     salt?: string;
   },
 ) {
+  if (await isZkSyncChain(options.chain)) {
+    return zkDeployContract({
+      account: options.account,
+      client: options.client,
+      chain: options.chain,
+      bytecode: options.bytecode,
+      abi: options.abi,
+      params: options.constructorParams,
+      salt: options.salt,
+    });
+  }
+
   if (options.salt !== undefined) {
     // Deploy with CREATE2 if salt is provided
     const info = await computeDeploymentInfoFromBytecode(options);

packages/thirdweb/src/extensions/ens/resolve-avatar.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from "vitest";
-
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { resolveAvatar } from "./resolve-avatar.js";
 
@@ -22,9 +21,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-avatar", () => {
       client: TEST_CLIENT,
       name: "vitalik.eth",
     });
-    expect(avatarUri?.split("/ipfs/")[1]).toMatchInlineSnapshot(
-      `"QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif"`,
-    );
+    expect(avatarUri).toMatchInlineSnapshot(`"https://euc.li/vitalik.eth"`);
   });
 
   it("resolves name without avatar record to null", async () => {

packages/thirdweb/src/extensions/modules/MintableERC1155/mintableERC1155.test.ts

@@ -40,7 +40,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("ModularTokenERC1155", () => {
           primarySaleRecipient: TEST_ACCOUNT_A.address,
         }),
         BatchMetadataERC1155.module(),
-        SequentialTokenIdERC1155.module(),
+        SequentialTokenIdERC1155.module({
+          startTokenId: 0n,
+        }),
       ],
     });
     contract = getContract({