Merge remote-tracking branch 'origin/main' into entrykit

Author: frolic

.changeset/dirty-buttons-tickle.md

@@ -0,0 +1,5 @@
+---
+"@latticexyz/entrykit": patch
+---
+
+Initial, experimental release of EntryKit.

.changeset/seven-ducks-complain.md

@@ -0,0 +1,9 @@
+---
+"@latticexyz/cli": patch
+---
+
+In addition to a hex `--salt`, deploy commands now accept a string salt for world deployment, which will get converted to a hex.
+
+```
+pnpm mud deploy --salt hello
+```

packages/entrykit/bin/deploy-local-prereqs.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+// workaround for https://github.com/pnpm/pnpm/issues/1801
+import "../dist/tsup/bin/deploy-local-prereqs.js";

packages/entrykit/mprocs.deploy.yaml

@@ -2,19 +2,32 @@ scrollback: 10000
 procs:
   anvil:
     shell: anvil --dump-state playground/anvil-state.json
-  deploy-factory:
+
+  deploy-csw-factory:
     cwd: ../../../coinbase-smart-wallet
     shell: make deploy-local
-  deploy-bundler:
-    cwd: ../../../alto
-    shell: pnpm ts-node scripts/localDeployer/index.ts
-  deploy-paymaster:
-    cwd: ../../../quarry-paymaster/packages/contracts
-    # TODO: pick or mine a nice salt for paymaster
-    shell: pnpm mud deploy --salt 0x && pnpm fund:paymaster:local && pnpm fund:issuer:local
+
+  deploy-prereqs:
+    shell: ./bin/deploy-local-prereqs.js
+    env:
+      DEBUG: "mud:*"
+      # Anvil default account (0x70997970C51812dc3A010C7d01b50e0d17dc79C8)
+      PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
+
+  # deploy-quarry-paymaster:
+  #   cwd: ../../../quarry-paymaster/packages/contracts
+  #   shell: pnpm mud deploy --salt 0x && pnpm fund:paymaster:local && pnpm fund:issuer:local
+  #   env:
+  #     DEBUG: "mud:*"
+
   deploy-game:
     cwd: ../../test/mock-game-contracts
     shell: pnpm deploy:local --salt 0x
     env:
+      DEBUG: "mud:*"
       # Anvil default account (0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc)
       PRIVATE_KEY: "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba"
+
+  # deploy-bundler:
+  #   cwd: ../../../alto
+  #   shell: pnpm ts-node scripts/localDeployer/index.ts

packages/entrykit/mprocs.yaml

@@ -4,19 +4,15 @@ procs:
     shell: pnpm vite dev playground
   anvil:
     shell: anvil --block-time 2 --load-state playground/anvil-state.json
+
   # mud:
   #   cwd: ../..
   #   shell: pnpm run dev --filter=!@latticexyz/entrykit
-  bundler:
-    cwd: ../../../alto
-    shell: pnpm ts-node src --config ../mud/packages/entrykit/playground/alto.config.json
-  issuer:
-    cwd: ../../../quarry-paymaster/packages/issuer
-    shell: pnpm start
-  # explorer:
-  #   shell: pnpm explorer
-  id:
-    cwd: ../id
-    shell: pnpm vite --port 5155
-  tunnel:
-    shell: cloudflared tunnel run
+
+  # quarry-issuer:
+  #   cwd: ../../../quarry-paymaster/packages/issuer
+  #   shell: pnpm start
+
+  # bundler:
+  #   cwd: ../../../alto
+  #   shell: pnpm ts-node src --config ../mud/packages/entrykit/playground/alto.config.json

