wip entrykit

.changeset/dirty-tools-hammer.md

@@ -0,0 +1,5 @@
+---
+"@latticexyz/store-sync": patch
+---
+
+Updated the `watchLogs` util to accept the updated RPC response type.

.eslintrc

@@ -19,5 +19,15 @@
         },
       },
     ],
+    // disable the base rule as it can report incorrect errors
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_",
+      },
+    ],
   },
 }

.gitignore

@@ -5,8 +5,10 @@ node_modules
 package-lock.json
 yarn.lock
 
-*.log
+# npm pack
+*.tgz
 
+*.log
 .eslintcache
 .parcel-cache
 .docs

package.json

@@ -39,7 +39,7 @@
     "package.json": "pnpm fix:package-json"
   },
   "devDependencies": {
-    "@ark/attest": "catalog:",
+    "@ark/attest": "0.12.1",
     "@changesets/cli": "^2.27.7",
     "@types/node": "^18.15.11",
     "@typescript-eslint/eslint-plugin": "7.1.1",
@@ -58,7 +58,7 @@
     "tsx": "4.19.0",
     "turbo": "^1.9.3",
     "typescript": "5.4.2",
-    "viem": "catalog:",
+    "viem": "2.21.19",
     "vitest": "2.1.2"
   },
   "packageManager": "[email protected]",

packages/block-logs-stream/package.json

@@ -35,14 +35,17 @@
   "dependencies": {
     "@latticexyz/common": "workspace:*",
     "debug": "^4.3.4",
-    "rxjs": "7.5.5",
-    "viem": "catalog:"
+    "rxjs": "7.5.5"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "tsup": "^6.7.0",
+    "viem": "2.21.19",
     "vitest": "0.34.6"
   },
+  "peerDependencies": {
+    "viem": "2.x"
+  },
   "publishConfig": {
     "access": "public"
   }

packages/cli/package.json

@@ -39,20 +39,22 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@ark/util": "catalog:",
+    "@ark/util": "0.2.2",
     "@aws-sdk/client-kms": "^3.556.0",
     "@latticexyz/abi-ts": "workspace:*",
     "@latticexyz/block-logs-stream": "workspace:*",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
     "@latticexyz/gas-report": "workspace:*",
+    "@latticexyz/paymaster": "workspace:*",
     "@latticexyz/protocol-parser": "workspace:*",
     "@latticexyz/schema-type": "workspace:*",
     "@latticexyz/store": "workspace:*",
     "@latticexyz/utils": "workspace:*",
+    "@latticexyz/wiresaw": "workspace:*",
     "@latticexyz/world": "workspace:*",
     "@latticexyz/world-module-metadata": "workspace:*",
-    "abitype": "catalog:",
+    "abitype": "1.0.6",
     "asn1.js": "^5.4.1",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
@@ -65,11 +67,12 @@
     "p-queue": "^7.4.1",
     "p-retry": "^5.1.2",
     "path": "^0.12.7",
+    "permissionless": "^0.2.3",
     "rxjs": "7.5.5",
     "throttle-debounce": "^5.0.0",
     "toposort": "^2.0.2",
     "typescript": "5.4.2",
-    "viem": "catalog:",
+    "viem": "2.21.19",
     "yargs": "^17.7.1",
     "zod": "3.23.8",
     "zod-validation-error": "^1.3.0"

packages/cli/src/commands/dev-contracts.ts

