@sage-protocol/cli 0.2.9 → 0.3.2

package/dist/cli/commands/proposals.js

@@ -41,7 +41,8 @@ function register(program) {
           try {
             const HelperABI = ['event ProposalTupleIndexed(uint256 indexed proposalId,address[] targets,uint256[] values,bytes[] calldatas,bytes32 descriptionHash)'];
             const helper = new ethers.Contract(helperAddr, HelperABI, provider);
-            const topic = helper.interface.getEventTopic('ProposalTupleIndexed');
+            // Ethers v6 compatibility: compute topic hash directly from signature
+            const topic = (ethers.id || ((s)=>require('ethers').id(s)))('ProposalTupleIndexed(uint256,address[],uint256[],bytes[],bytes32)');
             const address = helperAddr;
             const filter = { address, topics: [topic] };
             // Respect from-block and max-range by chunking if needed
@@ -152,18 +153,37 @@ function register(program) {
           }
         }
         if (!emitted) {
-          const GovernanceManager = require('../governance-manager');
-          const gm = new GovernanceManager();
-          await gm.configureContext({ provider, governor: ctx.governor, timelock: ctx.timelock, subdao: ctx.subdao });
-          const summary = await gm.describeProposal?.(id).catch(async () => ({ id, description: '(unable to summarize with current provider limits)' }));
-          if (opts.json) console.log(JSON.stringify(withJsonVersion(summary), null, 2));
-          else {
-            console.log(`Proposal ${summary.id}`);
-            if (summary.title) console.log(summary.title);
-            if (summary.description) console.log(summary.description);
-            if (Array.isArray(summary.targets)) {
-              console.log('Targets:', summary.targets.length);
+          // Fallback: use SDK getProposalDetails
+          try {
+            const { getProposalDetails } = require('@sage-protocol/sdk');
+            const details = await getProposalDetails({
+              governorAddress: ctx.governor,
+              proposalId: pid,
+              provider,
+              helperAddress: helperAddr
+            });
+            const summary = {
+              id: pid.toString(),
+              source: 'sdk',
+              actionCount: details.targets?.length || 0,
+              targets: details.targets || [],
+              values: (details.values || []).map(v => v.toString()),
+              selectors: (details.calldatas || []).map(d => (typeof d === 'string' ? d.slice(0, 10) : '0x')),
+              description: details.description || ''
+            };
+            if (opts.json) console.log(JSON.stringify(withJsonVersion(summary), null, 2));
+            else {
+              console.log(`Proposal ${summary.id} (SDK)`);
+              console.log(` Actions: ${summary.actionCount}`);
+              if (summary.targets.length) console.log(` First target: ${summary.targets[0]}`);
+              if (summary.selectors.length) console.log(` First selector: ${summary.selectors[0]}`);
+              if (summary.description) console.log(` Description: ${summary.description.slice(0, 100)}...`);
             }
+          } catch (e) {
+            // Final fallback: minimal info
+            const summary = { id: pid.toString(), description: '(unable to fetch proposal details)' };
+            if (opts.json) console.log(JSON.stringify(withJsonVersion(summary), null, 2));
+            else console.log(`Proposal ${summary.id} - ${summary.description}`);
           }
         }
       } catch (e) {
@@ -252,9 +272,17 @@ function register(program) {
         const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider });
         try { const net = await provider.getNetwork(); ctx.chainId = Number(net.chainId || 0); } catch (_) {}
         printContextBanner(ctx, opts);
+        // Initialize wallet first, then GovernanceManager
+        const WalletManager = require('../wallet-manager');
+        const wm = new WalletManager();
+        await wm.connect();
+        const signer = wm.getSigner();
+        const walletProvider = wm.getProvider();
+        
         const GovernanceManager = require('../governance-manager');
         const gm = new GovernanceManager();
-        await gm.configureContext({ provider, governor: ctx.governor, timelock: ctx.timelock, subdao: ctx.subdao });
+        // Initialize with wallet connection
+        await gm.initialize(ctx.subdao || null, { governorOverride: ctx.governor });
         await gm.vote(id, v);
         console.log('✅ Vote submitted');
       } catch (e) {
@@ -269,6 +297,7 @@ function register(program) {
     .argument('<id>', 'Proposal ID')
     .option('--gov <address>', 'Governor address (override)')
     .option('--subdao <address>', 'SubDAO address (derive governor)')
+    .option('--simulate', 'Simulate execution without broadcasting a transaction', false)
     .action(async (id, opts) => {
       try {
         enterJsonMode(opts);
@@ -277,15 +306,31 @@ function register(program) {
         const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
         const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider });
         try { const net = await provider.getNetwork(); ctx.chainId = Number(net.chainId || 0); } catch (_) {}
-        printContextBanner(ctx, opts);
+        if (!opts.simulate) printContextBanner(ctx, opts);
+        
+        // Initialize wallet first, then GovernanceManager
+        const WalletManager = require('../wallet-manager');
+        const wm = new WalletManager();
+        if (!opts.simulate) {
+            await wm.connect();
+        }
+        
         const GovernanceManager = require('../governance-manager');
         const gm = new GovernanceManager();
-        await gm.configureContext({ provider, governor: ctx.governor, timelock: ctx.timelock, subdao: ctx.subdao });
+        // Initialize with wallet connection (or just provider for simulation)
+        await gm.initialize(ctx.subdao || null, { governorOverride: ctx.governor, providerOverride: provider, signerOverride: opts.simulate ? null : undefined });
+        
+        // If simulate, pass flag
+        if (opts.simulate) {
+            await gm.executeProposal(id, { simulate: true });
+            return;
+        }
+
         // Delegate to existing library-manager execute flow if it is a library update; otherwise, try queue/execute via gm
         try {
-          await gm.queue(id);
+          await gm.queueProposal(id);
         } catch (_) {}
-        await gm.execute(id);
+        await gm.executeProposal(id);
         console.log('✅ Execute complete');
       } catch (e) {
         const { handleCLIError } = require('../utils/error-handler');
@@ -293,6 +338,131 @@ function register(program) {
       }
     });
 
+  cmd
+    .command('status')
+    .description('Show inbox + next recommended action for proposals')
+    .option('--gov <address>', 'Governor address (override)')
+    .option('--subdao <address>', 'SubDAO address (derive governor)')
+    .option('--json', 'Emit JSON output', false)
+    .action(async (opts) => {
+      try {
+        enterJsonMode(opts);
+        const { ethers } = require('ethers');
+        const { resolveGovContext } = require('../utils/gov-context');
+        const provider = new ethers.JsonRpcProvider(process.env.RPC_URL || 'https://base-sepolia.publicnode.com');
+        const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider });
+        
+        // Get inbox
+        const inboxCmd = cmd.commands.find(c => c.name() === 'inbox');
+        if (!inboxCmd) {
+          throw new Error('inbox command not found');
+        }
+        
+        // Call inbox logic inline
+        const latest = await provider.getBlockNumber();
+        const windowDefault = Number(process.env.SAGE_INBOX_BLOCK_WINDOW || 50000);
+        const fromBlock = Math.max(0, Number(latest) - windowDefault);
+        const toBlock = 'latest';
+        
+        const out = [];
+        const helperAddr = opts.helper || process.env.GOVERNANCE_HELPER_ADDRESS || process.env.SAGE_GOVERNANCE_HELPER || null;
+        if (helperAddr && /^0x[0-9a-fA-F]{40}$/.test(helperAddr)) {
+          try {
+            const HelperABI = ['event ProposalTupleIndexed(uint256 indexed proposalId,address[] targets,uint256[] values,bytes[] calldatas,bytes32 descriptionHash)'];
+            const helper = new ethers.Contract(helperAddr, HelperABI, provider);
+            const topic = (ethers.id || ((s)=>require('ethers').id(s)))('ProposalTupleIndexed(uint256,address[],uint256[],bytes[],bytes32)');
+            const filter = { address: helperAddr, topics: [topic] };
+            const logs = await provider.getLogs({ ...filter, fromBlock, toBlock });
+            for (const log of logs) {
+              try {
+                const parsed = helper.interface.parseLog(log);
+                const id = parsed?.args?.proposalId?.toString?.() || String(parsed?.args?.[0] || '');
+                const GovABI = require('../utils/artifacts').resolveArtifact('contracts/cloneable/PromptGovernorCloneable.sol/PromptGovernorCloneable.json').abi;
+                const gov = new ethers.Contract(ctx.governor, GovABI, provider);
+                let state = 'unknown';
+                try { state = String(await gov.state(BigInt(id))); } catch (_) {}
+                out.push({ id, state, title: '(indexed)', description: '' });
+              } catch (_) {}
+            }
+          } catch (e) {
+            console.log(`⚠️  Helper scan failed: ${e.message}. Falling back to Governor logs.`);
+          }
+        }
+        if (!out.length) {
+          const GovABI = require('../utils/artifacts').resolveArtifact('contracts/cloneable/PromptGovernorCloneable.sol/PromptGovernorCloneable.json').abi;
+          const gov = new ethers.Contract(ctx.governor, GovABI, provider);
+          const filter = gov.filters?.ProposalCreated ? gov.filters.ProposalCreated() : null;
+          if (filter) {
+            const events = await gov.queryFilter(filter, fromBlock, toBlock);
+            for (const ev of events) {
+              try {
+                const parsed = ev.args || {};
+                const id = parsed.proposalId?.toString?.() || parsed[0]?.toString?.() || String(ev.topics?.[1] || '');
+                const desc = parsed.description || '';
+                const title = (desc.split('\n')[0] || '').slice(0, 80);
+                let state = 'unknown';
+                try { state = String(await gov.state(BigInt(id))); } catch (_) {}
+                out.push({ id, state, title, description: desc });
+              } catch (_) {}
+            }
+          }
+        }
+        
+        if (opts.json) {
+          console.log(JSON.stringify({ version: '1.0', results: out, nextAction: out.length ? 'vote' : 'none' }, null, 2));
+        } else {
+          if (!out.length) {
+            console.log('No active proposals found.');
+            console.log('\n💡 Next: Create a proposal with:');
+            console.log('   sage library push <manifest.json> --subdao <subdao-address>');
+            return;
+          }
+          console.log(`Found ${out.length} proposal(s):`);
+          out.forEach((r, idx) => {
+            const stateName = { '0': 'Pending', '1': 'Active', '2': 'Canceled', '3': 'Defeated', '4': 'Succeeded', '5': 'Queued', '6': 'Expired', '7': 'Executed' }[r.state] || r.state;
+            console.log(`\n${idx + 1}. #${r.id} [${stateName}] ${r.title || '(no title)'}`);
+          });
+          
+          // Recommend next action
+          const active = out.filter(r => r.state === '1');
+          const succeeded = out.filter(r => r.state === '4');
+          const queued = out.filter(r => r.state === '5');
+          
+          console.log('\n📋 Recommended next actions:');
+          if (active.length) {
+            const first = active[0];
+            const subdao = ctx.subdao || opts.subdao;
+            if (subdao) {
+              console.log(`   sage proposals vote ${first.id} for --subdao ${subdao}`);
+            } else {
+              console.log(`   sage proposals vote ${first.id} for`);
+            }
+          } else if (succeeded.length) {
+            const first = succeeded[0];
+            const subdao = ctx.subdao || opts.subdao;
+            if (subdao) {
+              console.log(`   sage proposals execute ${first.id} --subdao ${subdao}`);
+            } else {
+              console.log(`   sage proposals execute ${first.id}`);
+            }
+          } else if (queued.length) {
+            const first = queued[0];
+            const subdao = ctx.subdao || opts.subdao;
+            if (subdao) {
+              console.log(`   sage proposals execute ${first.id} --subdao ${subdao}`);
+            } else {
+              console.log(`   sage proposals execute ${first.id}`);
+            }
+          } else {
+            console.log('   No actionable proposals at this time.');
+          }
+        }
+      } catch (e) {
+        const { handleCLIError } = require('../utils/error-handler');
+        handleCLIError('proposals:status', e, { context: { gov: opts.gov, subdao: opts.subdao } });
+      }
+    });
+
   program.addCommand(cmd);
 }