@everyprotocol/every-cli 0.1.16 → 0.1.18

package/dist/abi2.js

@@ -0,0 +1,52 @@
+import { toFunctionSignature } from "viem";
+import fs from "fs";
+import path from "path";
+import { memoize } from "lodash-es";
+import { __dirname } from "./utils.js";
+function getSelectorsInner() {
+    return loadAbiFromFile("events-errors");
+}
+// export const getSelectors = memoize(getSelectorsInner);
+export const getNonFuncs = memoize(getSelectorsInner);
+function getFuncsInner(name) {
+    return loadFuncAbiItems(name);
+}
+export const getFuncs = memoize(getFuncsInner);
+function getAbiInner(name) {
+    return [...getFuncs(name), ...getNonFuncs()];
+}
+export const getAbi = memoize(getAbiInner);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function loadAbiFromFile(name) {
+    const file = path.resolve(__dirname, "../abis2", `${name}.json`);
+    const content = fs.readFileSync(file, "utf8");
+    return JSON.parse(content);
+}
+export function loadNonFuncAbiItems(name) {
+    const abi = loadAbiFromFile(name);
+    return (abi.abi || []).filter((item) => item.type === "event" || item.type === "error");
+}
+export function loadFuncAbiItems(name) {
+    const abi = loadAbiFromFile(name);
+    const metadata = abi.metadata?.output || {};
+    const userMethods = metadata.userdoc?.methods || {};
+    const devMethods = metadata.devdoc?.methods || {};
+    return (abi.abi
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .filter((item) => item.type === "function")
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .map((item) => {
+        const signature = toFunctionSignature(item);
+        const userdoc = userMethods[signature] || {};
+        const devdoc = devMethods[signature] || {};
+        const _metadata = {
+            signature,
+            ...devdoc,
+            ...userdoc,
+        };
+        return {
+            ...item,
+            _metadata,
+        };
+    }));
+}

package/dist/abicmd.js