@@ -18,6 +18,7 @@ const devOptions = {
   alwaysRunPostDeploy: deployOptions.alwaysRunPostDeploy,
   forgeScriptOptions: deployOptions.forgeScriptOptions,
   worldAddress: deployOptions.worldAddress,
+  smartAccount: deployOptions.smartAccount,
 };
 
 const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof devOptions>> = {

packages/cli/src/commands/trace.ts

@@ -10,6 +10,7 @@ import { getChainId, readContract } from "viem/actions";
 import { World as WorldConfig } from "@latticexyz/world";
 import { resolveSystems } from "@latticexyz/world/node";
 import { worldAbi } from "../deploy/common";
+import { getAction } from "viem/utils";
 
 const systemsTableId = worldConfig.namespaces.world.tables.Systems.tableId;
 
@@ -63,15 +64,19 @@ const commandModule: CommandModule<Options, Options> = {
     const config = (await loadConfig(configPath)) as WorldConfig;
 
     const client = createClient({ transport: http(rpc) });
-    const chainId = await getChainId(client);
+    const chainId = await getAction(client, getChainId, "getChainId")({});
     const worldAddress = (args.worldAddress ?? getWorldAddress(config.deploy.worldsFile, chainId)) as Hex;
 
     const systems = await resolveSystems({ rootDir, config });
 
     const labels = await Promise.all(
       systems.map(async (system) => ({
         label: system.label,
-        address: await readContract(client, {
+        address: await getAction(
+          client,
+          readContract,
+          "readContract",
+        )({
           abi: worldAbi,
           address: worldAddress,
           functionName: "getField",

packages/cli/src/deploy/deployCustomWorld.ts

@@ -1,6 +1,6 @@
 import { Account, Chain, Client, Hex, Transport, concatHex, encodeDeployData, getCreate2Address, isHex } from "viem";
-import { waitForTransactionReceipt } from "viem/actions";
-import { resourceToHex, sendTransaction, writeContract } from "@latticexyz/common";
+import { waitForTransactionReceipt, writeContract, sendTransaction } from "viem/actions";
+import { resourceToHex } from "@latticexyz/common";
 import { debug } from "./debug";
 import { logsToWorldDeploy } from "./logsToWorldDeploy";
 import { WorldDeploy, salt, worldAbi } from "./common";
@@ -9,6 +9,7 @@ import { ensureContractsDeployed } from "./ensureContractsDeployed";
 import { ContractArtifact, ReferenceIdentifier } from "@latticexyz/world/node";
 import { World } from "@latticexyz/world";
 import { waitForTransactions } from "./waitForTransactions";
+import { getAction } from "viem/utils";
 
 function findArtifact(ref: ReferenceIdentifier, artifacts: readonly ContractArtifact[]): ContractArtifact {
   const artifact = artifacts.find((a) => a.sourcePath === ref.sourcePath && a.name === ref.name);
@@ -78,17 +79,23 @@ export async function deployCustomWorld({
 
   // Deploy custom world without deterministic deployer for now
   debug("deploying custom world");
-  const deployTx = await sendTransaction(client, {
+  const deployTx = await getAction(
+    client,
+    sendTransaction,
+    "sendTransaction",
+  )({
     chain: client.chain ?? null,
+    account: client.account,
     data: encodeDeployData({
       abi: worldArtifact.abi,
       args: [], // TODO (https://github.com/latticexyz/mud/issues/3150)
       bytecode: getDeployable(deployerAddress, worldArtifact, artifacts),
     }),
+    gas: 10_000_000n,
   });
 
-  debug("waiting for custom world deploy");
-  const receipt = await waitForTransactionReceipt(client, { hash: deployTx });
+  debug("waiting for custom world deploy at tx", deployTx);
+  const receipt = await getAction(client, waitForTransactionReceipt, "waitForTransactionReceipt")({ hash: deployTx });
   if (receipt.status !== "success") {
     console.error("world deploy failed", receipt);
     throw new Error("world deploy failed");
@@ -98,8 +105,13 @@ export async function deployCustomWorld({
   debug("deployed custom world to", deploy.address, "at block", deploy.deployBlock);
 
   // initialize world via init module
-  const initTx = await writeContract(client, {
+  const initTx = await getAction(
+    client,
+    writeContract,
+    "writeContract",
+  )({
     chain: client.chain ?? null,
+    account: client.account,
     address: deploy.address,
     abi: worldAbi,
     functionName: "initialize",
@@ -108,8 +120,13 @@ export async function deployCustomWorld({
   await waitForTransactions({ client, hashes: [initTx], debugLabel: "world init" });
 
   // transfer root namespace to deployer after init module is installed so `transferOwnership` method is available
-  const transferOwnershipTx = await writeContract(client, {
+  const transferOwnershipTx = await getAction(
+    client,
+    writeContract,
+    "writeContract",
+  )({
     chain: client.chain ?? null,
+    account: client.account,
     address: deploy.address,
     abi: worldAbi,
     functionName: "transferOwnership",

packages/cli/src/deploy/deployWorld.ts

@@ -1,11 +1,12 @@
-import { Account, Chain, Client, Hex, Transport } from "viem";
-import { waitForTransactionReceipt } from "viem/actions";
+import { Account, Chain, Client, Hex, Transport, parseEventLogs } from "viem";
+import { waitForTransactionReceipt, writeContract } from "viem/actions";
 import { ensureWorldFactory } from "./ensureWorldFactory";
 import WorldFactoryAbi from "@latticexyz/world/out/WorldFactory.sol/WorldFactory.abi.json" assert { type: "json" };
-import { writeContract } from "@latticexyz/common";
 import { debug } from "./debug";
 import { logsToWorldDeploy } from "./logsToWorldDeploy";
 import { WorldDeploy } from "./common";
+import { getAction } from "viem/utils";
+import { entryPoint07Abi } from "viem/account-abstraction";
 
 export async function deployWorld(
   client: Client<Transport, Chain | undefined, Account>,
@@ -16,19 +17,35 @@ export async function deployWorld(
   const worldFactory = await ensureWorldFactory(client, deployerAddress, withWorldProxy);
 
   debug("deploying world");
-  const tx = await writeContract(client, {
+  const tx = await getAction(
+    client,
+    writeContract,
+    "writeContract",
+  )({
     chain: client.chain ?? null,
+    account: client.account,
     address: worldFactory,
     abi: WorldFactoryAbi,
     functionName: "deployWorld",
     args: [salt],
   });
 
-  debug("waiting for world deploy");
-  const receipt = await waitForTransactionReceipt(client, { hash: tx });
+  debug("waiting for world deploy at tx", tx);
+  const receipt = await getAction(client, waitForTransactionReceipt, "waitForTransactionReceipt")({ hash: tx });
   if (receipt.status !== "success") {
     console.error("world deploy failed", receipt);
     throw new Error("world deploy failed");
+  } else if (client.account.type === "smart") {
+    // TODO: lift this out into something better that doesn't assume one tx
+    const parsedLogs = parseEventLogs({
+      logs: receipt.logs,
+      abi: entryPoint07Abi,
+      eventName: "UserOperationEvent" as const,
+    });
+    if (!parsedLogs[0].args.success) {
+      console.error("world deploy failed");
+      throw new Error("world deploy failed");
+    }
   }
 
   const deploy = logsToWorldDeploy(receipt.logs);

packages/cli/src/deploy/ensureContract.ts

@@ -1,9 +1,9 @@
 import { Client, Transport, Chain, Account, concatHex, getCreate2Address, Hex } from "viem";
-import { getBytecode } from "viem/actions";
+import { getCode, sendTransaction } from "viem/actions";
 import { contractSizeLimit, salt } from "./common";
-import { sendTransaction } from "@latticexyz/common";
 import { debug } from "./debug";
 import pRetry from "p-retry";
+import { getAction } from "viem/utils";
 
 export type Contract = {
   bytecode: Hex;
@@ -27,7 +27,7 @@ export async function ensureContract({
 
   const address = getCreate2Address({ from: deployerAddress, salt, bytecode });
 
-  const contractCode = await getBytecode(client, { address, blockTag: "pending" });
+  const contractCode = await getAction(client, getCode, "getCode")({ address, blockTag: "pending" });
   if (contractCode) {
     debug("found", debugLabel, "at", address);
     return [];
@@ -50,8 +50,13 @@ export async function ensureContract({
   return [
     await pRetry(
       () =>
-        sendTransaction(client, {
+        getAction(
+          client,
+          sendTransaction,
+          "sendTransaction",
+        )({
           chain: client.chain ?? null,
+          account: client.account,
           to: deployerAddress,
           data: concatHex([salt, bytecode]),
         }),