@everyprotocol/every-cli 0.1.13 → 0.1.14

package/dist/artifact.js

@@ -0,0 +1,53 @@
+import path from "node:path";
+/**
+ * Load a Foundry artifact path info by ID.
+ * ID forms supported:
+ *   - "File.sol"
+ *   - "File.sol:Contract"
+ *   - "path/to/File.sol:Contract"
+ * Default artifactDir is "out".
+ *
+ * Returns: { contract: "Contract", file: "out/File.sol/Contract.json" }
+ */
+export function getArtifactPath(id, artifactDir = "out") {
+    // split on LAST ":" so paths containing ":" still work
+    const c = id.lastIndexOf(":");
+    let contract = c === -1 ? "" : id.slice(c + 1);
+    const filePart = c === -1 ? id : id.slice(0, c);
+    const fileBase = path.basename(filePart);
+    if (!fileBase.toLowerCase().endsWith(".sol")) {
+        throw new Error(`"${filePart}" is not a .sol file`);
+    }
+    // infer contract name if omitted -> File.sol => File
+    if (!contract)
+        contract = fileBase.slice(0, -".sol".length);
+    const file = path.join(artifactDir, fileBase, `${contract}.json`);
+    return { contract, file };
+}
+/** Get creation (deploy) bytecode from a Foundry/solc artifact JSON object. */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getCreationCode(artifact) {
+    // Foundry may store as string or { object: string }
+    const bc = typeof artifact?.bytecode === "string" ? artifact.bytecode : artifact?.bytecode?.object;
+    if (typeof bc !== "string") {
+        throw new Error("bytecode missing or not a string");
+    }
+    // Check for unlinked library placeholders like __$abcd...$__
+    if (bc.includes("__$")) {
+        const matches = [...bc.matchAll(/__\$([0-9a-fA-F]{34})\$__/g)];
+        const labels = [...new Set(matches.map((m) => m[0]))];
+        throw new Error(`Unlinked: ${labels.join(", ")}`);
+    }
+    if (!/^0x[0-9a-fA-F]*$/.test(bc)) {
+        throw new Error("bytecode not valid hex (expected 0x-prefixed hex string)");
+    }
+    return bc;
+}
+/** Get ABI array from a Foundry/solc artifact JSON object. */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getAbi(artifact) {
+    const abi = artifact?.abi;
+    if (!Array.isArray(abi))
+        throw new Error("abi missing or not an array");
+    return abi;
+}

package/dist/cmds/set.js

@@ -1,6 +1,11 @@
-import { Argument, Command } from "commander";
+import { Argument, Command, Option } from "commander";
 import { abi } from "../abi.js";
 import { CommandGenDefaults, getCommandGen, makeFuncName } from "../cmdgen.js";
+import { outputOptions, writeOptions } from "../commander-patch.js";
+import { FromOpts } from "../from-opts.js";
+import { coerceValue, loadJson } from "../utils.js";
+import { getAbi, getArtifactPath, getCreationCode } from "../artifact.js";
+import { Logger } from "../logger.js";
 const adminCmdConfig = {
     getFuncName: (cmdName) => `${cmdName}Set`,
     getAbiFuncs: (funcName) => abi.funcs.setRegistryAdmin.filter((i) => i.name == funcName),
@@ -25,7 +30,82 @@ const userCmdConfig = {
 };
 const userCmds = "owner,descriptor,snapshot".split(",");
 const adminCmds = "register,update,upgrade,touch".split(",");
+const deployCmd = genDeployCmd();
 export const setCmd = new Command("set")
     .description("manage sets")
+    .addCommand(deployCmd)
     .addCommands(adminCmds.map(getCommandGen(adminCmdConfig)))
     .addCommands(userCmds.map(getCommandGen(userCmdConfig)));
+function genDeployCmd() {
+    const args = [
+        new Argument(`<contract>`, "Artifact ID of the contract"),
+        new Argument(`[args...]`, "Constructor arguments"),
+    ];
+    const options = [
+        new Option("--artifact-dir <dir>", "Artifact directory").default("./out"),
+        ...writeOptions,
+        ...outputOptions,
+    ];
+    function getDeployArgs(cmd) {
+        const opts = cmd.opts();
+        const artifactInfo = getArtifactPath(cmd.args[0], opts.artifactDir);
+        const userArgs = cmd.args.slice(1);
+        const artifact = loadJson(artifactInfo.file);
+        const abi = getAbi(artifact);
+        const bytecode = getCreationCode(artifact);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const ctor = abi.find((i) => i.type === "constructor");
+        if (!ctor) {
+            if (userArgs.length > 0) {
+                throw new Error(`No constructor defined, got ${userArgs.length} args`);
+            }
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return { abi, bytecode, args: [] };
+        }
+        else if (!ctor.inputs || ctor.inputs.length === 0) {
+            if (userArgs.length > 0) {
+                throw new Error(`Constructor expects 0 args, got ${userArgs.length}`);
+            }
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return { abi, bytecode, args: [] };
+        }
+        const expected = ctor.inputs.length;
+        if (userArgs.length !== expected) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const sig = `(${ctor.inputs.map((p) => p.type).join(", ")})`;
+            throw new Error(`Constructor expects ${expected} args ${sig}, got ${userArgs.length}`);
+        }
+        const args = userArgs.map((arg, i) => coerceValue(arg, ctor.inputs[i]));
+        return { abi, bytecode, args };
+    }
+    async function action() {
+        const opts = this.opts();
+        const { args, abi, bytecode } = getDeployArgs(this);
+        const { walletClient, publicClient } = await FromOpts.toWriteEthereum(opts);
+        const console = new Logger(opts);
+        console.log("Transaction sending...");
+        const hash = await walletClient.deployContract({
+            abi,
+            account: walletClient.account,
+            bytecode,
+            args,
+            chain: undefined,
+        });
+        console.log(`Transaction sent: ${hash}`);
+        console.log("Waiting for confirmation...");
+        const receipt = await publicClient.waitForTransactionReceipt({ hash });
+        console.log(`Confirmed in: block ${receipt.blockNumber}, hash ${receipt.blockHash}`);
+        console.log(`Contract deployed at: ${receipt.contractAddress}`);
+        const result = {
+            transaction: hash,
+            block: { number: receipt.blockNumber, hash: receipt.blockHash },
+            deployedTo: receipt.contractAddress,
+        };
+        console.result(result);
+    }
+    return new Command("deploy")
+        .description("Deploy a set contract")
+        .addOptions(options)
+        .addArguments(args)
+        .action(action);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@everyprotocol/every-cli",
   "type": "module",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/everyprotocol/cli.git"