@sage-protocol/cli 0.8.2 → 0.8.4

package/dist/cli/commands/multiplier.js

@@ -52,6 +52,10 @@ const AUCTION_ABI = [
   'function settleCurrentAndCreateNewAuction()'
 ];
 
+const SUBDAO_ABI = [
+  'function governor() view returns (address)'
+];
+
 const TOKEN_ABI = [
   'function name() view returns (string)',
   'function symbol() view returns (string)',
@@ -61,10 +65,38 @@ const TOKEN_ABI = [
 ];
 
 function getProvider() {
-  const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+  const rpcUrl = cliConfig.resolveRpcUrl({ allowEnv: true });
   return new ethers.JsonRpcProvider(rpcUrl);
 }
 
+/**
+ * Resolve a Governor address from a SubDAO or Governor address.
+ * If the address is a SubDAO, calls governor() to get the Governor.
+ * If the address is already a Governor, returns it directly.
+ */
+async function resolveGovernorAddress(address, provider) {
+  const normalized = ethers.getAddress(address);
+  // Try calling governor() - if it works, the address is a SubDAO
+  try {
+    const subdao = new ethers.Contract(normalized, SUBDAO_ABI, provider);
+    const governorAddr = await subdao.governor();
+    if (governorAddr && governorAddr !== ethers.ZeroAddress) {
+      return { governor: governorAddr, subdao: normalized, isSubDAO: true };
+    }
+  } catch (_) {
+    // Not a SubDAO or doesn't have governor() - assume it's a Governor
+  }
+
+  // Verify governor interface before returning
+  try {
+    const gov = new ethers.Contract(normalized, GOVERNOR_ABI, provider);
+    await gov.token();
+    return { governor: normalized, subdao: null, isSubDAO: false };
+  } catch (err) {
+    throw new Error(`Address ${normalized} is not a SubDAO or Governor. Use --gov for governor address or --subdao for SubDAO.`);
+  }
+}
+
 async function resolveAccountAddress(address) {
   if (address) return address;
 
@@ -92,11 +124,21 @@ function register(program) {
   addDAOAddressOptions(statusCmd);
   statusCmd.action(async (options) => {
     try {
-      const governorAddr = resolveDAOAddress(options, { required: true });
+      const inputAddr = resolveDAOAddress(options, { required: true });
       const provider = getProvider();
-      const governor = new ethers.Contract(governorAddr, GOVERNOR_ABI, provider);
 
-      ui.info(`Checking multiplier status for governor: ${governorAddr}`);
+      // Auto-resolve Governor from SubDAO if needed
+      const resolved = await resolveGovernorAddress(inputAddr, provider);
+      const governorAddr = resolved.governor;
+
+      if (resolved.isSubDAO) {
+        ui.info(`SubDAO detected: ${inputAddr}`);
+        ui.info(`Resolved Governor: ${governorAddr}`);
+      } else {
+        ui.info(`Checking multiplier status for governor: ${governorAddr}`);
+      }
+
+      const governor = new ethers.Contract(governorAddr, GOVERNOR_ABI, provider);
 
       // Check if multipliers are enabled
       const isEnabled = await governor.isMultiplierEnabled().catch(() => false);
@@ -158,30 +200,44 @@ function register(program) {
   // Build calculate command
   const calculateCmd = new Command('calculate')
     .description('Show voting power breakdown for an account')
-    .argument('[address]', 'Account address (defaults to connected wallet)');
+    .argument('[address]', 'Account address (defaults to connected wallet)')
+    .option('--json', 'Output JSON', false);
   addDAOAddressOptions(calculateCmd);
   calculateCmd.action(async (address, options) => {
     try {
-      const governorAddr = resolveDAOAddress(options, { required: true });
+      const inputAddr = resolveDAOAddress(options, { required: true });
       const account = await resolveAccountAddress(address);
       if (!account) {
         throw new Error('No address provided. Pass an address or connect a wallet.');
       }
 
       const provider = getProvider();
+
+      // Auto-resolve Governor from SubDAO if needed
+      const resolved = await resolveGovernorAddress(inputAddr, provider);
+      const governorAddr = resolved.governor;
+
       const governor = new ethers.Contract(governorAddr, GOVERNOR_ABI, provider);
 
-      ui.output('\nVoting Power Breakdown');
-      ui.keyValue({
-        'Account': account,
-        'Governor': governorAddr
-      });
+      if (!options.json) {
+        ui.output('\nVoting Power Breakdown');
+        const displayInfo = { 'Account': account };
+        if (resolved.isSubDAO) {
+          displayInfo['SubDAO'] = resolved.subdao;
+          displayInfo['Governor'] = governorAddr;
+        } else {
+          displayInfo['Governor'] = governorAddr;
+        }
+        ui.keyValue(displayInfo);
+      }
 
       // Check if multipliers are enabled
       const isEnabled = await governor.isMultiplierEnabled().catch(() => false);
       const votingToken = await governor.token();
+      const baseVotesToken = await governor.baseVotesToken().catch(() => null);
+      const isWrapperMode = isEnabled || (baseVotesToken && baseVotesToken.toLowerCase() !== votingToken.toLowerCase());
 
-      if (!isEnabled) {
+      if (!isWrapperMode) {
         // Simple ERC20Votes - no multiplier
         const token = new ethers.Contract(votingToken, TOKEN_ABI, provider);
         const [name, symbol, decimals, balance, votes] = await Promise.all([
@@ -192,6 +248,22 @@ function register(program) {
           token.getVotes(account)
         ]);
 
+        if (options.json) {
+          ui.json({
+            ok: true,
+            account,
+            governor: governorAddr,
+            token: votingToken,
+            name,
+            symbol,
+            decimals,
+            balance: balance.toString(),
+            votingPower: votes.toString(),
+            multiplier: '1x'
+          });
+          return;
+        }
+
         ui.output(`\n${name} (${symbol})`);
         ui.keyValue({
           'Balance': `${ethers.formatUnits(balance, decimals)}`,
@@ -203,7 +275,7 @@ function register(program) {
 
       // Multiplied votes - get breakdown
       const multipliedVotes = new ethers.Contract(votingToken, MULTIPLIED_VOTES_ABI, provider);
-      const baseTokenAddr = await multipliedVotes.baseToken();
+      const baseTokenAddr = baseVotesToken || await multipliedVotes.baseToken();
       const nftAddr = await multipliedVotes.multiplierNFT();
       const basis = await multipliedVotes.BASIS();
 
@@ -221,6 +293,22 @@ function register(program) {
       const baseDisplay = ethers.formatUnits(baseVotes, decimals);
       const effectiveDisplay = ethers.formatUnits(effectiveVotes, decimals);
 
+      if (options.json) {
+        ui.json({
+          ok: true,
+          account,
+          governor: governorAddr,
+          baseToken: baseTokenAddr,
+          votingToken,
+          baseVotes: baseVotes.toString(),
+          multiplier: multiplier.toString(),
+          multiplierDisplay: multDisplay,
+          effectiveVotes: effectiveVotes.toString(),
+          hasBonus: !!hasBonus
+        });
+        return;
+      }
+
       ui.output(`\n${name} (${symbol}) with NFT Multipliers`);
       ui.keyValue({
         'Base Votes': `${baseDisplay} ${symbol}`,

package/dist/cli/commands/nft.js

@@ -176,9 +176,10 @@ Automation:
     .option('--dao <address>', 'DAO address (auto-detected from context if not provided)')
     .option('--account <address>', 'Account to check (default: your wallet)')
     .option('-v, --verbose', 'Show detailed output')
+    .option('--json', 'Output JSON', false)
     .action(async (opts) => {
       try {
-        ui.configure({ verbose: opts.verbose });
+        ui.configure({ verbose: opts.verbose, json: opts.json });
         const rpcUrl = cliConfig.resolveRpcUrl();
         const provider = new ethers.JsonRpcProvider(rpcUrl);
         const nftAddr = cliConfig.resolveAddress('VOTING_MULTIPLIER_NFT_ADDRESS');
@@ -208,6 +209,18 @@ Automation:
         const multiplier = await contract.getMultiplier(account, daoAddr);
         const multiplierDisplay = (Number(multiplier) / 10000).toFixed(4);
 
+        if (opts.json) {
+          ui.json({
+            ok: true,
+            account,
+            dao: daoAddr,
+            nft: nftAddr,
+            multiplier: multiplier.toString(),
+            multiplierDisplay: `${multiplierDisplay}x`
+          });
+          return;
+        }
+
         ui.header(`Voting Multiplier for ${ui.formatAddress(account)}`);
         ui.keyValue([
           ['DAO', ui.formatAddress(daoAddr)],
@@ -269,10 +282,10 @@ Automation:
           throw new Error('Multiplier must be >= 100 (100 = 1x)');
         }
 
-        // Build calldata for createTier
+        // Build calldata for governance-safe createTierViaGovernance
         const abi = resolveArtifact('contracts/VotingMultiplierNFT.sol/VotingMultiplierNFT.json').abi;
         const iface = new ethers.Interface(abi);
-        const calldata = iface.encodeFunctionData('createTier', [
+        const calldata = iface.encodeFunctionData('createTierViaGovernance', [
           daoAddr,
           String(opts.name),
           BigInt(multiplier),

package/dist/cli/commands/prompt.js

@@ -105,7 +105,7 @@ async function fetchPlatformPrompts(opts = {}) {
 
   if (opts.search) {
     params.set('q', opts.search);
-    const { body } = await client._fetchJson(`/discover/search?${params}`);
+    const { body } = await client._fetchJson(`/prompts/search?${params}`);
     return (body.results || []).map(r => ({
       ...r,
       source: 'platform',

package/dist/cli/commands/proposals.js

@@ -7,6 +7,57 @@ const { handleCLIError } = require('../utils/error-handler');
 const subgraphClient = require('../utils/subgraph-client');
 const cliConfig = require('../config');
 
+async function getLogsChunked(provider, filter, maxRange = 50000) {
+  // Default to 50k blocks to stay under most RPC limits (Base Sepolia limits to 100k)
+  const latest = filter.toBlock === 'latest' || typeof filter.toBlock === 'undefined'
+    ? await provider.getBlockNumber()
+    : Number(filter.toBlock);
+  const from = Number(filter.fromBlock || 0);
+  const results = [];
+  for (let start = from; start <= latest; start += maxRange) {
+    const end = Math.min(latest, start + maxRange - 1);
+    try {
+      const batch = await provider.getLogs({ ...filter, fromBlock: start, toBlock: end });
+      if (batch && batch.length) results.push(...batch);
+    } catch (e) {
+      if (process.env.SAGE_VERBOSE === '1') {
+        console.warn(`Log query failed for blocks ${start}-${end}: ${e.message}`);
+      }
+    }
+  }
+  return results;
+}
+
+async function findProposalCreatedLog(provider, govAddr, gov, pid, lookbacks) {
+  const { ethers } = require('ethers');
+  const eventSig = gov.interface.getEvent('ProposalCreated').topicHash;
+  const currentBlock = await provider.getBlockNumber();
+  const pidHex = ethers.hexlify(ethers.toBeHex(pid));
+  for (const span of lookbacks) {
+    const from = currentBlock > span ? currentBlock - span : 0;
+    let logs = await getLogsChunked(provider, {
+      topics: [eventSig, ethers.zeroPadValue(pidHex, 32)],
+      address: govAddr,
+      fromBlock: from,
+      toBlock: 'latest'
+    });
+    if (!logs.length) {
+      const all = await getLogsChunked(provider, { topics: [eventSig], address: govAddr, fromBlock: from, toBlock: 'latest' });
+      for (const l of all) {
+        try {
+          const p = gov.interface.parseLog(l);
+          if (p && p.name === 'ProposalCreated' && BigInt(p.args.proposalId.toString()) === pid) {
+            logs = [l];
+            break;
+          }
+        } catch { }
+      }
+    }
+    if (logs.length) return logs[0];
+  }
+  return null;
+}
+
 function register(program) {
   const cmd = new Command('proposals')
     .description('Proposals navigation: inbox, preview, vote, execute');
@@ -219,10 +270,92 @@ function register(program) {
               if (summary.description) ui.output(` Description: ${summary.description.slice(0, 100)}...`);
             }
           } catch (e) {
-            // Final fallback: minimal info
             if (process.env.SAGE_VERBOSE === '1') {
               ui.warn(`SDK getProposalDetails failed: ${e.message}`);
             }
+            // Fallback 1: try subgraph directly (no block range limits)
+            let foundViaSubgraph = false;
+            try {
+              const status = await subgraphClient.checkSubgraphStatus(provider);
+              if (status.available && ctx.governor) {
+                const proposals = await subgraphClient.getProposals(ctx.governor, { first: 200 });
+                const pidDec = pid.toString();
+                const match = proposals.find((p) => {
+                  const parts = String(p.id || '').split('-');
+                  const last = parts.length > 1 ? parts[parts.length - 1] : String(p.id || '');
+                  if (!last) return false;
+                  if (last === pidDec) return true;
+                  try { if (String(last).startsWith('0x') && BigInt(String(last)) === pid) return true; } catch (_) { }
+                  return false;
+                });
+                if (match && match.targets?.length) {
+                  const targets = Array.from(match.targets || [], (a) => String(a));
+                  const values = Array.from(match.values || [], (v) => BigInt(String(v || 0)));
+                  const calldatas = Array.from(match.calldatas || [], (b) => String(b));
+                  const description = String(match.description || '');
+                  const selectors = calldatas.map((d) => (typeof d === 'string' ? d.slice(0, 10) : '0x'));
+                  const summary = {
+                    id: pid.toString(),
+                    source: 'subgraph',
+                    actionCount: targets.length,
+                    targets,
+                    values: values.map((v) => v.toString()),
+                    selectors,
+                    description
+                  };
+                  if (opts.json) ui.json(withJsonVersion(summary));
+                  else {
+                    ui.output(`Proposal ${summary.id} (subgraph)`);
+                    ui.output(` Actions: ${summary.actionCount}`);
+                    if (summary.targets.length) ui.output(` First target: ${summary.targets[0]}`);
+                    if (summary.selectors.length) ui.output(` First selector: ${summary.selectors[0]}`);
+                    if (summary.description) ui.output(` Description: ${summary.description.slice(0, 100)}...`);
+                  }
+                  foundViaSubgraph = true;
+                }
+              }
+            } catch (sgErr) {
+              if (process.env.SAGE_VERBOSE === '1') {
+                ui.warn(`Subgraph fallback failed: ${sgErr.message}`);
+              }
+            }
+            if (foundViaSubgraph) return;
+
+            // Fallback 2: scan ProposalCreated logs with chunked queries
+            try {
+              if (ctx.governor) {
+                const GovABI = require('../utils/artifacts').resolveArtifact('contracts/cloneable/PromptGovernorCloneable.sol/PromptGovernorCloneable.json').abi;
+                const gov = new ethers.Contract(ctx.governor, GovABI, provider);
+                const hit = await findProposalCreatedLog(provider, ctx.governor, gov, pid, [20000, 100000, 500000]);
+                if (hit) {
+                  const parsed = gov.interface.parseLog(hit);
+                  const targets = Array.from(parsed.args.targets || [], (a) => String(a));
+                  const values = Array.from(parsed.args.values || [], (v) => BigInt(v.toString()));
+                  const calldatas = Array.from(parsed.args.calldatas || [], (b) => ethers.hexlify(b));
+                  const description = String(parsed.args.description ?? '');
+                  const selectors = calldatas.map((d) => (typeof d === 'string' ? d.slice(0, 10) : '0x'));
+                  const summary = {
+                    id: pid.toString(),
+                    source: 'logs',
+                    actionCount: targets.length,
+                    targets,
+                    values: values.map((v) => v.toString()),
+                    selectors,
+                    description
+                  };
+                  if (opts.json) ui.json(withJsonVersion(summary));
+                  else {
+                    ui.output(`Proposal ${summary.id} (logs)`);
+                    ui.output(` Actions: ${summary.actionCount}`);
+                    if (summary.targets.length) ui.output(` First target: ${summary.targets[0]}`);
+                    if (summary.selectors.length) ui.output(` First selector: ${summary.selectors[0]}`);
+                    if (summary.description) ui.output(` Description: ${summary.description.slice(0, 100)}...`);
+                  }
+                  return;
+                }
+              }
+            } catch (_) { }
+            // Final fallback: minimal info
             const summary = { id: pid.toString(), description: '(unable to fetch proposal details)' };
             if (opts.json) ui.json(withJsonVersion(summary));
             else ui.output(`Proposal ${summary.id} - ${summary.description}`);
@@ -795,10 +928,27 @@ function register(program) {
             return;
         }
 
-        // Delegate to existing library-manager execute flow if it is a library update; otherwise, try queue/execute via gm
+        // Queue only when needed; skip queue if already queued
+        let stateNum = null;
+        let stateName = 'unknown';
         try {
-          await gm.queueProposal(id);
+          const state = await gm.governor.state(gm.normalizeProposalId(id));
+          stateNum = Number(state);
+          stateName = gm.getStateName ? gm.getStateName(stateNum) : String(stateNum);
         } catch (_) {}
+
+        if (stateNum === 4) {
+          try {
+            await gm.queueProposal(id);
+          } catch (_) {}
+        } else if (stateNum === 5) {
+          if (!process.env.SAGE_QUIET_JSON) {
+            console.log(`ℹ️  Proposal already queued (state ${stateName}). Skipping queue step.`);
+          }
+        } else if (stateNum !== null && !process.env.SAGE_QUIET_JSON) {
+          console.log(`⚠️  Proposal is in state ${stateName}; queue may fail.`);
+        }
+
         await gm.executeProposal(id);
         ui.success('Execute complete');
       } catch (e) {