tenetxyz · dhvanipa · Feb 25, 2024 · Feb 25, 2024 · Feb 25, 2024 · Feb 26, 2024
@@ -4,7 +4,6 @@
   "private": true,
   "description": "mud.dev docs",
   "license": "",
-  "type": "module",
   "main": "index.js",
   "scripts": {
     "build": "next build",

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "build": "vite build",
     "clean": "rimraf dist",

@@ -23,10 +23,10 @@
     "@latticexyz/world-modules": "link:../../../packages/world-modules",
     "@viem/anvil": "^0.0.6",
     "abitype": "1.0.0",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "dotenv": "^16.0.3",
     "drizzle-orm": "^0.28.5",
-    "execa": "^7.1.1",
+    "execa": "^5.1.1",
     "happy-dom": "^12.10.3",
     "postgres": "3.3.5",
     "typescript": "5.4.2",

@@ -1,5 +1,5 @@
 import chalk from "chalk";
-import { execa } from "execa";
+import execa from "execa";
 
 export function deployContracts(rpc: string) {
   const deploymentProcess = execa("pnpm", ["mud", "deploy", "--rpc", rpc], {

@@ -1,5 +1,5 @@
 import chalk from "chalk";
-import { execa } from "execa";
+import execa from "execa";
 import { rmSync } from "node:fs";
 import { cleanDatabase } from "@latticexyz/store-sync/postgres";
 import { drizzle } from "drizzle-orm/postgres-js";

@@ -1,4 +1,4 @@
-import { execa } from "execa";
+import execa from "execa";
 import {
   ClientConfig,
   GetContractReturnType,

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "drip": "tsx index.ts"
   },

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "read-indexer": "tsx index.ts"
   },

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "build": "vite build",
     "dev": "vite",

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "build": "vite build",
     "dev": "wait-port localhost:8545 && vite",

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "build": "vite build",
     "dev": "wait-port localhost:8545 && vite",

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
-  "type": "module",
   "scripts": {
     "build": "vite build",
     "dev": "wait-port localhost:8545 && vite",

@@ -44,9 +44,9 @@
     "@typescript-eslint/eslint-plugin": "7.1.1",
     "@typescript-eslint/parser": "7.1.1",
     "bun": "^1.0.11",
-    "chalk": "^5.2.0",
+    "chalk": "4.1.2",
     "eslint": "8.57.0",
-    "execa": "^7.0.0",
+    "execa": "^5.1.1",
     "glob": "^8.0.3",
     "husky": ">=6",
     "lint-staged": ">=10",

@@ -8,7 +8,6 @@
     "directory": "packages/abi-ts"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": "./dist/index.js"
   },
@@ -31,9 +30,9 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "chalk": "^5.3.0",
+    "chalk": "4.1.2",
     "debug": "^4.3.4",
-    "execa": "^7.0.0",
+    "execa": "^5.1.1",
     "glob": "^8.0.3",
     "yargs": "^17.7.1"
   },

@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts", "src/abi-ts.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: !process.env.TSUP_SKIP_DTS,
   sourcemap: true,
   clean: true,

@@ -8,7 +8,6 @@
     "directory": "packages/block-logs-stream"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": "./dist/index.js"
   },

@@ -3,7 +3,7 @@ import { defineConfig } from "tsup";
 export default defineConfig({
   entry: ["src/index.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: !process.env.TSUP_SKIP_DTS,
   sourcemap: true,
   clean: true,

@@ -8,7 +8,6 @@
     "directory": "packages/cli"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": "./dist/index.js"
   },
@@ -47,18 +46,18 @@
     "@latticexyz/world": "workspace:*",
     "@latticexyz/world-modules": "workspace:*",
     "asn1.js": "^5.4.1",
-    "chalk": "^5.0.1",
+    "chalk": "4.1.2",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "ethers": "^5.7.2",
-    "execa": "^7.0.0",
+    "execa": "^5.1.1",
     "glob": "^8.0.3",
     "nice-grpc-web": "^2.0.1",
     "openurl": "^1.1.1",
-    "p-queue": "^7.4.1",
-    "p-retry": "^5.1.2",
+    "p-queue": "6.6.2",
+    "p-retry": "4.6.2",
     "path": "^0.12.7",
     "rxjs": "7.5.5",
     "throttle-debounce": "^5.0.0",

@@ -92,7 +92,9 @@ const config = defineStore({
   },
 });
 
-const srcDirectory = await getSrcDirectory();
-const remappings = await getRemappings();
+(async () => {
+  const srcDirectory = await getSrcDirectory();
+  const remappings = await getRemappings();
 
-await tablegen(config, path.join(srcDirectory, config.codegen.outputDirectory), remappings);
+  await tablegen(config, path.join(srcDirectory, config.codegen.outputDirectory), remappings);
+})();
@@ -5,7 +5,7 @@ import { World as WorldConfig } from "@latticexyz/world";
 import { worldToV1 } from "@latticexyz/world/config/v2";
 import { forge, getRemappings } from "@latticexyz/common/foundry";
 import { getExistingContracts } from "./utils/getExistingContracts";
-import { execa } from "execa";
+import execa from "execa";
 
 type BuildOptions = {
   foundryProfile?: string;

@@ -47,7 +47,7 @@ const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof
       const userHomeDir = homedir();
       rmSync(path.join(userHomeDir, ".foundry", "anvil", "tmp"), { recursive: true, force: true });
 
-      const anvilArgs = ["--block-time", "1", "--block-base-fee-per-gas", "0"];
+      const anvilArgs = ["--block-time", "2", "--block-base-fee-per-gas", "0", "--gas-limit", "100000000"];
       anvil(anvilArgs);
       rpc = "http://127.0.0.1:8545";
     }

@@ -2,7 +2,7 @@ import { rmSync } from "fs";
 import { homedir } from "os";
 import path from "path";
 import type { CommandModule } from "yargs";
-import { execa } from "execa";
+import execa from "execa";
 
 type Options = {
   blocktime: number;

@@ -27,4 +27,4 @@ export async function ensureWorldFactory(
     contracts: Object.values(contracts),
   });
   return contracts.WorldFactory.address;
-}
+}
@@ -2,6 +2,7 @@ import accessManagementSystemBuild from "@latticexyz/world/out/AccessManagementS
 import balanceTransferSystemBuild from "@latticexyz/world/out/BalanceTransferSystem.sol/BalanceTransferSystem.json" assert { type: "json" };
 import batchCallSystemBuild from "@latticexyz/world/out/BatchCallSystem.sol/BatchCallSystem.json" assert { type: "json" };
 import registrationSystemBuild from "@latticexyz/world/out/RegistrationSystem.sol/RegistrationSystem.json" assert { type: "json" };
