@latticexyz/cli 1.31.1 → 1.31.3

package/dist/commands/call-system.js

@@ -204027,7 +204027,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/codegen-libdeploy.js

@@ -180793,7 +180793,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
     const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));

package/dist/commands/create.js

@@ -180819,7 +180819,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/deploy-contracts.js

@@ -33968,12 +33968,12 @@ var require_url_json_rpc_provider = __commonJS({
     var _version_1 = require_version25();
     var logger = new logger_1.Logger(_version_1.version);
     var json_rpc_provider_1 = require_json_rpc_provider();
-    var StaticJsonRpcProvider = function(_super) {
-      __extends(StaticJsonRpcProvider2, _super);
-      function StaticJsonRpcProvider2() {
+    var StaticJsonRpcProvider2 = function(_super) {
+      __extends(StaticJsonRpcProvider3, _super);
+      function StaticJsonRpcProvider3() {
         return _super !== null && _super.apply(this, arguments) || this;
       }
-      StaticJsonRpcProvider2.prototype.detectNetwork = function() {
+      StaticJsonRpcProvider3.prototype.detectNetwork = function() {
         return __awaiter(this, void 0, void 0, function() {
           var network;
           return __generator(this, function(_a) {
@@ -33999,9 +33999,9 @@ var require_url_json_rpc_provider = __commonJS({
           });
         });
       };
-      return StaticJsonRpcProvider2;
+      return StaticJsonRpcProvider3;
     }(json_rpc_provider_1.JsonRpcProvider);
-    exports.StaticJsonRpcProvider = StaticJsonRpcProvider;
+    exports.StaticJsonRpcProvider = StaticJsonRpcProvider2;
     var UrlJsonRpcProvider = function(_super) {
       __extends(UrlJsonRpcProvider2, _super);
       function UrlJsonRpcProvider2(network, apiKey) {
@@ -34042,7 +34042,7 @@ var require_url_json_rpc_provider = __commonJS({
         });
       };
       return UrlJsonRpcProvider2;
-    }(StaticJsonRpcProvider);
+    }(StaticJsonRpcProvider2);
     exports.UrlJsonRpcProvider = UrlJsonRpcProvider;
   }
 });
@@ -216279,7 +216279,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
     const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));
@@ -216338,7 +216338,7 @@ function copyAbi(inDir, outDir, contract) {
   try {
     return (0, import_fs2.copyFileSync)(import_path2.default.join(inDir, contract + ".sol", contract + ".json"), import_path2.default.join(outDir, contract + ".json"));
   } catch (e) {
-    console.warn(e);
+    console.log("Skipping", contract);
   }
 }
 function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "IComponent"]) {
@@ -217364,11 +217364,22 @@ function execa(file, args, options) {
 }
 
 // src/utils/deploy.ts
+var import_providers = __toESM(require_lib32());
 var contractsDir2 = __dirname + "/../../src/contracts";
-function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress, reuseComponents) {
+function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress, reuseComponents, gasPrice) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     const address = deployerPrivateKey ? new import_ethers.Wallet(deployerPrivateKey).address : import_ethers.constants.AddressZero;
+    if (gasPrice == null) {
+      try {
+        console.log("Fetching gas price...");
+        const provider = new import_providers.StaticJsonRpcProvider(rpc, { name: "AnyNetwork", chainId: 1234 });
+        gasPrice = (yield provider.getGasPrice()).toNumber() * 1.3;
+        console.log("Gas price:", gasPrice);
+      } catch (e) {
+        console.log("Could not fetch gas price");
+      }
+    }
     const child = execa(
       "forge",
       [
@@ -217384,12 +217395,14 @@ function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress,
         worldAddress || import_ethers.constants.AddressZero,
         reuseComponents ? "true" : "false",
         "--fork-url",
-        rpc
+        rpc,
+        ...gasPrice != null ? ["--with-gas-price", String(gasPrice)] : []
       ],
-      { stdio: ["inherit", "pipe", "inherit"] }
+      { stdio: ["inherit", "pipe", "pipe"] }
     );