@@ -0,0 +1,121 @@
+import { Argument, Command, Option } from "commander";
+import { getNonFuncs } from "./abi2.js";
+import { coerceValue } from "./utils.js";
+import { outputOptions, universe, writeOptions } from "./commander-patch.js";
+import { submitSimulation } from "./ethereum.js";
+import { Logger } from "./logger.js";
+import { FromOpts } from "./from-opts.js";
+export function genAbiCommand(cmdName, abiFunc, cmdConf) {
+    const { cmdArgs, cmdOpts, argGetters } = genAbiCommandParams(abiFunc, cmdConf.params);
+    const desc = cmdConf.descs?.[`${abiFunc.name}`] ?? abiFunc._metadata.notice ?? "";
+    return new Command(cmdName)
+        .description(desc)
+        .addArguments(cmdArgs)
+        .addOptions(cmdOpts)
+        .action(AbiCommandAction(abiFunc, argGetters, cmdConf.prepare));
+}
+function ArgGetterArg(i) {
+    return function (cmd) {
+        return cmd.processedArgs[i];
+    };
+}
+function ArgGetterOpt(name) {
+    return function (cmd) {
+        return cmd.getOptionValue(name);
+    };
+}
+export function ArgParser(input) {
+    // eslint-disable-next-line
+    return function (value, previous) {
+        return coerceValue(value, input);
+    };
+}
+function genAbiCommandParams(abiFunc, params) {
+    const cmdArgs = [];
+    const cmdOpts = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const argGetters = [];
+    {
+        const pfn = params?.[`${abiFunc.name}.PREPEND`] ?? params?.[`.PREPEND`];
+        if (pfn) {
+            const argOrOpt = pfn();
+            if (argOrOpt instanceof Option) {
+                cmdOpts.push(argOrOpt);
+                argGetters.push(ArgGetterOpt(argOrOpt.name()));
+            }
+            else {
+                const newLen = cmdArgs.push(argOrOpt);
+                argGetters.push(ArgGetterArg(newLen - 1));
+            }
+        }
+    }
+    abiFunc.inputs.map((input) => {
+        const name = input.name;
+        const pfn = params?.[`${abiFunc.name}.${name}`] ?? params?.[`.${name}`] ?? (() => new Argument(`<${name}>`));
+        const argOrOpt = pfn();
+        if (!hasDescription(argOrOpt)) {
+            const desc = abiFunc._metadata?.params?.[name] || `parameter ${name}: ${input.type}`;
+            argOrOpt.description = desc;
+        }
+        if (!hasArgParser(argOrOpt)) {
+            argOrOpt.argParser(ArgParser(input));
+        }
+        if (argOrOpt instanceof Option) {
+            cmdOpts.push(argOrOpt);
+            argGetters.push(ArgGetterOpt(argOrOpt.name()));
+        }
+        else {
+            const newLen = cmdArgs.push(argOrOpt);
+            argGetters.push(ArgGetterArg(newLen - 1));
+        }
+    });
+    if (abiFunc.stateMutability == "view" || abiFunc.stateMutability == "pure") {
+        cmdOpts.push(universe, ...outputOptions);
+    }
+    else {
+        cmdOpts.push(...writeOptions, ...outputOptions);
+    }
+    return { cmdArgs, cmdOpts, argGetters };
+}
+function AbiCommandReadAction(abiFunc, argGetters, // eslint-disable-line @typescript-eslint/no-explicit-any
+contractGetter) {
+    return async function action() {
+        const opts = this.opts();
+        const console = new Logger(opts);
+        const { conf, publicClient } = FromOpts.toReadEthereum(opts);
+        const args0 = argGetters.map((getArg) => getArg(this));
+        const [address, args, altAbiFunc] = await contractGetter(conf, publicClient, args0, abiFunc.name);
+        const abiFuncFinal = altAbiFunc ?? abiFunc;
+        const abi = [abiFuncFinal, ...getNonFuncs()];
+        const result = await publicClient.readContract({ address, abi, functionName: abiFuncFinal.name, args });
+        console.log(result);
+        console.result(result);
+    };
+}
+function AbiCommandWriteAction(abiFunc, argGetters, prepare) {
+    return async function action() {
+        const opts = this.opts();
+        const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
+        const args0 = argGetters.map((getArg) => getArg(this));
+        const [address, args, altAbiFunc] = await prepare(conf, publicClient, args0, abiFunc.name);
+        const account = walletClient.account;
+        const abiFuncFinal = altAbiFunc ?? abiFunc;
+        const abi = [abiFuncFinal, ...getNonFuncs()];
+        const sim = { address, abi, functionName: abiFuncFinal.name, args, account };
+        await submitSimulation(sim, publicClient, walletClient, new Logger(opts));
+    };
+}
+function AbiCommandAction(abiFunc, argGetters, prepare) {
+    return abiFunc.stateMutability == "view" || abiFunc.stateMutability == "pure"
+        ? AbiCommandReadAction(abiFunc, argGetters, prepare)
+        : AbiCommandWriteAction(abiFunc, argGetters, prepare);
+}
+function hasArgParser(obj) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const anyObj = obj;
+    return typeof anyObj._fn === "function" || typeof anyObj._argParser === "function";
+}
+function hasDescription(argOrOpt) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return typeof argOrOpt.description === "string" && argOrOpt.description.trim().length > 0;
+}

package/dist/artifact.js

