@sage-protocol/cli 0.8.0 → 0.8.3

package/dist/cli/commands/contributor.js

@@ -16,10 +16,19 @@ function register(program) {
           try {
             const chalk = { green: (s)=>s, yellow: (s)=>s, red: (s)=>s, cyan: (s)=>s, gray: (s)=>s };
             const { ethers } = require('ethers');
-            const sxxxTokenAddress = cliConfig.resolveAddress('SXXX_TOKEN_ADDRESS');
             const system = cliConfig.resolveAddress('SIMPLE_CONTRIBUTOR_SYSTEM_ADDRESS');
             if (!system) throw new Error('SimpleContributorSystem address not configured');
+            const rpcUrl = cliConfig.resolveRpcUrl({ allowEnv: true });
+            const provider = new ethers.JsonRpcProvider(rpcUrl);
+            const sysAbi = resolveArtifact('contracts/SimpleContributorSystem.sol/SimpleContributorSystem.json').abi;
+            const sysRead = new ethers.Contract(system, sysAbi, provider);
+            const systemToken = await sysRead.sxxxToken().catch(() => null);
+            const cfgToken = cliConfig.resolveAddress('SXXX_TOKEN_ADDRESS');
+            const sxxxTokenAddress = systemToken || cfgToken;
             if (!sxxxTokenAddress) throw new Error('SXXX token address not configured');
+            if (systemToken && cfgToken && systemToken.toLowerCase() !== cfgToken.toLowerCase()) {
+              ui.warn(`SXXX token mismatch: contributor system uses ${systemToken}, config has ${cfgToken}. Using system token.`);
+            }
             const WM = require('../wallet-manager');
             const wm = new WM();
             await wm.connect();
@@ -36,13 +45,12 @@ function register(program) {
             const ERC20 = [ 'function approve(address,uint256) returns (bool)' ];
             const tok = new ethers.Contract(sxxxTokenAddress, ERC20, signer);
             const txa = await tok.approve(system, amountWei);
-            { const { waitForReceipt } = require('../utils/tx-wait'); const pr = new (require('ethers')).JsonRpcProvider(process.env.RPC_URL || process.env.BASE_SEPOLIA_RPC || process.env.BASE_RPC_URL || 'https://base-sepolia.publicnode.com'); await waitForReceipt(pr, txa, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
+            { const { waitForReceipt } = require('../utils/tx-wait'); await waitForReceipt(provider, txa, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
             ui.success('SXXX approval confirmed');
             ui.info('Staking tokens...');
-            const sysAbi = resolveArtifact('contracts/SimpleContributorSystem.sol/SimpleContributorSystem.json').abi;
             const c = new ethers.Contract(system, sysAbi, signer);
             const txs = await c.stake(amountWei);
-            { const { waitForReceipt } = require('../utils/tx-wait'); const pr = new (require('ethers')).JsonRpcProvider(process.env.RPC_URL || process.env.BASE_SEPOLIA_RPC || process.env.BASE_RPC_URL || 'https://base-sepolia.publicnode.com'); await waitForReceipt(pr, txs, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
+            { const { waitForReceipt } = require('../utils/tx-wait'); await waitForReceipt(provider, txs, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
             if (options.json) ui.json({ success: true, amount: amountWei.toString() });
             else ui.success(`Successfully staked ${ethers.formatEther(amountWei)} SXXX`);
           } catch (error) {
@@ -61,6 +69,8 @@ function register(program) {
             const { ethers } = require('ethers');
             const system = cliConfig.resolveAddress('SIMPLE_CONTRIBUTOR_SYSTEM_ADDRESS');
             if (!system) throw new Error('SimpleContributorSystem address not configured');
+            const rpcUrl = cliConfig.resolveRpcUrl({ allowEnv: true });
+            const provider = new ethers.JsonRpcProvider(rpcUrl);
             const WM = require('../wallet-manager');
             const wm = new WM();
             await wm.connect();
@@ -72,7 +82,7 @@ function register(program) {
             const sysAbi = resolveArtifact('contracts/SimpleContributorSystem.sol/SimpleContributorSystem.json').abi;
             const c = new ethers.Contract(system, sysAbi, signer);
             const tx = await c.withdrawStake(amountWei);
-            { const { waitForReceipt } = require('../utils/tx-wait'); const pr = new (require('ethers')).JsonRpcProvider(process.env.RPC_URL || process.env.BASE_SEPOLIA_RPC || process.env.BASE_RPC_URL || 'https://base-sepolia.publicnode.com'); await waitForReceipt(pr, tx, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
+            { const { waitForReceipt } = require('../utils/tx-wait'); await waitForReceipt(provider, tx, Number(process.env.SAGE_TX_WAIT_MS || 60000)); }
             if (options.json) ui.json({ success: true, amount: amountWei.toString() });
             else ui.success(`Successfully unstaked ${ethers.formatEther(amountWei)} SXXX`);
           } catch (error) {
@@ -91,7 +101,7 @@ function register(program) {
             const { ethers } = require('ethers');
             const system = cliConfig.resolveAddress('SIMPLE_CONTRIBUTOR_SYSTEM_ADDRESS');
             if (!system) throw new Error('SimpleContributorSystem address not configured');
-            const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+            const rpcUrl = cliConfig.resolveRpcUrl({ allowEnv: true });
             const provider = new ethers.JsonRpcProvider(rpcUrl);
             const sysAbi = resolveArtifact('contracts/SimpleContributorSystem.sol/SimpleContributorSystem.json').abi;
             const c = new ethers.Contract(system, sysAbi, provider);

package/dist/cli/commands/dao.js

@@ -847,7 +847,7 @@ function register(program) {
           const favorites = subdaoStore.listFavorites();
           const recent = subdaoStore.listRecent();
           if (opts.json) {
-            ui.json({ favorites, recent }, null, 2, { pretty: false });
+            ui.json({ favorites, recent }, { pretty: false });
             return;
           }
           if (!favorites.length && !recent.length) return ui.info('No saved DAOs. Use `sage dao save <address> --alias <name>`.');

package/dist/cli/commands/discover.js

@@ -41,7 +41,7 @@ function register(program) {
         if (options.tags) params.set('tags', options.tags);
         if (options.vector === false) params.set('useVector', 'false');
 
-        const { body } = await client._fetchJson(`/discover/search?${params}`);
+        const { body } = await client._fetchJson(`/prompts/search?${params}`);
 
         if (options.json) {
           ui.json(body);
@@ -167,7 +167,7 @@ function register(program) {
           method: options.method,
         });
 
-        const { body } = await client._fetchJson(`/discover/similar/${cid}?${params}`);
+        const { body } = await client._fetchJson(`/prompts/similar/${cid}?${params}`);
 
         if (options.json) {
           ui.json(body);
@@ -246,7 +246,7 @@ function register(program) {
           payload.diversify = true;
         }
 
-        const { body } = await client._fetchJson('/discover/match', {
+        const { body } = await client._fetchJson('/prompts/match', {
           method: 'POST',
           headers: client.headers(),
           body: JSON.stringify(payload),

package/dist/cli/commands/governance.js

@@ -19,6 +19,56 @@ const logger = require('../utils/logger');
 const hooks = require('../utils/hooks');
 const contracts = require('../contracts');
 
+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 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 governanceCommand = new Command('governance')
     .description('Governance management commands')
@@ -69,7 +119,7 @@ function register(program) {
           try {
             const { resolveGovContext } = require('../utils/gov-context');
             const { ethers } = require('ethers');
-            const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+            const provider = new ethers.JsonRpcProvider(cliConfig.resolveRpcUrl({ allowEnv: true }));
             const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider, useGovernorOnly: process.env.SAGE_USE_GOVERNOR === '1' });
             const govAddr = ctx.governor || process.env.GOV;
             if (!govAddr) throw new Error('Governor address not resolved. Pass --gov or --subdao.');
@@ -79,22 +129,10 @@ function register(program) {
             const pid = (typeof id === 'string' && id.startsWith('0x')) ? BigInt(id) : BigInt(String(id));
 
             // Locate ProposalCreated event
-            const eventSig = gov.interface.getEvent('ProposalCreated').topicHash;
-            const currentBlock = await provider.getBlockNumber();
             let parsed = null; let logTxHash = null;
             const lookbacks = [20000, 100000, 500000];
-            const pidHex = ethers.hexlify(ethers.toBeHex(pid));
-            for (const span of lookbacks) {
-              const from = currentBlock > span ? currentBlock - span : 0;
-              let logs = await provider.getLogs({ topics: [eventSig, ethers.zeroPadValue(pidHex, 32)], address: govAddr, fromBlock: from, toBlock: 'latest' });
-              if (!logs.length) {
-                const all = await provider.getLogs({ topics: [eventSig], address: govAddr, fromBlock: from, toBlock: 'latest' });
-                for (const l of all) {
-                  try { const p = gov.interface.parseLog(l); if (p && BigInt(p.args.proposalId.toString()) === pid) { logs = [l]; break; } } catch {}
-                }
-              }
-              if (logs.length) { parsed = gov.interface.parseLog(logs[0]); logTxHash = logs[0].transactionHash; break; }
-            }
+            const hit = await findProposalCreatedLog(provider, govAddr, gov, pid, lookbacks);
+            if (hit) { parsed = gov.interface.parseLog(hit); logTxHash = hit.transactionHash; }
             if (!parsed) throw new Error('ProposalCreated event not found; verify Governor/ID');
 
             const targets = Array.from(parsed.args.targets, (a)=>String(a));
@@ -218,7 +256,7 @@ function register(program) {
           try {
             const { resolveGovContext } = require('../utils/gov-context');
             const { ethers } = require('ethers');
-            const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+            const provider = new ethers.JsonRpcProvider(cliConfig.resolveRpcUrl({ allowEnv: true }));
             const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider, useGovernorOnly: process.env.SAGE_USE_GOVERNOR === '1' });
             const govAddr = ctx.governor || process.env.GOV;
             if (!govAddr) throw new Error('Governor address not resolved. Pass --gov or --subdao.');
@@ -241,14 +279,10 @@ function register(program) {
             } catch(_) {}
 
             // --- Decode effects (library/prompt) with previous ⇒ new
-            const ProposalCreatedABI = ['event ProposalCreated(uint256 id,address proposer,address[] targets,uint256[] values,string[] signatures,bytes[] calldatas,uint256 startBlock,uint256 endBlock,string description)'];
-            const evIface = new ethers.Interface(ProposalCreatedABI);
-            const topic = evIface.getEvent('ProposalCreated').topicHash;
             let parsed = null; let logTxHash = null;
-            const logs = await provider.getLogs({ address: govAddr, fromBlock: 0, toBlock: 'latest', topics: [topic] });
-            for (const log of logs) {
-              try { const p = evIface.parseLog(log); if (BigInt(p.args.id.toString()) === pid) { parsed = p; logTxHash = log.transactionHash; break; } } catch(_) {}
-            }
+            const lookbacks = [20000, 100000, 500000];
+            const hit = await findProposalCreatedLog(provider, govAddr, gov, pid, lookbacks);
+            if (hit) { parsed = gov.interface.parseLog(hit); logTxHash = hit.transactionHash; }
             if (!parsed) throw new Error('ProposalCreated event not found');
             const targets = parsed.args.targets.map(String);
             const calldatas = parsed.args.calldatas.map((b)=> ethers.hexlify(b));
@@ -498,7 +532,7 @@ function register(program) {
         .option('--json', 'Output JSON', false)
         .action(async (opts) => {
           try {
-            const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+            const provider = new ethers.JsonRpcProvider(cliConfig.resolveRpcUrl({ allowEnv: true }));
             const { resolveGovContext } = require('../utils/gov-context');
             const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider });
             if (opts.subdao) {
@@ -563,7 +597,7 @@ function register(program) {
           try {
             const { resolveGovContext } = require('../utils/gov-context');
             const { ethers } = require('ethers');
-            const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+            const provider = new ethers.JsonRpcProvider(cliConfig.resolveRpcUrl({ allowEnv: true }));
             const ctx = await resolveGovContext({ govOpt: options.gov, subdaoOpt: options.subdao, provider, useGovernorOnly: process.env.SAGE_USE_GOVERNOR === '1' });
             const govAddr = ctx.governor || process.env.GOV;
             if (!govAddr) throw new Error('Governor address not resolved. Pass --gov or --subdao.');
@@ -572,43 +606,91 @@ function register(program) {
             const gov = new ethers.Contract(govAddr, GovernorABI, provider);
             const pid = (typeof id === 'bigint') ? id : (typeof id === 'string' && id.startsWith('0x') ? BigInt(id) : BigInt(String(id)));
 
-            // --- Load ProposalCreated event to recover tuple and description ---
-            const eventSig = gov.interface.getEvent('ProposalCreated').topicHash;
-            const currentBlock = await provider.getBlockNumber();
-            const lookbacks = [20000, 100000, 500000];
-            let parsed = null; let logTxHash = null;
-            const pidHex = (typeof id === 'string' && id.startsWith('0x')) ? id : ethers.hexlify(ethers.toBeHex(pid));
-            for (const span of lookbacks) {
-              const from = currentBlock > span ? currentBlock - span : 0;
-              let logs = await provider.getLogs({ topics: [eventSig, ethers.zeroPadValue(pidHex, 32)], address: govAddr, fromBlock: from, toBlock: 'latest' });
-              if (!logs.length) {
-                // broad scan and filter
-                const all = await provider.getLogs({ 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 { }
+            // --- Load proposal data: prefer subgraph (no block range limits), fallback to RPC ---
+            const subgraphClient = require('../utils/subgraph-client');
+            let targets = [];
+            let values = [];
+            let calldatas = [];
+            let description = '';
+            let logTxHash = null;
+            let usedSubgraph = false;
+
+            // Try subgraph first (preferred - no block range limits)
+            try {
+              const status = await subgraphClient.checkSubgraphStatus(provider);
+              if (status.available) {
+                const proposals = await subgraphClient.getProposals(govAddr, { 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) {
+                  targets = Array.from(match.targets || [], (a) => String(a));
+                  values = Array.from(match.values || [], (v) => BigInt(String(v || 0)));
+                  calldatas = Array.from(match.calldatas || [], (b) => String(b));
+                  description = String(match.description || '');
+                  usedSubgraph = true;
+                  if (process.env.SAGE_VERBOSE === '1') {
+                    ui.info(`Using subgraph (indexed to block ${status.indexedBlock})`);
+                  }
                 }
               }
-              if (logs.length) {
-                parsed = gov.interface.parseLog(logs[0]);
-                logTxHash = logs[0].transactionHash;
-                break;
+            } catch (sgErr) {
+              if (process.env.SAGE_VERBOSE === '1') {
+                ui.warn(`Subgraph unavailable: ${sgErr.message}. Falling back to RPC.`);
               }
             }
-            if (!parsed) throw new Error('ProposalCreated event not found; try increasing lookback or verify Governor/ID');
 
-            // Extract tuple
-            const targets = Array.from(parsed.args.targets, (a) => String(a));
-            let 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 ?? '');
-            if (values.length === 0 && targets.length > 0) values = targets.map(() => 0n);
+            // Fallback to RPC log scan (chunked to stay under block range limits)
+            if (!usedSubgraph) {
+              const eventSig = gov.interface.getEvent('ProposalCreated').topicHash;
+              const currentBlock = await provider.getBlockNumber();
+              const MAX_CHUNK = 50000;
+              const lookbacks = [20000, 100000, 500000];
+              let parsed = null;
+              const pidHex = (typeof id === 'string' && id.startsWith('0x')) ? id : ethers.hexlify(ethers.toBeHex(pid));
+
+              for (const span of lookbacks) {
+                if (parsed) break;
+                const from = currentBlock > span ? currentBlock - span : 0;
+                for (let start = from; start <= currentBlock && !parsed; start += MAX_CHUNK) {
+                  const chunkEnd = Math.min(start + MAX_CHUNK - 1, currentBlock);
+                  try {
+                    let logs = await provider.getLogs({ topics: [eventSig, ethers.zeroPadValue(pidHex, 32)], address: govAddr, fromBlock: start, toBlock: chunkEnd });
+                    if (!logs.length) {
+                      const all = await provider.getLogs({ topics: [eventSig], address: govAddr, fromBlock: start, toBlock: chunkEnd });
+                      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) {
+                      parsed = gov.interface.parseLog(logs[0]);
+                      logTxHash = logs[0].transactionHash;
+                    }
+                  } catch (e) {
+                    if (process.env.SAGE_VERBOSE === '1') {
+                      console.warn(`Log query failed for blocks ${start}-${chunkEnd}: ${e.message}`);
+                    }
+                  }
+                }
+              }
+              if (!parsed) throw new Error('ProposalCreated event not found; configure SUBGRAPH_URL or verify Governor/ID');
+              targets = Array.from(parsed.args.targets, (a) => String(a));
+              values = Array.from(parsed.args.values, (v) => BigInt(v.toString()));
+              calldatas = Array.from(parsed.args.calldatas, (b) => ethers.hexlify(b));
+              description = String(parsed.args.description ?? '');
+            }
 
-            const descriptionHash = (parsed.args.descriptionHash && String(parsed.args.descriptionHash).length === 66)
-              ? String(parsed.args.descriptionHash)
-              : ethers.keccak256(ethers.toUtf8Bytes(description));
+            if (values.length === 0 && targets.length > 0) values = targets.map(() => 0n);
+            const descriptionHash = ethers.keccak256(ethers.toUtf8Bytes(description));
 
             // --- State, ETA, Timelock ---
             const stateNum = Number(await gov.state(pid).catch(() => 255));
@@ -1935,11 +2017,12 @@ function register(program) {
         .action(async (options) => {
           try {
             if (options.json) process.env.SAGE_QUIET_JSON = '1';
-            if (options.rpc) process.env.RPC_URL = options.rpc;
             // Unified context resolution
             const { resolveGovContext } = require('../utils/gov-context');
             const { ethers } = require('ethers');
-            const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+            const rpcUrl = options.rpc || cliConfig.resolveRpcUrl({ allowEnv: true });
+            process.env.SAGE_RPC_URL = rpcUrl;
+            const provider = new ethers.JsonRpcProvider(rpcUrl);
             const ctx = await resolveGovContext({ govOpt: options.gov, subdaoOpt: options.subdao, provider });
             if (ctx.governor) process.env.GOV = ctx.governor;
             if (ctx.subdao) process.env.WORKING_SUBDAO_ADDRESS = ctx.subdao, process.env.SUBDAO = ctx.subdao;