+import extendedRegistrationSystemBuild from "@latticexyz/world/out/ExtendedRegistrationSystem.sol/ExtendedRegistrationSystem.json" assert { type: "json" };
 import initModuleBuild from "@latticexyz/world/out/InitModule.sol/InitModule.json" assert { type: "json" };
 import initModuleAbi from "@latticexyz/world/out/InitModule.sol/InitModule.abi.json" assert { type: "json" };
 import { Hex, getCreate2Address, encodeDeployData, size } from "viem";
@@ -35,12 +36,19 @@ export function getWorldContracts(deployerAddress: Hex) {
     bytecode: registrationBytecode,
     salt,
   });
+  const extendedRegistrationDeployedBytecodeSize = size(extendedRegistrationSystemBuild.deployedBytecode.object as Hex);
+  const extendedRegistrationBytecode = extendedRegistrationSystemBuild.bytecode.object as Hex;
+  const extendedRegistration = getCreate2Address({
+    from: deployerAddress,
+    bytecode: extendedRegistrationBytecode,
+    salt,
+  });
 
   const initModuleDeployedBytecodeSize = size(initModuleBuild.deployedBytecode.object as Hex);
   const initModuleBytecode = encodeDeployData({
     bytecode: initModuleBuild.bytecode.object as Hex,
     abi: initModuleAbi,
-    args: [accessManagementSystem, balanceTransferSystem, batchCallSystem, registration],
+    args: [accessManagementSystem, balanceTransferSystem, batchCallSystem, registration, extendedRegistration],
   });
   const initModule = getCreate2Address({ from: deployerAddress, bytecode: initModuleBytecode, salt });
 
@@ -69,6 +77,12 @@ export function getWorldContracts(deployerAddress: Hex) {
       label: "core registration system",
       address: registration,
     },
