@latticexyz/cli 2.0.0-next.10 → 2.0.0-next.12

package/src/utils/utils/deployContract.ts

@@ -1,33 +0,0 @@
-import chalk from "chalk";
-import { ethers } from "ethers";
-import { MUDError } from "@latticexyz/common/errors";
-import { TxConfig, ContractCode } from "./types";
-
-export async function deployContract(input: TxConfig & { nonce: number; contract: ContractCode }): Promise<string> {
-  const { signer, nonce, maxPriorityFeePerGas, maxFeePerGas, debug, gasPrice, confirmations, contract } = input;
-
-  try {
-    const factory = new ethers.ContractFactory(contract.abi, contract.bytecode, signer);
-    console.log(chalk.gray(`executing deployment of ${contract.name} with nonce ${nonce}`));
-    const deployPromise = factory
-      .deploy({
-        nonce,
-        maxPriorityFeePerGas,
-        maxFeePerGas,
-        gasPrice,
-      })
-      .then((c) => (confirmations ? c : c.deployed()));
-    const { address } = await deployPromise;
-    console.log(chalk.green("Deployed", contract.name, "to", address));
-    return address;
-  } catch (error: any) {
-    if (debug) console.error(error);
-    if (error?.message.includes("invalid bytecode")) {
-      throw new MUDError(
-        `Error deploying ${contract.name}: invalid bytecode. Note that linking of public libraries is not supported yet, make sure none of your libraries use "external" functions.`
-      );
-    } else if (error?.message.includes("CreateContractLimit")) {
-      throw new MUDError(`Error deploying ${contract.name}: CreateContractLimit exceeded.`);
-    } else throw error;
-  }
-}

package/src/utils/utils/fastTxExecute.ts

@@ -1,56 +0,0 @@
-import chalk from "chalk";
-import { TransactionReceipt, TransactionResponse } from "@ethersproject/providers";
-import { MUDError } from "@latticexyz/common/errors";
-import { TxConfig } from "./types";
-
-/**
- * Only await gas estimation (for speed), only execute if gas estimation succeeds (for safety)
- */
-export async function fastTxExecute<
-  C extends { connect: any; estimateGas: any; [key: string]: any },
-  F extends keyof C
->(
-  input: TxConfig & {
-    nonce: number;
-    contract: C;
-    func: F;
-    args: Parameters<C[F]>;
-    confirmations: number;
-  }
-): Promise<TransactionResponse | TransactionReceipt> {
-  const {
-    func,
-    args,
-    contract,
-    signer,
-    nonce,
-    maxPriorityFeePerGas,
-    maxFeePerGas,
-    gasPrice,
-    confirmations = 1,
-    debug,
-  } = input;
-  const functionName = `${func as string}(${args.map((arg) => `'${arg}'`).join(",")})`;
-  try {
-    const contractWithSigner = contract.connect(signer);
-    const gasLimit = await contractWithSigner.estimateGas[func].apply(null, args);
-    console.log(chalk.gray(`executing transaction: ${functionName} with nonce ${nonce}`));
-    return contractWithSigner[func]
-      .apply(null, [
-        ...args,
-        {
-          gasLimit,
-          nonce: nonce,
-          maxPriorityFeePerGas: maxPriorityFeePerGas,
-          maxFeePerGas: maxFeePerGas,
-          gasPrice: gasPrice,
-        },
-      ])
-      .then((tx: TransactionResponse) => {
-        return confirmations === 0 ? tx : tx.wait(confirmations);
-      });
-  } catch (error: any) {
-    if (debug) console.error(error);
-    throw new MUDError(`Gas estimation error for ${functionName}: ${error?.reason}`);
-  }
-}

package/src/utils/utils/getChainId.ts

@@ -1,10 +0,0 @@
-import { ethers } from "ethers";
-
-// TODO: Use viem's getChainId
-export async function getChainId(rpc: string) {
-  const { result: chainId } = await ethers.utils.fetchJson(
-    rpc,
-    '{ "id": 42, "jsonrpc": "2.0", "method": "eth_chainId", "params": [ ] }'
-  );
-  return Number(chainId);
-}