@@ -45,7 +45,7 @@ export function getCreationCode(artifact) {
 }
 /** Get ABI array from a Foundry/solc artifact JSON object. */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function getAbi(artifact) {
+export function getAbiFromArtifact(artifact) {
     const abi = artifact?.abi;
     if (!Array.isArray(abi))
         throw new Error("abi missing or not an array");

package/dist/cmds/kind.js

@@ -1,23 +1,34 @@
 import { Argument, Command, Option } from "commander";
-import { abi } from "../abi.js";
-import { getCommandGen, makeFuncName } from "../cmdgen.js";
+import { getAbi, getFuncs } from "../abi2.js";
 import { toHex } from "viem";
 import { coerceValue, readKindElements, toElementType, toRelationId } from "../utils.js";
 import { outputOptions, writeOptions } from "../commander-patch.js";
 import { submitSimulation } from "../ethereum.js";
 import { Logger } from "../logger.js";
 import { FromOpts } from "../from-opts.js";
-const genKindCmd = getCommandGen({
-    getFuncName: (cmdName) => makeFuncName(cmdName, `kind`),
-    getAbiFuncs: (funcName) => abi.funcs.kindRegistry.filter((i) => i.name == funcName),
-    // eslint-disable-next-line
-    getAbiNonFuncs: (funcName) => abi.nonFuncs.kindRegistry,
-    // eslint-disable-next-line
-    getContract: (conf, args, abiFunc) => conf.contracts.KindRegistry,
-});
+import { genAbiCommand } from "../abicmd.js";
+import { makeFuncName } from "../cmdgen.js";
 const registerCmd = genRegisterCmd();
 const updateCmd = genUpdateCmd();
-const otherCmds = "upgrade,touch,transfer,owner,descriptor,snapshot".split(",").map(genKindCmd);
+const cmdConfig = {
+    params: {
+        ".rev0": () => new Option(`--rev <rev0>`).default(0),
+        ".kindRev": () => new Option(`--krev <rev0>`).default(0),
+        ".setRev": () => new Option(`--srev <rev0>`).default(0),
+    },
+    // eslint-disable-next-line
+    prepare: (conf, client, args) => [
+        conf.contracts.KindRegistry,
+        args,
+        undefined,
+    ],
+};
+const abiFuncs = getFuncs("IKindRegistry");
+const otherCmds = "upgrade,touch,transfer,owner,descriptor,snapshot".split(",").map((name) => {
+    const funcName = makeFuncName(name, "kind");
+    const abiFunc = abiFuncs.filter((i) => i.name == funcName)[0];
+    return genAbiCommand(name, abiFunc, cmdConfig);
+});
 export const kindCmd = new Command("kind")
     .description("manage kinds")
     .addCommand(registerCmd)
@@ -25,8 +36,7 @@ export const kindCmd = new Command("kind")
     .addCommands(otherCmds);
 function genRegisterCmd() {
     const funcName = "kindRegister";
-    const abiFuncs = abi.funcs.kindRegistry.filter((i) => i.name == funcName);
-    const abiNonFuncs = abi.nonFuncs.kindRegistry;
+    const abiFuncs = getFuncs("IKindRegistry").filter((i) => i.name == funcName);
     const code = new Argument("<code>", "Matter hash of the kind code");
     const data = new Argument("<data>", "Matter hash of the kind data");
     const etys = new Option("--elements <ety...>", "Element types");
@@ -56,7 +66,7 @@ function genRegisterCmd() {
         const account = walletClient.account;
         const simulation = {
             address,
-            abi: [...abiFuncs, ...abiNonFuncs],
+            abi: getAbi("IKindRegistry"),
             functionName: funcName,
             args,
             account,
@@ -70,9 +80,9 @@ function genRegisterCmd() {
         .action(getCmdAction);
 }
 function genUpdateCmd() {
-    const funcName = "kindUpdate";
-    const abiFuncs = abi.funcs.kindRegistry.filter((i) => i.name == funcName);
-    const abiNonFuncs = abi.nonFuncs.kindRegistry;
+    // const funcName = "kindUpdate";
+    // const abiFuncs = (abi.funcs.kindRegistry as AbiFunctionDoc[]).filter((i) => i.name == funcName);
+    // const abiNonFuncs = abi.nonFuncs.kindRegistry;
     const code = new Option("--code <code>", "Matter hash of the kind code");
     const data = new Option("--data <data>", "Matter hash of the kind data");
     const rels = new Option("--relations [rel...]", "IDs of relations supported");
@@ -83,22 +93,22 @@ function genUpdateCmd() {
         const opts = cmd.opts();
         const args = [cmd.args[0]];
         const ZERO32 = toHex(0, { size: 32 });
-        let sig;
+        // let sig;
         if (opts.relations) {
             if (opts.code || opts.data) {
-                sig = "kindUpdate(uint64,bytes32,bytes32,uint64[])";
+                // sig = "kindUpdate(uint64,bytes32,bytes32,uint64[])";
                 args.push(opts.code ?? ZERO32);
                 args.push(opts.data ?? ZERO32);
                 args.push(typeof opts.relations == "boolean" ? [] : opts.relations);
             }
             else {
-                sig = "kindUpdate(uint64,uint64[])";
+                // sig = "kindUpdate(uint64,uint64[])";
                 args.push(typeof opts.relations == "boolean" ? [] : opts.relations);
             }
         }
         else {
             if (opts.code || opts.data) {
-                sig = "kindUpdate(uint64,bytes32,bytes32)";
+                // sig = "kindUpdate(uint64,bytes32,bytes32)";
                 args.push(opts.code ?? ZERO32);
                 args.push(opts.data ?? ZERO32);
             }
@@ -106,18 +116,17 @@ function genUpdateCmd() {
                 throw new Error("");
             }
         }
-        const abiFunc = abiFuncs.filter((f) => f._metadata.signature == sig)[0];
-        return [args, abiFunc];
+        return args;
     }
     async function getCmdAction() {
         const opts = this.opts();
-        const [args, abiFunc] = getFuncArgs(this);
+        const args = getFuncArgs(this);
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const address = conf.contracts.KindRegistry;
         const account = walletClient.account;
         const simulation = {
             address,
-            abi: [abiFunc, ...abiNonFuncs],
+            abi: getAbi("IKindRegistry"),
             functionName: "kindUpdate",
             args,
             account,

package/dist/cmds/matter.js

@@ -1,13 +1,14 @@
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import "@polkadot/api-augment/substrate";
 import * as fs from "fs";
 import path from "path";
 import columify from "columnify";
 import { j11String, loadBinary, loadJson } from "../utils.js";
 import { submitTransaction } from "../substrate.js";
-import { network, universe } from "../commander-patch.js";
 import { Logger } from "../logger.js";
 import { compileEnumCsv, compilePermCsv, computeHash, parseFileSpec, specToInput, } from "../matter.js";
+const universe = new Option("-u, --universe <universe>", "Universe name");
+const network = new Option("-n, --network <network>", "Network name");
 const matterRegisterCmd = new Command("register")
     .description("Register matters")
     .argument("<files...>", "Paths of matter blob files")

package/dist/cmds/object.js

@@ -1,6 +1,7 @@
 import { Argument, Option, Command } from "commander";
-import { parseAbiItem, erc1155Abi, erc721Abi } from "viem";
-import { abi } from "../abi.js";
+import { parseAbi } from "viem";
+import { parseAbiItem } from "viem";
+import { getAbi, getNonFuncs } from "../abi2.js";
 import { submitSimulation } from "../ethereum.js";
 import { Logger } from "../logger.js";
 import { parseAddress, parseBigInt, parseEther, parseHexData, parseInt, parseNode3, parseNode4, parseSID, } from "../parsers.js";
@@ -11,6 +12,15 @@ const sidArg = new Argument("<sid>", "Object SID, in form of {set}.{id}").argPar
 const tailArg = new Argument("<tail>", "Tail object, in form of [[data.]grant.]set.id").argParser(parseNode4);
 const relArg = new Argument("<rel>", "Relation ID").argParser(parseBigInt);
 const headArg = new Argument("<head>", "Head object, in form of [grant.]set.id").argParser(parseNode3);
+const otherAbi = [
+    ...parseAbi([
+        "function mint(address to, address set, uint64 id, bytes memory data, bytes memory auth, uint32 policy) payable",
+        "function mint(address to, uint64 id0, bytes calldata data) payable",
+        "function relate(uint256 tail, uint64 rel, uint256 head)",
+        "function unrelate(uint256 tail, uint64 rel, uint256 head)",
+    ]),
+    ...getNonFuncs(),
+];
 export const objectCmd = new Command("object")
     .description("manage objects")
     .addCommand(genMintCmd())
@@ -37,11 +47,11 @@ function genUpgradeCmd() {
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const { set, id } = this.processedArgs[0];
         const address = await getSetContract(set, publicClient, conf);
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
         const functionName = "upgrade";
         const args = [id, opts.krev ?? 0, opts.srev ?? 0];
         const account = walletClient.account;
-        const simulation = { address, abi: abi_, functionName, args, account };
+        const abi = getAbi("ISet");
+        const simulation = { address, abi, functionName, args, account };
         await submitSimulation(simulation, publicClient, walletClient, new Logger(opts));
     }
     return new Command("upgrade")
@@ -58,11 +68,11 @@ function genTouchCmd() {
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const { set, id } = this.processedArgs[0];
         const address = await getSetContract(set, publicClient, conf);
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
         const functionName = "touch";
         const args = [id];
         const account = walletClient.account;
-        const simulation = { address, abi: abi_, functionName, args, account };
+        const abi = getAbi("ISet");
+        const simulation = { address, abi, functionName, args, account };
         await submitSimulation(simulation, publicClient, walletClient, new Logger(opts));
     }
     return new Command("touch").description("Touch an object").addArguments(cmdArgs).addOptions(cmdOpts).action(action);
@@ -75,11 +85,11 @@ function genTransferCmd() {
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const { set, id } = this.processedArgs[0];
         const address = await getSetContract(set, publicClient, conf);
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
         const functionName = "transfer";
         const args = [id, this.processedArgs[1]];
         const account = walletClient.account;
-        const simulation = { address, abi: abi_, functionName, args, account };
+        const abi = getAbi("ISet");
+        const simulation = { address, abi, functionName, args, account };
         await submitSimulation(simulation, publicClient, walletClient, new Logger(opts));
     }
     return new Command("transfer")
@@ -113,7 +123,7 @@ function genMintCmd() {
         if (!opts.minter) {
             const address = await getSetContract(set, publicClient, conf);
             const args = [to, id, data];
-            simulation = { address, abi: abi.setMint, functionName, args, value, account };
+            simulation = { address, abi: otherAbi, functionName, args, value, account };
         }
         else {
             const setAddress = await getSetContract(set, publicClient, conf);
@@ -121,7 +131,14 @@ function genMintCmd() {
             const authData = opts.auth ?? "0x";
             const policy = opts.policy ?? 0;
             const args = [to, setAddress, id, data, authData, policy];
-            simulation = { address, abi: abi.minterMint, functionName, args, value, account };
+            simulation = {
+                address,
+                abi: otherAbi,
+                functionName,
+                args,
+                value,
+                account,
+            };
         }
         await submitSimulation(simulation, publicClient, walletClient, new Logger(opts));
     }
@@ -145,7 +162,7 @@ function genSendCmd() {
             throw new Error(`Not a function signature: ${sig}`);
         const abiFunc = item;
         const params = abiFunc.inputs ?? [];
-        const args0 = this.args.slice(0);
+        const args0 = this.args.slice(1);
         if (args0.length !== params.length)
             throw new Error(`Invalid argument count: expected ${params.length}, got ${args0.length}`);
         const sidPos = params.findIndex((p) => p.type == "uint64");
@@ -160,7 +177,7 @@ function genSendCmd() {
         const value = opts.value ?? 0;
         const simulation = {
             address,
-            abi: [abiFunc, ...abi.nonFuncs.setContract, ...erc1155Abi, ...erc721Abi],
+            abi: [abiFunc, ...getNonFuncs()],
             functionName: abiFunc.name,
             args,
             account,
@@ -184,8 +201,8 @@ function genOwnerCmd() {
         const { conf, publicClient } = FromOpts.toReadEthereum(opts);
         const address = await getSetContract(set, publicClient, conf);
         const args = [id];
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
-        const result = await publicClient.readContract({ address, abi: abi_, functionName: cmdName, args });
+        const abi = getAbi("ISet");
+        const result = await publicClient.readContract({ address, abi, functionName: cmdName, args });
         const console = new Logger(opts);
         console.log(result);
         console.result(result);
@@ -206,8 +223,8 @@ function genDescriptorCmd() {
         const { conf, publicClient } = FromOpts.toReadEthereum(opts);
         const address = await getSetContract(set, publicClient, conf);
         const args = [id, opts.rev ?? 0];
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
-        const result = await publicClient.readContract({ address, abi: abi_, functionName: cmdName, args });
+        const abi = getAbi("ISet");
+        const result = await publicClient.readContract({ address, abi, functionName: cmdName, args });
         const console = new Logger(opts);
         console.log(result);
         console.result(result);
@@ -232,8 +249,8 @@ function genSnapshotCmd() {
         const { conf, publicClient } = FromOpts.toReadEthereum(opts);
         const address = await getSetContract(set, publicClient, conf);
         const args = [id, opts.rev ?? 0];
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
-        const result = await publicClient.readContract({ address, abi: abi_, functionName: cmdName, args });
+        const abi = getAbi("ISet");
+        const result = await publicClient.readContract({ address, abi, functionName: cmdName, args });
         const console = new Logger(opts);
         console.log(result);
         console.result(result);
@@ -258,10 +275,10 @@ function genUriCmd() {
         const { conf, publicClient } = FromOpts.toReadEthereum(opts);
         const address = await getSetContract(set, publicClient, conf);
         const args = []; // eslint-disable-line @typescript-eslint/no-explicit-any
-        const abi_ = [...abi.funcs.setContract, ...abi.nonFuncs.setContract];
+        const abi = getAbi("ISet");
         const result0 = (await publicClient.readContract({
             address,
-            abi: abi_,
+            abi,
             functionName: cmdName,
             args,
         })); // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -280,7 +297,7 @@ function genRelateCmd() {
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const simulation = {
             address: conf.contracts.OmniRegistry,
-            abi: abi.relation,
+            abi: otherAbi,
             functionName: "relate",
             args: this.processedArgs,
             account: walletClient.account,
@@ -302,7 +319,7 @@ function genUnrelateCmd() {
         const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
         const simulation = {
             address: conf.contracts.OmniRegistry,
-            abi: abi.relation,
+            abi: otherAbi,
             functionName: "unrelate",
             args: this.processedArgs,
             account: walletClient.account,
@@ -320,9 +337,10 @@ function interpolate(tmpl, id, rev) {
     return tmpl.replace(/\{id\}/g, String(id)).replace(/\{rev\}/g, String(rev));
 }
 async function getSetContract(set, publicClient, conf) {
+    const abi = getAbi("ISetRegistry");
     const address = await publicClient.readContract({
         address: conf.contracts.SetRegistry,
-        abi: abi.setContract,
+        abi,
         functionName: "setContract",
         args: [set],
     });

package/dist/cmds/set.js

@@ -1,41 +1,81 @@
 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 { getAbiFromArtifact, 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),
-    // eslint-disable-next-line
-    getAbiNonFuncs: (funcName) => abi.nonFuncs.setRegistry,
-    // eslint-disable-next-line
-    getContract: (conf, args, abiFunc) => args[0],
-    // eslint-disable-next-line
-    getFuncArgs: (args, abiFunc) => args.slice(1),
-    getCmdArgs: (abiFunc) => [
-        new Argument(`<contract>`, "address of the set contract"),
-        ...CommandGenDefaults.getCmdArgs(abiFunc),
-    ],
-};
-const userCmdConfig = {
-    getFuncName: (cmdName) => makeFuncName(cmdName, `set`),
-    getAbiFuncs: (funcName) => abi.funcs.setRegistry.filter((i) => i.name == funcName),
-    // eslint-disable-next-line
-    getAbiNonFuncs: (funcName) => abi.nonFuncs.setRegistry,
+import { genAbiCommand } from "../abicmd.js";
+import { getFuncs, getAbi } from "../abi2.js";
+import { parseAddress } from "../parsers.js";
+import { makeFuncName } from "../cmdgen.js";
+const abiFuncs = getFuncs("ISetRegistry");
+const abiFuncsAdmin = getFuncs("SetRegistryAdmin");
+async function getAbc(conf, client, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+args, id, altFuncName
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
+    if (id >= 17) {
+        const addr = await getSetContract(id, client, conf);
+        return [addr, args, undefined];
+    }
+    else {
+        const abiFunc = abiFuncs.filter((i) => i.name == altFuncName)[0];
+        return [conf.contracts.SetRegistry, args, abiFunc];
+    }
+}
+const cmdConfig = {
+    descs: {
+        upgradeSet: "Upgrade an existing set",
+    },
+    params: {
+        ".rev0": () => new Option(`--rev <rev0>`).default(0),
+        ".krev0": () => new Option(`--krev <rev0>`).default(0),
+        ".krev": () => new Option(`--krev <rev0>`).default(0),
+        ".srev0": () => new Option(`--srev <rev0>`).default(0),
+        ".srev": () => new Option(`--srev <rev0>`).default(0),
+        ".kindRev": () => new Option(`--krev <rev0>`).default(0),
+        ".setRev": () => new Option(`--srev <rev0>`).default(0),
+        ".kindRev0": () => new Option(`--krev <rev0>`, "New kind revision").default(0),
+        ".setRev0": () => new Option(`--srev <rev0>`, "New set revision").default(0),
+        "registerSet.PREPEND": () => new Argument(`<contract>`, "Contract address").argParser(parseAddress),
+    },
     // eslint-disable-next-line
-    getContract: (conf, args, abiFunc) => conf.contracts.SetRegistry,
+    prepare: async (conf, client, args, funcName) => {
+        if (funcName == "registerSet") {
+            return [args[0], args.slice(1), undefined];
+        }
+        else if (funcName == "updateSet") {
+            return await getAbc(conf, client, args, args[0], "setUpdate");
+        }
+        else if (funcName == "upgradeSet") {
+            return await getAbc(conf, client, args, args[0], "setUpgrade");
+        }
+        else if (funcName == "touchSet") {
+            return await getAbc(conf, client, args, args[0], "setTouch");
+        }
+        else {
+            return [conf.contracts.SetRegistry, args, undefined];
+        }
+    },
 };
-const userCmds = "owner,descriptor,snapshot".split(",");
-const adminCmds = "register,update,upgrade,touch".split(",");
+const adminCmds = "register,update,upgrade,touch".split(",").map((name) => {
+    const funcName = `${name}Set`;
+    const abiFunc = abiFuncsAdmin.filter((i) => i.name == funcName)[0];
+    return genAbiCommand(name, abiFunc, cmdConfig);
+});
+const readCmds = "owner,descriptor,snapshot".split(",").map((name) => {
+    const funcName = makeFuncName(name, "set");
+    const abiFunc = abiFuncs.filter((i) => i.name == funcName)[0];
+    return genAbiCommand(name, abiFunc, cmdConfig);
+});
 const deployCmd = genDeployCmd();
 export const setCmd = new Command("set")
     .description("manage sets")
     .addCommand(deployCmd)
-    .addCommands(adminCmds.map(getCommandGen(adminCmdConfig)))
-    .addCommands(userCmds.map(getCommandGen(userCmdConfig)));
+    // .addCommands(adminCmds.map(getCommandGen(adminCmdConfig)))
+    .addCommands(adminCmds)
+    .addCommands(readCmds);
 function genDeployCmd() {
     const cmdArgs = [
         new Argument(`<artifact>`, "Artifact path of the contract"),
@@ -51,7 +91,7 @@ function genDeployCmd() {
         const artifactInfo = getArtifactPath(cmd.args[0], opts.artifactDir);
         const userArgs = cmd.args.slice(1);
         const artifact = loadJson(artifactInfo.file);
-        const abi = getAbi(artifact);
+        const abi = getAbiFromArtifact(artifact);
         const bytecode = getCreationCode(artifact);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const ctor = abi.find((i) => i.type === "constructor");
@@ -104,8 +144,18 @@ function genDeployCmd() {
         console.result(result);
     }
     return new Command("deploy")
-        .description("Deploy a contract")
+        .description("Deploy a set contract")
         .addOptions(cmdOpts)
         .addArguments(cmdArgs)
         .action(action);
 }
+async function getSetContract(set, publicClient, conf) {
+    const abi = getAbi("ISetRegistry");
+    const address = await publicClient.readContract({
+        address: conf.contracts.SetRegistry,
+        abi,
+        functionName: "setContract",
+        args: [set],
+    });
+    return address;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@everyprotocol/every-cli",
   "type": "module",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/everyprotocol/cli.git"
@@ -9,6 +9,7 @@
   "files": [
     "dist/",
     "abis/",
+    "abis2/",
     ".every.toml",
     "LICENSE",
     "README.md"