-    (_a = child.stdout) == null ? void 0 : _a.on("data", (data) => console.log(data.toString()));
-    const lines = (_b = (yield child).stdout) == null ? void 0 : _b.split("\n");
+    (_a = child.stderr) == null ? void 0 : _a.on("data", (data) => console.log("stderr:", data.toString()));
+    (_b = child.stdout) == null ? void 0 : _b.on("data", (data) => console.log(data.toString()));
+    const lines = (_c = (yield child).stdout) == null ? void 0 : _c.split("\n");
     const deployedWorldAddress = findLog(lines, "world: address");
     const initialBlockNumber = findLog(lines, "initialBlockNumber: uint256");
     return { child: yield child, deployedWorldAddress, initialBlockNumber };
@@ -217403,7 +217416,13 @@ function generateAndDeploy(args) {
     try {
       libDeployPath = yield generateLibDeploy(args.config, contractsDir2, args.systems);
       yield generateTypes(void 0, "./types", { clear: args.clear });
-      const result = yield deploy(args.deployerPrivateKey, args.rpc, args.worldAddress, Boolean(args.systems));
+      const result = yield deploy(
+        args.deployerPrivateKey,
+        args.rpc,
+        args.worldAddress,
+        Boolean(args.systems),
+        args.gasPrice
+      );
       deployedWorldAddress = result.deployedWorldAddress;
       initialBlockNumber = result.initialBlockNumber;
     } catch (e) {
@@ -217411,7 +217430,7 @@ function generateAndDeploy(args) {
     } finally {
       console.log("Cleaning up deployment script");
       if (libDeployPath)
-        resetLibDeploy(contractsDir2);
+        yield resetLibDeploy(contractsDir2);
     }
     return { deployedWorldAddress, initialBlockNumber };
   });
