@everyprotocol/every-cli 0.1.3 → 0.1.5

package/.every.toml

@@ -1,8 +1,8 @@
 [universes.anvil]
 id = 31337
-rpc = "http://127.0.0.1:8545"
-explorer = "http://127.0.0.1:8545"
-observer = "localnet"
+rpc = "http://localhost:8545"
+observer = "dev"
+explorer = "http://localhost"
 
 [universes.anvil.contracts]
 SetRegistry = "0x854C35Fd2b65fE9fcE71dddE91De8c3e1A7Dc8Ae"
@@ -11,7 +11,7 @@ KindRegistry = "0x7A8B3E5A9c227858C5917b7de8ba1684Cd868630"
 ElementRegistry = "0x8De1EE1dbAE2Ffd1CAe1e6bA83E6cAede1461507"
 ObjectMinter = "0x12CaBC370b316F247126F3Fab529Ee25e03aE226"
 
-[observers.localnet]
+[observers.dev]
 rpc = "ws://localhost:9944"
-gateway = "http://every.im.local"
-explorer = "http://every.im.local"
+gateway = "http://every.lo"
+explorer = "https://portal.every.fun/?rpc=ws://localhost:9944#/explorer"

package/dist/abi.js

@@ -11,6 +11,7 @@ export const abi = {
         omniRegistry: loadNonFuncAbiItems("OmniRegistry"),
         kindRegistry: loadNonFuncAbiItems("KindRegistry"),
         setRegistry: loadNonFuncAbiItems("SetRegistry"),
+        setContract: loadNonFuncAbiItems("ISet"),
     },
     funcs: {
         kindRegistry: loadFuncAbiItems("IKindRegistry"),

package/dist/cmdgen.js

@@ -1,144 +1,56 @@
+import { Argument, Command } from "commander";
 import { createPublicClient, http } from "viem";
-import { configureCommand } from "./cmds.js";
-import JSON5 from "json5";
-import { rstrip, excludes, includes, lstrip, startsWith, checkArguments } from "./utils.js";
-import { replaceAbiParamAt, insertAbiParamAt, abi } from "./abi.js";
-import { genMintCommand } from "./mint.js";
-import { genRelateCommand, genUnrelateCommand } from "./relate.js";
-export function generateCommands() {
-    const kind = abi.funcs.kindRegistry
-        .map(AbiToCommand({ contract: "KindRegistry", nonFuncs: abi.nonFuncs.kindRegistry, cmdName: lstrip("kind") }))
-        .sort(byPreferredOrder);
-    const set = [
-        ...abi.funcs.setRegistryAdmin.map(AbiToCommand(setRegistryAdminCmdConfig)),
-        ...abi.funcs.setRegistry
-            .filter(excludes(["setRegister", "setUpdate", "setTouch", "setUpgrade"]))
-            .map(AbiToCommand({ contract: "SetRegistry", nonFuncs: abi.nonFuncs.setRegistry, cmdName: lstrip("set") })),
-    ].sort(byPreferredOrder);
-    const relation = abi.funcs.omniRegistry
-        .filter(startsWith("relation"))
-        .map(AbiToCommand({
-        contract: "OmniRegistry",
-        nonFuncs: abi.nonFuncs.omniRegistry,
-        cmdName: lstrip("relation"),
-    }))
-        .sort(byPreferredOrder);
-    const unique = abi.funcs.elemRegistry
-        .filter(startsWith("unique"))
-        .map(AbiToCommand({ contract: "ElementRegistry", nonFuncs: abi.nonFuncs.elemRegistry, cmdName: lstrip("unique") }))
-        .sort(byPreferredOrder);
-    const value = abi.funcs.elemRegistry
-        .filter(startsWith("value"))
-        .map(AbiToCommand({ contract: "ElementRegistry", nonFuncs: abi.nonFuncs.elemRegistry, cmdName: lstrip("value") }))
-        .sort(byPreferredOrder);
-    const object = [
-        genMintCommand(),
-        genRelateCommand(),
-        genUnrelateCommand(),
-        // write functions
-        ...abi.funcs.setContract
-            .filter(includes("update,upgrade,touch,transfer".split(",")))
-            .map(AbiToCommand(setContractObjectCmdConfig)),
-        // read functions
-        ...abi.funcs.setContract
-            .filter(excludes("update,upgrade,touch,transfer,uri,supportsInterface".split(",")))
-            .map(AbiToCommand(setContractObjectCmdConfig)),
-        ...abi.funcs.setContract
-            .filter(includes("uri".split(",")))
-            .map(AbiToCommand({ ...setContractObjectCmdConfig, txnPrepare: objectUriTxnPrepare })),
-    ].sort(byPreferredOrder);
-    const mintpolicy = [
-        ...abi.funcs.objectMinterAdmin.map(AbiToCommand(objectMinterAdminCmdConfig)),
-        ...abi.funcs.objectMinter
-            .filter(startsWith("mintPolicy"))
-            .filter(excludes("mintPolicyAdd,mintPolicyEnable,mintPolicyDisable".split(",")))
-            .map(AbiToCommand({ contract: "ObjectMinter", nonFuncs: abi.nonFuncs.objectMinter, cmdName: lstrip("mintPolicy") })),
-    ].sort(byPreferredOrder);
-    return { kind, set, relation, unique, value, mintpolicy, object };
-}
-const setContractObjectCmdConfig = {
-    contract: "ISet",
-    nonFuncs: [],
-    cmdAbi: function (txnAbi) {
-        return replaceAbiParamAt(txnAbi, 0, {
-            name: "sid",
-            type: "string",
-            doc: "Scoped Object ID (in form of set.id, e.g., 17.1)",
-        });
-    },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    txnPrepare: async function (ctx) {
-        const rawArgs = checkArguments(ctx.cmd.args, ctx.cmdAbi);
-        const [set, id] = rawArgs[0].split(".");
-        const args = [JSON5.parse(id), ...rawArgs.slice(1)];
-        const publicClient = createPublicClient({ transport: http(ctx.conf.rpc) });
-        const address = (await publicClient.readContract({
-            address: ctx.conf.contracts["SetRegistry"],
-            abi: abi.setContract,
-            functionName: "setContract",
-            args: [set],
-        }));
-        return { address: address, tag: ctx.contract, args };
-    },
-};
-const objectUriTxnPrepare = async function (ctx) {
-    const rawArgs = checkArguments(ctx.cmd.args, ctx.cmdAbi);
-    // const [set, id] = rawArgs[0].split(".");
-    const set = rawArgs[0].split(".")[0];
-    const publicClient = createPublicClient({ transport: http(ctx.conf.rpc) });
-    const address = (await publicClient.readContract({
-        address: ctx.conf.contracts["SetRegistry"],
-        abi: abi.setContract,
-        functionName: "setContract",
-        args: [set],
-    }));
-    return { address: address, tag: ctx.contract, args: [] };
+import { submitSimulation } from "./ethereum.js";
+import { Logger } from "./logger.js";
+import { outputOptions, universe, writeOptions } from "./commander-patch.js";
+import { FromOpts } from "./from-opts.js";
+import { coerceValue } from "./utils.js";
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getReadAction = (config, funName, abiFunc, abi) => async function readAction() {
+    const opts = this.opts();
+    const conf = FromOpts.getUniverseConfig(opts);
+    const address = await config.getContract(conf, this.processedArgs, abiFunc);
+    const args = (config.getFuncArgs ?? CommandGenDefaults.getFuncArgs)(this.processedArgs, abiFunc);
+    const console = new Logger(opts);
+    const publicClient = createPublicClient({ transport: http(conf.rpc) });
+    const result = await publicClient.readContract({ address, abi, functionName: funName, args });
+    console.log(result);
+    console.result(result);
 };
-const setRegistryAdminCmdConfig = {
-    contract: "ISetRegistryAdmin",
-    nonFuncs: abi.nonFuncs.setRegistry,
-    cmdName: rstrip("Set"),
-    cmdAbi: function (txnAbi) {
-        return insertAbiParamAt(txnAbi, 0, {
-            name: "contract",
-            type: "address",
-            doc: "address of the set contract",
-        });
-    },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    txnPrepare: async function (ctx) {
-        const raw = checkArguments(ctx.cmd.args, ctx.cmdAbi);
-        const address = raw[0];
-        const args = raw.slice(1);
-        return { address, tag: ctx.contract, args };
-    },
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getWriteAction = (config, funcName, abiFunc, abi) => async function writeAction() {
+    const opts = this.opts();
+    const args = (config.getFuncArgs ?? CommandGenDefaults.getFuncArgs)(this.args, abiFunc);
+    const { publicClient, walletClient, conf } = await FromOpts.toWriteEthereum(opts);
+    const address = config.getContract(conf, this.args, abiFunc);
+    const account = walletClient.account;
+    const simulation = { address, abi, functionName: funcName, args, account };
+    await submitSimulation(simulation, publicClient, walletClient, new Logger(opts));
 };
-const objectMinterAdminCmdConfig = {
-    contract: "IObjectMinterAdmin",
-    nonFuncs: abi.nonFuncs.objectMinter,
-    cmdName: rstrip("MintPolicy"),
-    cmdAbi: function (txnAbi) {
-        return insertAbiParamAt(txnAbi, 0, {
-            name: "contract",
-            type: "address",
-            doc: "address of the contract",
-        });
-    },
-    txnPrepare: async function (ctx) {
-        const raw = checkArguments(ctx.cmd.args, ctx.cmdAbi);
-        const address = raw[0];
-        const args = raw.slice(1);
-        return { address, tag: ctx.contract, args };
-    },
+export const getCommandGen = (config) => function genCmd(cmdName) {
+    const { getFuncName, getAbiFuncs, getAbiNonFuncs } = config;
+    const funcName = getFuncName(cmdName);
+    const abiFuncs = getAbiFuncs(funcName);
+    const abiNonFuncs = getAbiNonFuncs(funcName);
+    // console.log(funcName, abiFuncs);
+    const abiFuncDoc = abiFuncs[0];
+    const description = abiFuncDoc._metadata?.notice || "";
+    const isRead = abiFuncDoc.stateMutability == "view" || abiFuncDoc.stateMutability == "pure";
+    const options = isRead ? [universe, ...outputOptions] : [...writeOptions, ...outputOptions];
+    const args = (config.getCmdArgs ?? CommandGenDefaults.getCmdArgs)(abiFuncDoc);
+    const abiContract = [...abiFuncs, ...abiNonFuncs];
+    const action = isRead
+        ? getReadAction(config, funcName, abiFuncDoc, abiContract)
+        : getWriteAction(config, funcName, abiFuncDoc, abiContract);
+    return new Command(cmdName).description(description).addOptions(options).addArguments(args).action(action);
 };
-function AbiToCommand(conf) {
-    return (txnAbi) => configureCommand(txnAbi, conf);
-}
-function byPreferredOrder(a, b) {
-    const ORDER_MAP = new Map("mint,register,update,upgrade,touch,transfer,relate,unrelate,owner,descriptor,elements,revision,sota,snapshot,status,admint,contract,rule,uri"
-        .split(",")
-        .map((name, index) => [name, index]));
-    const aIndex = ORDER_MAP.get(a.name()) ?? Infinity;
-    const bIndex = ORDER_MAP.get(b.name()) ?? Infinity;
-    return aIndex - bIndex;
+export function makeFuncName(cmdName, prefix) {
+    return `${prefix}${cmdName[0].toUpperCase()}${cmdName.slice(1)}`;
 }
+export const CommandGenDefaults = {
+    getFuncArgs: (args, abiFunc) => args.map((arg, i) => coerceValue(arg, abiFunc.inputs[i])),
+    getCmdArgs: (abiFunc) => abiFunc.inputs.map((input) => {
+        const desc = abiFunc._metadata?.params?.[input.name] || `${input.type} parameter`;
+        return new Argument(`<${input.name}>`, desc);
+    }),
+};

package/dist/cmds/balance.js

@@ -0,0 +1,43 @@
+import { Command } from "commander";
+import "@polkadot/api-augment/substrate";
+import * as JSON11 from "json11";
+import columify from "columnify";
+import { u8aFixLength } from "@polkadot/util";
+import { decodeAddress } from "@polkadot/util-crypto";
+import { submitSubTxUI } from "../substrate.js";
+import { network } from "../commander-patch.js";
+import { Logger } from "../logger.js";
+const balanceQueryCmd = new Command("query")
+    .description("Query account balance")
+    .argument("<address>", "Account address (SS58 or 0x hex)")
+    .addOption(network)
+    .addOutputOptions()
+    .subReadAction(async function (api, address) {
+    const accountId = u8aFixLength(decodeAddress(address), 256);
+    const accountInfo = (await api.query.system.account(accountId));
+    const symbol = api.registry.chainTokens[0];
+    const free = accountInfo.data.free.toBigInt();
+    const reserved = accountInfo.data.reserved.toBigInt();
+    const frozen = accountInfo.data.frozen.toBigInt();
+    const balance = { free, reserved, frozen };
+    const result = { address, symbol, balance };
+    const console = new Logger(this.opts());
+    console.log(columify([[symbol, JSON11.stringify(balance)]], { showHeaders: false }));
+    console.result(result);
+});
+const balanceTransferCmd = new Command("transfer")
+    .description("Transfer balance to account")
+    .argument("<address>", "Recipient account address (SS58 or 0x hex)")
+    .argument("<amount>", "Amount in base units")
+    .addOption(network)
+    .addKeystoreOptions()
+    .addOutputOptions()
+    .subWriteAction(async function (api, pair, address, amount) {
+    const tx = api.tx.balances.transferKeepAlive(address, amount);
+    const console = new Logger(this.opts());
+    await submitSubTxUI(api, tx, pair, console);
+});
+export const balanceCmd = new Command("balance")
+    .description("manage balances")
+    .addCommand(balanceQueryCmd)
+    .addCommand(balanceTransferCmd);

package/dist/cmds/config.js

@@ -0,0 +1,46 @@
+import { Command } from "commander";
+import { _loadMergedConfig } from "../config.js";
+const configShowCmd = new Command("show")
+    .description("show mreged configuration")
+    .option("-u, --universe <universe>", "Show config of this universe only")
+    .option("-n, --network <network>", "Show config of this network only")
+    .action(async (opts) => {
+    const [config] = _loadMergedConfig();
+    const universe = opts.universe
+        ? (config.universes?.[opts.universe] ??
+            (() => {
+                throw new Error(`config for universe ${opts.universe} not found`);
+            })())
+        : undefined;
+    const network = opts.network
+        ? (config.observers?.[opts.network] ??
+            (() => {
+                throw new Error(`config for network ${opts.network} not found`);
+            })())
+        : undefined;
+    let result;
+    if (universe && !network) {
+        result = universe;
+    }
+    else if (network && !universe) {
+        result = network;
+    }
+    else if (universe && network) {
+        result = {
+            [opts.universe]: universe,
+            [opts.network]: network,
+        };
+    }
+    else {
+        result = config;
+    }
+    console.log(JSON.stringify(result, null, 2));
+});
+const configFilesCmd = new Command("files").description("list configuration files searched").action(async () => {
+    const [, files] = _loadMergedConfig();
+    files.forEach((f) => console.log(f));
+});
+export const configCmd = new Command("config")
+    .description("view merged configuration and source files")
+    .addCommand(configShowCmd)
+    .addCommand(configFilesCmd);

package/dist/cmds/kind.js

@@ -0,0 +1,14 @@
+import { Command } from "commander";
+import { abi } from "../abi.js";
+import { getCommandGen, makeFuncName } from "../cmdgen.js";
+const cmdGenConfig = {
+    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,
+};
+const cmdGen = getCommandGen(cmdGenConfig);
+const subCmds = "register,upgrade,touch,transfer,owner,descriptor,snapshot".split(",");
+export const kindCmd = new Command("kind").description("manage kinds").addCommands(subCmds.map(cmdGen));