packages/entrykit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/entrykit",
-  "version": "0.0.0",
+  "version": "2.2.14",
   "description": "User onboarding flows for MUD apps",
   "repository": {
     "type": "git",
@@ -10,19 +10,22 @@
   "license": "MIT",
   "type": "module",
   "exports": {
-    ".": "./dist/tsup/index.js",
-    "./internal": "./dist/tsup/internal.js"
+    ".": "./dist/tsup/exports/index.js",
+    "./internal": "./dist/tsup/exports/internal.js"
   },
   "typesVersions": {
     "*": {
       "index": [
-        "./dist/tsup/index.d.ts"
+        "./dist/tsup/exports/index.d.ts"
       ],
       "internal": [
-        "./dist/tsup/internal.d.ts"
+        "./dist/tsup/exports/internal.d.ts"
       ]
     }
   },
+  "bin": {
+    "deploy-local-prereqs": "./bin/deploy-local-prereqs.js"
+  },
   "files": [
     "dist"
   ],
@@ -31,19 +34,18 @@
     "build:js": "tsup",
     "clean": "pnpm run clean:js",
     "clean:js": "shx rm -rf dist",
+    "data:relay-chains": "tsx src/scripts/get-relay-chains.ts",
     "dev": "tsup --watch",
     "playground": "mprocs",
     "playground:deploy": "mprocs --config mprocs.deploy.yaml",
-    "snapshot:push": "gh workflow run snapshot.yml --ref entrykit",
-    "snapshot:status": "gh run list --workflow snapshot.yml --limit 5",
     "test": "tsc --noEmit && vitest",
     "test:ci": "tsc --noEmit && vitest --run"
   },
   "dependencies": {
+    "@account-abstraction/contracts": "^0.7.0",
     "@ark/util": "0.2.2",
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
-    "@latticexyz/explorer": "workspace:*",
     "@latticexyz/id": "workspace:*",
     "@latticexyz/paymaster": "workspace:*",
     "@latticexyz/protocol-parser": "workspace:*",
@@ -55,6 +57,7 @@
     "@radix-ui/react-dialog": "^1.0.5",
     "@rainbow-me/rainbowkit": "2.1.7",
     "debug": "^4.3.4",
+    "dotenv": "^16.0.3",
     "permissionless": "^0.2.3",
     "react-error-boundary": "^4.0.13",
     "react-merge-refs": "^2.1.1",

packages/entrykit/playground/anvil-state.json

@@ -2,7 +2,8 @@ import { Hex } from "viem";
 import { anvil } from "viem/chains";
 
 const testWorlds = {
-  [anvil.id]: "0x6Eb9682FE93c6fE4346e0a1e70bC049Aa18CC0CA",
+  // TODO: get this from somewhere else, like playground deploy output
+  [anvil.id]: "0x60e7e3caed67b9d2cca14519b6cd7700a7d4ee66",
 } as Partial<Record<string, Hex>>;
 
 const searchParams = new URLSearchParams(window.location.search);

packages/entrykit/playground/common.ts

@@ -8,18 +8,20 @@ const chains = [
     ...anvil,
     rpcUrls: {
       ...anvil.rpcUrls,
-      bundler: {
-        http: ["http://127.0.0.1:4337"],
-      },
+      // bundler: {
+      //   http: ["http://127.0.0.1:4337"],
+      // },
       // TODO: automatically grant allowance in anvil instead of requiring the service
-      quarryPassIssuer: {
-        http: ["http://127.0.0.1:3003/rpc"],
-      },
+      // quarryPassIssuer: {
+      //   http: ["http://127.0.0.1:3003/rpc"],
+      // },
     },
     contracts: {
-      // TODO: make optional in entrykit?
-      quarryPaymaster: {
-        address: "0x8D8b6b8414E1e3DcfD4168561b9be6bD3bF6eC4B",
+      // quarryPaymaster: {
+      //   address: "0x8D8b6b8414E1e3DcfD4168561b9be6bD3bF6eC4B",
+      // },
+      paymaster: {
+        address: "0xf03E61E7421c43D9068Ca562882E98d1be0a6b6e",
       },
     },
   },

packages/entrykit/playground/wagmiConfig.ts

@@ -25,7 +25,8 @@ export function AccountModalErrorBoundary({ children }: Props) {
             <button
               type="button"
               onClick={async (event) => {
-                // fake pending state while we retry so that if the same error occurs,
+                // if we retry and the same error occurs, it'll look like the button click did nothing
+                // so we'll fake a pending state here to give users an indication something is happening
                 event.currentTarget.ariaBusy = "true";
                 await wait(1000);
                 resetErrorBoundary();