@@ -217480,7 +217499,8 @@ var builder = (yargs) => yargs.options({
   systems: { type: "string", desc: "Only upgrade the given systems. Requires World address." },
   watch: { type: "boolean", desc: "Automatically redeploy changed systems" },
   dev: { type: "boolean", desc: "Automatically use funded dev private key for local development" },
-  openUrl: { type: "string", desc: "Opens a browser at the provided url with the worldAddress url param prefilled" }
+  openUrl: { type: "string", desc: "Opens a browser at the provided url with the worldAddress url param prefilled" },
+  gasPrice: { type: "number", desc: "Gas price to set for deploy transactions" }
 });
 var handler = (args) => __async(void 0, null, function* () {
   var _a;
@@ -217488,7 +217508,7 @@ var handler = (args) => __async(void 0, null, function* () {
     console.error("Error: Upgrading systems requires a World address.");
     process.exit(1);
   }
-  const deployerPrivateKey = ((_a = args.deployerPrivateKey) != null ? _a : args.dev) ? "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" : void 0;
+  const deployerPrivateKey = (_a = args.deployerPrivateKey) != null ? _a : args.dev ? "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" : void 0;
   const { deployedWorldAddress: worldAddress, initialBlockNumber } = yield generateAndDeploy(__spreadProps(__spreadValues({}, args), {
     deployerPrivateKey,
     clear: true
@@ -217500,14 +217520,15 @@ var handler = (args) => __async(void 0, null, function* () {
     import_openurl.default.open(url2.toString());
   }
   if (args.watch) {
-    const { config, rpc } = args;
+    const { config, rpc, gasPrice } = args;
     hsr("./src", (systems) => {
       return generateAndDeploy({
         config,
         deployerPrivateKey,
         worldAddress,
         rpc,
-        systems
+        systems,
+        gasPrice
       });
     });
   } else {

package/dist/commands/deploy.js

@@ -31932,12 +31932,12 @@ var require_url_json_rpc_provider = __commonJS({
     var _version_1 = require_version22();
     var logger = new logger_1.Logger(_version_1.version);
     var json_rpc_provider_1 = require_json_rpc_provider();
-    var StaticJsonRpcProvider = function(_super) {
-      __extends(StaticJsonRpcProvider2, _super);
-      function StaticJsonRpcProvider2() {
+    var StaticJsonRpcProvider2 = function(_super) {
+      __extends(StaticJsonRpcProvider3, _super);
+      function StaticJsonRpcProvider3() {
         return _super !== null && _super.apply(this, arguments) || this;
       }
-      StaticJsonRpcProvider2.prototype.detectNetwork = function() {
+      StaticJsonRpcProvider3.prototype.detectNetwork = function() {
         return __awaiter(this, void 0, void 0, function() {
           var network;
           return __generator(this, function(_a2) {
@@ -31963,9 +31963,9 @@ var require_url_json_rpc_provider = __commonJS({
           });
         });
       };
-      return StaticJsonRpcProvider2;
+      return StaticJsonRpcProvider3;
     }(json_rpc_provider_1.JsonRpcProvider);
-    exports.StaticJsonRpcProvider = StaticJsonRpcProvider;
+    exports.StaticJsonRpcProvider = StaticJsonRpcProvider2;
     var UrlJsonRpcProvider = function(_super) {
       __extends(UrlJsonRpcProvider2, _super);
       function UrlJsonRpcProvider2(network, apiKey) {
@@ -32006,7 +32006,7 @@ var require_url_json_rpc_provider = __commonJS({
         });
       };
       return UrlJsonRpcProvider2;
-    }(StaticJsonRpcProvider);
+    }(StaticJsonRpcProvider2);
     exports.UrlJsonRpcProvider = UrlJsonRpcProvider;
   }
 });
@@ -269078,7 +269078,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
     const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));
@@ -269137,7 +269137,7 @@ function copyAbi(inDir, outDir, contract) {
   try {
     return (0, import_fs2.copyFileSync)(import_path2.default.join(inDir, contract + ".sol", contract + ".json"), import_path2.default.join(outDir, contract + ".json"));
   } catch (e) {
-    console.warn(e);
+    console.log("Skipping", contract);
   }
 }
 function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "IComponent"]) {
@@ -270163,11 +270163,22 @@ function execa(file, args, options) {
 }
 
 // src/utils/deploy.ts
+var import_providers = __toESM(require_lib29());
 var contractsDir2 = __dirname + "/../../src/contracts";
-function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress, reuseComponents) {
+function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress, reuseComponents, gasPrice) {
   return __async(this, null, function* () {
-    var _a2, _b;
+    var _a2, _b, _c;
     const address = deployerPrivateKey ? new import_ethers.Wallet(deployerPrivateKey).address : import_ethers.constants.AddressZero;
+    if (gasPrice == null) {
+      try {
+        console.log("Fetching gas price...");
+        const provider = new import_providers.StaticJsonRpcProvider(rpc, { name: "AnyNetwork", chainId: 1234 });
+        gasPrice = (yield provider.getGasPrice()).toNumber() * 1.3;
+        console.log("Gas price:", gasPrice);
+      } catch (e) {
+        console.log("Could not fetch gas price");
+      }
+    }
     const child = execa(
       "forge",
       [
@@ -270183,12 +270194,14 @@ function deploy(deployerPrivateKey, rpc = "http://localhost:8545", worldAddress,
         worldAddress || import_ethers.constants.AddressZero,
         reuseComponents ? "true" : "false",
         "--fork-url",
-        rpc
+        rpc,
+        ...gasPrice != null ? ["--with-gas-price", String(gasPrice)] : []
       ],
-      { stdio: ["inherit", "pipe", "inherit"] }
+      { stdio: ["inherit", "pipe", "pipe"] }
     );
-    (_a2 = child.stdout) == null ? void 0 : _a2.on("data", (data) => console.log(data.toString()));
-    const lines = (_b = (yield child).stdout) == null ? void 0 : _b.split("\n");
+    (_a2 = child.stderr) == null ? void 0 : _a2.on("data", (data) => console.log("stderr:", data.toString()));
+    (_b = child.stdout) == null ? void 0 : _b.on("data", (data) => console.log(data.toString()));
+    const lines = (_c = (yield child).stdout) == null ? void 0 : _c.split("\n");
     const deployedWorldAddress = findLog(lines, "world: address");
     const initialBlockNumber = findLog(lines, "initialBlockNumber: uint256");
     return { child: yield child, deployedWorldAddress, initialBlockNumber };
@@ -270202,7 +270215,13 @@ function generateAndDeploy(args) {
     try {
       libDeployPath = yield generateLibDeploy(args.config, contractsDir2, args.systems);
       yield generateTypes(void 0, "./types", { clear: args.clear });
-      const result = yield deploy(args.deployerPrivateKey, args.rpc, args.worldAddress, Boolean(args.systems));
+      const result = yield deploy(
+        args.deployerPrivateKey,
+        args.rpc,
+        args.worldAddress,
+        Boolean(args.systems),
+        args.gasPrice
+      );
       deployedWorldAddress = result.deployedWorldAddress;
       initialBlockNumber = result.initialBlockNumber;
     } catch (e) {
@@ -270210,7 +270229,7 @@ function generateAndDeploy(args) {
     } finally {
       console.log("Cleaning up deployment script");
       if (libDeployPath)
-        resetLibDeploy(contractsDir2);
+        yield resetLibDeploy(contractsDir2);
     }
     return { deployedWorldAddress, initialBlockNumber };
   });

package/dist/commands/devnode.js

@@ -180822,7 +180822,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/diamond-abi.js

@@ -180806,7 +180806,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/sync-art.js

@@ -180823,7 +180823,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/system-types.js

@@ -180810,7 +180810,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/test.js

@@ -180819,7 +180819,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 function generateLibDeploy(configPath, out, systems) {
   return __async(this, null, function* () {
     const config = JSON.parse(yield (0, import_promises.readFile)(configPath, { encoding: "utf8" }));

package/dist/commands/trace.js

@@ -216210,7 +216210,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());

package/dist/commands/types.js

@@ -180825,7 +180825,7 @@ var import_promises = require("fs/promises");
 var import_ejs = __toESM(require_ejs());
 var import_path = __toESM(require("path"));
 var contractsDir = import_path.default.join(__dirname, "../../src/contracts");
-var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeploy.sol"));
+var stubLibDeploy = (0, import_promises.readFile)(import_path.default.join(contractsDir, "LibDeployStub.sol"));
 
 // src/utils/types.ts
 var import_typechain = __toESM(require_dist());
@@ -180850,7 +180850,7 @@ function copyAbi(inDir, outDir, contract) {
   try {
     return (0, import_fs2.copyFileSync)(import_path2.default.join(inDir, contract + ".sol", contract + ".json"), import_path2.default.join(outDir, contract + ".json"));
   } catch (e) {
-    console.warn(e);
+    console.log("Skipping", contract);
   }
 }
 function filterAbi(abiIn = "./out", abiOut = "./abi", exclude = ["Component", "IComponent"]) {

package/package.json

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

package/src/commands/deploy-contracts.ts

@@ -21,6 +21,7 @@ export const builder: CommandBuilder<Options, Options> = (yargs) =>
     watch: { type: "boolean", desc: "Automatically redeploy changed systems" },
     dev: { type: "boolean", desc: "Automatically use funded dev private key for local development" },
     openUrl: { type: "string", desc: "Opens a browser at the provided url with the worldAddress url param prefilled" },
+    gasPrice: { type: "number", desc: "Gas price to set for deploy transactions" },
   });
 
 export const handler = async (args: Arguments<Options>): Promise<void> => {
@@ -30,9 +31,10 @@ export const handler = async (args: Arguments<Options>): Promise<void> => {
   }
 
   const deployerPrivateKey =
-    args.deployerPrivateKey ?? args.dev
+    args.deployerPrivateKey ??
+    (args.dev
       ? "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" // Default anvil private key
-      : undefined;
+      : undefined);
 
   // Deploy world, components and systems
   const { deployedWorldAddress: worldAddress, initialBlockNumber } = await generateAndDeploy({
@@ -50,7 +52,7 @@ export const handler = async (args: Arguments<Options>): Promise<void> => {
 
   // Set up watcher for system files to redeploy on change
   if (args.watch) {
-    const { config, rpc } = args;
+    const { config, rpc, gasPrice } = args;
 
     hsr("./src", (systems: string[]) => {
       return generateAndDeploy({
@@ -59,6 +61,7 @@ export const handler = async (args: Arguments<Options>): Promise<void> => {
         worldAddress,
         rpc,
         systems,
+        gasPrice,
       });
     });
   } else {

package/src/contracts/LibDeployStub.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+// 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`.
+
+import {IWorld} from "solecs/interfaces/IWorld.sol";
+
+struct DeployResult {
+  IWorld world;
+  address deployer;
+}
+
+library LibDeploy {
+  function deploy(
+    address _deployer,
+    address _world,
+    bool _reuseComponents
+  ) internal returns (DeployResult memory result) {}
+}

package/src/utils/build.ts

@@ -21,7 +21,7 @@ function copyAbi(inDir: string, outDir: string, contract: string) {
   try {
     return copyFileSync(path.join(inDir, contract + ".sol", contract + ".json"), path.join(outDir, contract + ".json"));
   } catch (e) {
-    console.warn(e);
+    console.log("Skipping", contract);
   }
 }
 

package/src/utils/codegen.ts

@@ -4,8 +4,15 @@ import path from "path";
 
 const contractsDir = path.join(__dirname, "../../src/contracts");
 
-const stubLibDeploy = readFile(path.join(contractsDir, "LibDeploy.sol"));
-
+const stubLibDeploy = readFile(path.join(contractsDir, "LibDeployStub.sol"));
+
+/**
+ * Generate LibDeploy.sol from deploy.json
+ * @param configPath path to deploy.json
+ * @param out output directory for LibDeploy.sol
+ * @param systems optional, only generate deploy code for the given systems
+ * @returns path to generated LibDeploy.sol
+ */
 export async function generateLibDeploy(configPath: string, out: string, systems?: string | string[]) {
   // Parse config
   const config = JSON.parse(await readFile(configPath, { encoding: "utf8" }));

package/src/utils/deploy.ts

@@ -3,17 +3,38 @@ import { generateLibDeploy, resetLibDeploy } from "./codegen";
 import { findLog } from "./findLog";
 import { generateTypes } from "./types";
 import { execa } from "execa";
+import { StaticJsonRpcProvider } from "@ethersproject/providers";
 
 const contractsDir = __dirname + "/../../src/contracts";
 
+/**
+ * Deploy world, components and systems from deploy.json
+ * @param deployerPrivateKey private key of deployer
+ * @param rpc rpc url
+ * @param worldAddress optional, address of existing world
+ * @param reuseComponents optional, reuse existing components
+ * @returns address of deployed world
+ */
 export async function deploy(
   deployerPrivateKey?: string,
   rpc = "http://localhost:8545",
   worldAddress?: string,
-  reuseComponents?: boolean
+  reuseComponents?: boolean,
+  gasPrice?: number
 ) {
   const address = deployerPrivateKey ? new Wallet(deployerPrivateKey).address : constants.AddressZero;
 
+  if (gasPrice == null) {
+    try {
+      console.log("Fetching gas price...");
+      const provider = new StaticJsonRpcProvider(rpc, { name: "AnyNetwork", chainId: 1234 });
+      gasPrice = (await provider.getGasPrice()).toNumber() * 1.3; // 30% multiplier for faster inclusion
+      console.log("Gas price:", gasPrice);
+    } catch (e) {
+      console.log("Could not fetch gas price");
+    }
+  }
+
   const child = execa(
     "forge",
     [
@@ -30,10 +51,12 @@ export async function deploy(
       reuseComponents ? "true" : "false", // Reuse components?
       "--fork-url",
       rpc,
+      ...(gasPrice != null ? ["--with-gas-price", String(gasPrice)] : []),
     ],
-    { stdio: ["inherit", "pipe", "inherit"] }
+    { stdio: ["inherit", "pipe", "pipe"] }
   );
 
+  child.stderr?.on("data", (data) => console.log("stderr:", data.toString()));
   child.stdout?.on("data", (data) => console.log(data.toString()));
 
   // Extract world address from deploy script
@@ -51,6 +74,7 @@ export type DeployOptions = {
   rpc: string;
   systems?: string | string[];
   clear?: boolean;
+  gasPrice?: number;
 };
 
 export async function generateAndDeploy(args: DeployOptions) {
@@ -66,7 +90,13 @@ export async function generateAndDeploy(args: DeployOptions) {
     await generateTypes(undefined, "./types", { clear: args.clear });
 
     // Call deploy script
-    const result = await deploy(args.deployerPrivateKey, args.rpc, args.worldAddress, Boolean(args.systems));
+    const result = await deploy(
+      args.deployerPrivateKey,
+      args.rpc,
+      args.worldAddress,
+      Boolean(args.systems),
+      args.gasPrice
+    );
     deployedWorldAddress = result.deployedWorldAddress;
     initialBlockNumber = result.initialBlockNumber;
 
@@ -76,7 +106,7 @@ export async function generateAndDeploy(args: DeployOptions) {
   } finally {
     // Remove generated LibDeploy
     console.log("Cleaning up deployment script");
-    if (libDeployPath) resetLibDeploy(contractsDir);
+    if (libDeployPath) await resetLibDeploy(contractsDir);
   }
 
   return { deployedWorldAddress, initialBlockNumber };