@latticexyz/cli 1.30.1 → 1.31.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Lattice Labs Ltd.
+Copyright (c) 2022-present Lattice Labs Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/commands/devnode.js

@@ -181304,7 +181304,14 @@ var handler = (argv) => __async(void 0, null, function* () {
   console.log("Clearing devnode history");
   const userHomeDir = (0, import_os3.homedir)();
   (0, import_fs.rmSync)(import_path2.default.join(userHomeDir, ".foundry", "anvil", "tmp"), { recursive: true, force: true });
-  const { child } = yield execLog("anvil", ["-b", String(blocktime), "--block-base-fee-per-gas", "0"]);
+  const { child } = yield execLog("anvil", [
+    "-b",
+    String(blocktime),
+    "--block-base-fee-per-gas",
+    "0",
+    "--gas-limit",
+    "100000000"
+  ]);
   process.on("SIGINT", () => {
     console.log("\ngracefully shutting down from SIGINT (Crtl-C)");
     child.kill();

package/dist/commands/faucet.js

@@ -5083,46 +5083,6 @@ var DripRequest = {
     return message;
   }
 };
-function createBaseDripVerifyTweetRequest() {
-  return { username: "", address: "" };
-}
-var DripVerifyTweetRequest = {
-  encode(message, writer = import_minimal.default.Writer.create()) {
-    if (message.username !== "") {
-      writer.uint32(10).string(message.username);
-    }
-    if (message.address !== "") {
-      writer.uint32(18).string(message.address);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_minimal.default.Reader ? input : new import_minimal.default.Reader(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseDripVerifyTweetRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          message.username = reader.string();
-          break;
-        case 2:
-          message.address = reader.string();
-          break;
-        default:
-          reader.skipType(tag & 7);
-          break;
-      }
-    }
-    return message;
-  },
-  fromPartial(object) {
-    const message = createBaseDripVerifyTweetRequest();
-    message.username = object.username ?? "";
-    message.address = object.address ?? "";
-    return message;
-  }
-};
 function createBaseDripDevRequest() {
   return { address: "" };
 }
@@ -5522,7 +5482,7 @@ var FaucetServiceDefinition = {
     },
     dripVerifyTweet: {
       name: "DripVerifyTweet",
-      requestType: DripVerifyTweetRequest,
+      requestType: DripRequest,
       requestStream: false,
       responseType: DripResponse,
       responseStream: false,

package/dist/commands/trace.js

@@ -217058,7 +217058,8 @@ var handler = (argv) => __async(void 0, null, function* () {
   const wd = process.cwd();
   const deployData = config && JSON.parse((0, import_fs2.readFileSync)(config, { encoding: "utf8" }));
   const labels = [];
-  const provider = new import_providers.JsonRpcProvider(rpc || "http://localhost:8545");
+  const rpcUrl = rpc || "http://localhost:8545";
+  const provider = new import_providers.JsonRpcProvider(rpcUrl);
   const World = new import_ethers.Contract(world, abi, provider);
   if (deployData) {
     const componentPromises = deployData.components.map((component) => __async(void 0, null, function* () {
@@ -217085,6 +217086,8 @@ var handler = (argv) => __async(void 0, null, function* () {
     "run",
     ...labels.map((label) => ["--label", `${label[1]}:${label[0]}`]).flat(),
     ...debug ? ["--debug"] : [],
+    `--rpc-url`,
+    `${rpcUrl}`,
     `${tx}`
   ]);
   process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "1.30.1",
+  "version": "1.31.0",
   "description": "Command line interface for mud",
   "main": "dist/index.js",
   "license": "MIT",
@@ -37,10 +37,10 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "@latticexyz/services": "^1.30.1",
-    "@latticexyz/solecs": "^1.30.1",
-    "@latticexyz/std-contracts": "^1.30.1",
-    "@latticexyz/utils": "^1.30.1",
+    "@latticexyz/services": "^1.31.0",
+    "@latticexyz/solecs": "^1.31.0",
+    "@latticexyz/std-contracts": "^1.31.0",
+    "@latticexyz/utils": "^1.31.0",
     "@typechain/ethers-v5": "^10.1.1",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
@@ -70,5 +70,5 @@
   "pkg": {
     "scripts": "build/**/*.js"
   },
-  "gitHead": "bb70a2ffd3b059131cb9b719c677ce2f932696be"
+  "gitHead": "a1a0d627e3800039b3b9179a23927aa599bc6e2a"
 }

package/src/commands/devnode.ts

@@ -21,7 +21,14 @@ export const handler = async (argv: Arguments<Options>): Promise<void> => {
   console.log("Clearing devnode history");
   const userHomeDir = homedir();
   rmSync(path.join(userHomeDir, ".foundry", "anvil", "tmp"), { recursive: true, force: true });
-  const { child } = await execLog("anvil", ["-b", String(blocktime), "--block-base-fee-per-gas", "0"]);
+  const { child } = await execLog("anvil", [
+    "-b",
+    String(blocktime),
+    "--block-base-fee-per-gas",
+    "0",
+    "--gas-limit",
+    "100000000",
+  ]);
 
   process.on("SIGINT", () => {
     console.log("\ngracefully shutting down from SIGINT (Crtl-C)");

package/src/commands/trace.ts

@@ -31,7 +31,8 @@ export const handler = async (argv: Arguments<Options>): Promise<void> => {
   const deployData = config && JSON.parse(readFileSync(config, { encoding: "utf8" }));
   const labels = [];
 
-  const provider = new JsonRpcProvider(rpc || "http://localhost:8545");
+  const rpcUrl = rpc || "http://localhost:8545";
+  const provider = new JsonRpcProvider(rpcUrl);
   const World = new Contract(world, WorldAbi, provider);
 
   if (deployData) {
@@ -57,11 +58,12 @@ export const handler = async (argv: Arguments<Options>): Promise<void> => {
 
     labels.push(...components, ...systems);
   }
-
   await execLog("cast", [
     "run",
     ...labels.map((label) => ["--label", `${label[1]}:${label[0]}`]).flat(),
     ...(debug ? ["--debug"] : []),
+    `--rpc-url`,
+    `${rpcUrl}`,
     `${tx}`,
   ]);
 

package/src/contracts/Cheats.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Unlicense
+// SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
 interface Cheats {

package/src/contracts/LibDeploy.ejs

@@ -8,8 +8,9 @@ import { DSTest } from "ds-test/test.sol";
 import { console } from "forge-std/console.sol";
 
 // Solecs 
+import { IWorld } from "solecs/interfaces/IWorld.sol";
 import { World } from "solecs/World.sol";
-import { Component } from "solecs/Component.sol";
+import { IComponent } from "solecs/interfaces/IComponent.sol";
 import { getAddressById } from "solecs/utils.sol";
 import { IUint256Component } from "solecs/interfaces/IUint256Component.sol";
 import { ISystem } from "solecs/interfaces/ISystem.sol";
@@ -25,7 +26,7 @@ import { <%= system.name %>, ID as <%= system.name %>ID } from "systems/<%- syst
 <% }); -%>
 
 struct DeployResult {
-  World world;
+  IWorld world;
   address deployer;
 }
 
@@ -42,12 +43,12 @@ library LibDeploy {
     // ------------------------
 
     // Deploy world
-    result.world = _world == address(0) ? new World() : World(_world);
+    result.world = _world == address(0) ? new World() : IWorld(_world);
     if (_world == address(0)) result.world.init(); // Init if it's a fresh world
 
     // Deploy components
     if (!_reuseComponents) {
-      Component comp;
+      IComponent comp;
 <% components.forEach(component => { -%>
 
       console.log("Deploying <%= component %>");
@@ -65,7 +66,7 @@ library LibDeploy {
     uint256 componentId,
     address writer
   ) internal {
-    Component(getAddressById(components, componentId)).authorizeWriter(writer);
+    IComponent(getAddressById(components, componentId)).authorizeWriter(writer);
   }
   
   /**
@@ -76,7 +77,7 @@ library LibDeploy {
     address _world,
     bool init
   ) internal {
-    World world = World(_world);
+    IWorld world = IWorld(_world);
     // Deploy systems
     ISystem system; 
     IUint256Component components = world.components();
@@ -100,4 +101,4 @@ library LibDeploy {
     console.log(address(system));
 <% });-%>
   }
-}
+}

package/src/contracts/LibDeploy.sol

@@ -1,27 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-// NOTE: This file is autogenerated via `mud codegen-libdeploy` from `deploy.json`. Do not edit manually.
+// NOTE:  THIS IS A STUB TO MAKE IMPORTS WORK.
+//        The real LibDeploy.sol is generated automatically
+//        when calling `mud test` or `mud deploy-contracts`.
+//        To manually generate the real LibDeploy.sol use
+//        `mud codegen-libdeploy`.
 
-// Foundry
-import {DSTest} from "ds-test/test.sol";
-import {console} from "forge-std/console.sol";
-
-// Solecs
-import {World} from "solecs/World.sol";
-import {Component} from "solecs/Component.sol";
-import {getAddressById} from "solecs/utils.sol";
-import {IUint256Component} from "solecs/interfaces/IUint256Component.sol";
-import {ISystem} from "solecs/interfaces/ISystem.sol";
-
-// Components (requires 'components=...' remapping in project's remappings.txt)
-import {CounterComponent, ID as CounterComponentID} from "components/CounterComponent.sol";
-
-// Systems (requires 'systems=...' remapping in project's remappings.txt)
-import {IncrementSystem, ID as IncrementSystemID} from "systems/IncrementSystem.sol";
+import {IWorld} from "solecs/interfaces/IWorld.sol";
 
 struct DeployResult {
-  World world;
+  IWorld world;
   address deployer;
 }
 
@@ -30,52 +19,5 @@ library LibDeploy {
     address _deployer,
     address _world,
     bool _reuseComponents
-  ) internal returns (DeployResult memory result) {
-    result.deployer = _deployer;
-
-    // ------------------------
-    // Deploy
-    // ------------------------
-
-    // Deploy world
-    result.world = _world == address(0) ? new World() : World(_world);
-    if (_world == address(0)) result.world.init(); // Init if it's a fresh world
-
-    // Deploy components
-    if (!_reuseComponents) {
-      Component comp;
-
-      console.log("Deploying CounterComponent");
-      comp = new CounterComponent(address(result.world));
-      console.log(address(comp));
-    }
-
-    // Deploy systems
-    deploySystems(address(result.world), true);
-  }
-
-  function authorizeWriter(
-    IUint256Component components,
-    uint256 componentId,
-    address writer
-  ) internal {
-    Component(getAddressById(components, componentId)).authorizeWriter(writer);
-  }
-
-  /**
-   * Deploy systems to the given world.
-   * If `init` flag is set, systems with `initialize` setting in `deploy.json` will be executed.
-   */
-  function deploySystems(address _world, bool init) internal {
-    World world = World(_world);
-    // Deploy systems
-    ISystem system;
-    IUint256Component components = world.components();
-
-    console.log("Deploying IncrementSystem");
-    system = new IncrementSystem(world, address(components));
-    world.registerSystem(address(system), IncrementSystemID);
-    authorizeWriter(components, CounterComponentID, address(system));
-    console.log(address(system));
-  }
+  ) internal returns (DeployResult memory result) {}
 }