package/src/utils/utils/setInternalFeePerGas.ts

@@ -1,49 +0,0 @@
-import { BigNumber, Wallet } from "ethers";
-import { MUDError } from "@latticexyz/common/errors";
-
-/**
- * Set the maxFeePerGas and maxPriorityFeePerGas based on the current base fee and the given multiplier.
- * The multiplier is used to allow replacing pending transactions.
- * @param multiplier Multiplier to apply to the base fee
- */
-export async function setInternalFeePerGas(
-  signer: Wallet,
-  multiplier: number
-): Promise<{
-  maxPriorityFeePerGas: number | undefined;
-  maxFeePerGas: BigNumber | undefined;
-  gasPrice: BigNumber | undefined;
-}> {
-  // Compute maxFeePerGas and maxPriorityFeePerGas like ethers, but allow for a multiplier to allow replacing pending transactions
-  const feeData = await signer.provider.getFeeData();
-  let maxPriorityFeePerGas: number | undefined;
-  let maxFeePerGas: BigNumber | undefined;
-  let gasPrice: BigNumber | undefined;
-
-  if (feeData.lastBaseFeePerGas) {
-    if (!feeData.lastBaseFeePerGas.eq(0) && (await signer.getBalance()).eq(0)) {
-      throw new MUDError(`Attempting to deploy to a chain with non-zero base fee with an account that has no balance.
-        If you're deploying to the Lattice testnet, you can fund your account by running 'pnpm mud faucet --address ${await signer.getAddress()}'`);
-    }
-
-    // Set the priority fee to 0 for development chains with no base fee, to allow transactions from unfunded wallets
-    maxPriorityFeePerGas = feeData.lastBaseFeePerGas.eq(0) ? 0 : Math.floor(1_500_000_000 * multiplier);
-    maxFeePerGas = feeData.lastBaseFeePerGas.mul(2).add(maxPriorityFeePerGas);
-  } else if (feeData.gasPrice) {
-    // Legacy chains with gasPrice instead of maxFeePerGas
-    if (!feeData.gasPrice.eq(0) && (await signer.getBalance()).eq(0)) {
-      throw new MUDError(
-        `Attempting to deploy to a chain with non-zero gas price with an account that has no balance.`
-      );
-    }
-
-    gasPrice = feeData.gasPrice;
-  } else {
-    throw new MUDError("Can not fetch fee data from RPC");
-  }
-  return {
-    maxPriorityFeePerGas,
-    maxFeePerGas,
-    gasPrice,
-  };
-}

package/src/utils/utils/types.ts

@@ -1,21 +0,0 @@
-import { BigNumber, ContractInterface, ethers } from "ethers";
-
-export type CallData = {
-  func: string;
-  args: unknown[];
-};
-
-export type ContractCode = {
-  name: string;
-  abi: ContractInterface;
-  bytecode: string | { object: string };
-};
-
-export type TxConfig = {
-  signer: ethers.Wallet;
-  maxPriorityFeePerGas: number | undefined;
-  maxFeePerGas: BigNumber | undefined;
-  gasPrice: BigNumber | undefined;
-  debug: boolean;
-  confirmations: number;
-};

package/src/utils/world.ts

@@ -1,28 +0,0 @@
-import chalk from "chalk";
-
-import WorldData from "@latticexyz/world/out/World.sol/World.json" assert { type: "json" };
-import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json" assert { type: "json" };
-import { deployContract } from "./utils/deployContract";
-import { getContractData } from "./utils/getContractData";
-import { TxConfig } from "./utils/types";
-
-export async function deployWorldContract(
-  ip: TxConfig & {
-    nonce: number;
-    worldContractName: string | undefined;
-    forgeOutDirectory: string;
-  }
-): Promise<string> {
-  console.log(chalk.blue(`Deploying World`));
-  const contractData = ip.worldContractName
-    ? {
-        name: "World",
-        ...getContractData(ip.worldContractName, ip.forgeOutDirectory),
-      }
-    : { abi: IBaseWorldAbi, bytecode: WorldData.bytecode, name: "World" };
-  return deployContract({
-    ...ip,
-    nonce: ip.nonce,
-    contract: contractData,
-  });
-}