+    ExteendedRegistrationSystem: {
+      bytecode: extendedRegistrationBytecode,
+      deployedBytecodeSize: extendedRegistrationDeployedBytecodeSize,
+      label: "extended core registration system",
+      address: extendedRegistration,
+    },
     InitModule: {
       bytecode: initModuleBytecode,
       deployedBytecodeSize: initModuleDeployedBytecodeSize,

@@ -1,5 +1,6 @@
 import KeysWithValueModuleData from "@latticexyz/world-modules/out/KeysWithValueModule.sol/KeysWithValueModule.json" assert { type: "json" };
 import KeysInTableModuleData from "@latticexyz/world-modules/out/KeysInTableModule.sol/KeysInTableModule.json" assert { type: "json" };
+import HasKeysModuleData from "@latticexyz/world-modules/out/HasKeysModule.sol/HasKeysModule.json" assert { type: "json" };
 import UniqueEntityModuleData from "@latticexyz/world-modules/out/UniqueEntityModule.sol/UniqueEntityModule.json" assert { type: "json" };
 // eslint-disable-next-line max-len
 import Unstable_CallWithSignatureModuleData from "@latticexyz/world-modules/out/Unstable_CallWithSignatureModule.sol/Unstable_CallWithSignatureModule.json" assert { type: "json" };
@@ -22,6 +23,13 @@ export const defaultModuleContracts = [
     placeholders: findPlaceholders(KeysInTableModuleData.bytecode.linkReferences),
     deployedBytecodeSize: size(KeysInTableModuleData.deployedBytecode.object as Hex),
   },
+  {
+    name: "HasKeysModule",
+    abi: HasKeysModuleData.abi as Abi,
+    bytecode: HasKeysModuleData.bytecode.object as Hex,
+    placeholders: findPlaceholders(HasKeysModuleData.bytecode.linkReferences),
+    deployedBytecodeSize: size(HasKeysModuleData.deployedBytecode.object as Hex),
+  },
   {
     name: "UniqueEntityModule",
     abi: UniqueEntityModuleData.abi as Abi,

@@ -20,7 +20,7 @@ const mudPackages: MudPackages = Object.fromEntries(
 export default defineConfig({
   entry: ["src/index.ts", "src/mud.ts"],
   target: "esnext",
-  format: ["esm"],
+  format: ["esm", "cjs"],
   dts: !process.env.TSUP_SKIP_DTS,
   sourcemap: true,
   clean: true,

@@ -8,7 +8,6 @@
     "directory": "packages/common"
   },
   "license": "MIT",
-  "type": "module",
   "exports": {
     ".": "./dist/index.js",
     "./actions": "./dist/actions.js",
@@ -64,9 +63,9 @@
     "@latticexyz/schema-type": "workspace:*",
     "@solidity-parser/parser": "^0.16.0",
     "debug": "^4.3.4",
-    "execa": "^7.0.0",
-    "p-queue": "^7.4.1",
-    "p-retry": "^5.1.2",
+    "execa": "^5.1.1",
+    "p-queue": "6.6.2",
+    "p-retry": "4.6.2",
     "prettier": "3.2.5",
     "prettier-plugin-solidity": "1.3.1",
     "viem": "2.9.20"

@@ -71,10 +71,13 @@ export function createNonceManager({
     debug("reset nonce to", nonceRef.current);
   }
 
-  function shouldResetNonce(error: unknown): boolean {
+  function shouldResetNonce(error: any): boolean {
     return (
-      error instanceof BaseError &&
-      error.walk((e) => e instanceof NonceTooLowError || e instanceof NonceTooHighError) != null
+      (error instanceof BaseError &&
+        error.walk((e) => e instanceof NonceTooLowError || e instanceof NonceTooHighError) != null) ||
+      error.name === "NonceTooLowError" ||
+      error.name === "NonceTooHighError" ||
+      (error.name === "TransactionExecutionError" && error.message && error.message.includes("nonce"))
     );
   }
 

@@ -1,4 +1,4 @@
-import { execa, Options } from "execa";
+import execa, { Options } from "execa";
 
 export interface ForgeConfig {
   // project
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ export async function ensureWorldFactory( @@
         contracts: Object.values(contracts),
       });
       return contracts.WorldFactory.address;
-    }
+    }