@sage-protocol/sdk 0.2.5 → 0.2.8

package/README.md

@@ -126,6 +126,8 @@ const res = await sdk.subdao.createOperatorSubDAO({
 });
 ```
 
+Note: if you call the factory's operator-creation functions directly (e.g., `createSubDAOOperator*`), you must pass a non-zero `operatorAdmin` (it may be the same as `operatorExecutor`).
+
 ### Library Fork Fees
 
 ```js

package/dist/browser/index.mjs

@@ -14,7 +14,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@sage-protocol/sdk",
-      version: "0.2.5",
+      version: "0.2.8",
       description: "Backend-agnostic SDK for interacting with the Sage Protocol (governance, SubDAOs, tokens).",
       main: "dist/index.cjs",
       module: "dist/index.mjs",
@@ -140,7 +140,6 @@ var require_abi = __commonJS({
       // Core factory reads
       "function timelockMinDelay() view returns (uint256)",
       "function premiumPromptsAddress() view returns (address)",
-      "function simpleKeyStoreAddress() view returns (address)",
       "function governanceConfigAddress() view returns (address)",
       "function libraryRegistryAddress() view returns (address)",
       // Canonical per‑SubDAO mapping
@@ -327,14 +326,28 @@ var require_abi = __commonJS({
       "event TokensSwept(address indexed token, address indexed to, uint256 amount)"
     ];
     var GovernanceBoostMerkle = [
-      "function getProposalConfig(uint256) view returns (tuple(uint256 proposalId,address token,uint256 totalAmount,uint64 startTime,uint64 endTime,uint256 merkleRoot))",
-      "function fund(uint256 proposalId, uint256 amount)",
-      "function setRoot(uint256 proposalId, uint256 merkleRoot)"
+      "function createBoost(uint256 proposalId, uint256 totalPool)",
+      "function setMerkleRoot(uint256 proposalId, bytes32 root)",
+      "function finalize(uint256 proposalId)",
+      "function claim(uint256 proposalId, address account, uint256 amount, bytes32[] proof)",
+      "function getBoost(uint256 proposalId) view returns (uint256 totalPool, uint256 totalClaimed, bytes32 merkleRoot, bool active, bool finalized, address creator)",
+      "function claimed(uint256 proposalId, address account) view returns (bool)",
+      "event BoostCreated(uint256 indexed proposalId, address indexed creator, uint256 totalPool)",
+      "event MerkleRootSet(uint256 indexed proposalId, bytes32 merkleRoot)",
+      "event RewardClaimed(uint256 indexed proposalId, address indexed voter, uint256 amount)",
+      "event BoostFinalized(uint256 indexed proposalId, uint256 totalClaimed, uint256 refunded)"
     ];
     var GovernanceBoostDirect = [
-      "function getDirectConfig(uint256) view returns (tuple(uint256 proposalId,address token,uint256 perVoter,uint256 maxVoters,uint64 startTime,uint64 endTime))",
-      "function create(uint256 proposalId, address token, uint256 perVoter, uint256 maxVoters)",
-      "function fund(uint256 proposalId, uint256 amount)"
+      "function createBoost((address governor,uint256 proposalId,uint256 perVoter,uint256 maxVoters,uint8 kind,address policy,uint96 minVotes,uint8 payoutMode,uint8 support,uint256 startAt,uint256 expiresAt) params)",
+      "function claim(uint256 proposalId, bytes data)",
+      "function finalize(uint256 proposalId)",
+      "function pause(uint256 proposalId, bool paused)",
+      "function setProtocolRake(uint96 rakeBps, address protocolTreasury)",
+      "function getBoost(uint256 proposalId) view returns (tuple(address creator, address governor, uint256 proposalId, uint256 snapshot, uint256 perVoter, uint256 maxVoters, uint256 votersPaid, uint96 minVotes, uint8 payoutMode, uint8 support, uint256 startAt, uint256 expiresAt, uint256 totalPool, uint256 totalPaid, uint8 kind, address policy, bool active, bool paused) boost)",
+      "function claimed(uint256 proposalId, address account) view returns (bool)",
+      "event BoostCreated(uint256 indexed proposalId, address indexed governor, uint256 perVoter, uint256 maxVoters, uint256 snapshot, uint8 kind, address policy, uint96 minVotes)",
+      "event BoostClaimed(uint256 indexed proposalId, address indexed claimer, uint256 amount, uint256 rake)",
+      "event BoostFinalized(uint256 indexed proposalId, uint256 paidCount, uint256 refund)"
     ];
     var VotingMultiplierNFT = [
       // Constants
@@ -342,6 +355,7 @@ var require_abi = __commonJS({
       "function MAX_NFTS_PER_ACCOUNT() view returns (uint256)",
       // Tier Management
       "function createTier(address dao, string name, uint256 multiplier, uint256 maxSupply, uint256 price) returns (uint256 tierId)",
+      "function createTierViaGovernance(address subdao, string name, uint256 multiplier, uint256 maxSupply, uint256 price) returns (uint256 tierId)",
       "function getTier(uint256 tierId) view returns (tuple(string name, uint256 multiplier, uint256 maxSupply, uint256 minted, uint256 price, address dao))",
       "function tierCount() view returns (uint256)",
       "function tiers(uint256) view returns (string name, uint256 multiplier, uint256 maxSupply, uint256 minted, uint256 price, address dao)",

package/dist/index.cjs

@@ -14,7 +14,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@sage-protocol/sdk",
-      version: "0.2.5",
+      version: "0.2.8",
       description: "Backend-agnostic SDK for interacting with the Sage Protocol (governance, SubDAOs, tokens).",
       main: "dist/index.cjs",
       module: "dist/index.mjs",
@@ -140,7 +140,6 @@ var require_abi = __commonJS({
       // Core factory reads
       "function timelockMinDelay() view returns (uint256)",
       "function premiumPromptsAddress() view returns (address)",
-      "function simpleKeyStoreAddress() view returns (address)",
       "function governanceConfigAddress() view returns (address)",
       "function libraryRegistryAddress() view returns (address)",
       // Canonical per‑SubDAO mapping
@@ -327,14 +326,28 @@ var require_abi = __commonJS({
       "event TokensSwept(address indexed token, address indexed to, uint256 amount)"
     ];
     var GovernanceBoostMerkle = [
-      "function getProposalConfig(uint256) view returns (tuple(uint256 proposalId,address token,uint256 totalAmount,uint64 startTime,uint64 endTime,uint256 merkleRoot))",
-      "function fund(uint256 proposalId, uint256 amount)",
-      "function setRoot(uint256 proposalId, uint256 merkleRoot)"
+      "function createBoost(uint256 proposalId, uint256 totalPool)",
+      "function setMerkleRoot(uint256 proposalId, bytes32 root)",
+      "function finalize(uint256 proposalId)",
+      "function claim(uint256 proposalId, address account, uint256 amount, bytes32[] proof)",
+      "function getBoost(uint256 proposalId) view returns (uint256 totalPool, uint256 totalClaimed, bytes32 merkleRoot, bool active, bool finalized, address creator)",
+      "function claimed(uint256 proposalId, address account) view returns (bool)",
+      "event BoostCreated(uint256 indexed proposalId, address indexed creator, uint256 totalPool)",
+      "event MerkleRootSet(uint256 indexed proposalId, bytes32 merkleRoot)",
+      "event RewardClaimed(uint256 indexed proposalId, address indexed voter, uint256 amount)",
+      "event BoostFinalized(uint256 indexed proposalId, uint256 totalClaimed, uint256 refunded)"
     ];
     var GovernanceBoostDirect = [
-      "function getDirectConfig(uint256) view returns (tuple(uint256 proposalId,address token,uint256 perVoter,uint256 maxVoters,uint64 startTime,uint64 endTime))",
-      "function create(uint256 proposalId, address token, uint256 perVoter, uint256 maxVoters)",
-      "function fund(uint256 proposalId, uint256 amount)"
+      "function createBoost((address governor,uint256 proposalId,uint256 perVoter,uint256 maxVoters,uint8 kind,address policy,uint96 minVotes,uint8 payoutMode,uint8 support,uint256 startAt,uint256 expiresAt) params)",
+      "function claim(uint256 proposalId, bytes data)",
+      "function finalize(uint256 proposalId)",
+      "function pause(uint256 proposalId, bool paused)",
+      "function setProtocolRake(uint96 rakeBps, address protocolTreasury)",
+      "function getBoost(uint256 proposalId) view returns (tuple(address creator, address governor, uint256 proposalId, uint256 snapshot, uint256 perVoter, uint256 maxVoters, uint256 votersPaid, uint96 minVotes, uint8 payoutMode, uint8 support, uint256 startAt, uint256 expiresAt, uint256 totalPool, uint256 totalPaid, uint8 kind, address policy, bool active, bool paused) boost)",
+      "function claimed(uint256 proposalId, address account) view returns (bool)",
+      "event BoostCreated(uint256 indexed proposalId, address indexed governor, uint256 perVoter, uint256 maxVoters, uint256 snapshot, uint8 kind, address policy, uint96 minVotes)",
+      "event BoostClaimed(uint256 indexed proposalId, address indexed claimer, uint256 amount, uint256 rake)",
+      "event BoostFinalized(uint256 indexed proposalId, uint256 paidCount, uint256 refund)"
     ];
     var VotingMultiplierNFT = [
       // Constants
@@ -342,6 +355,7 @@ var require_abi = __commonJS({
       "function MAX_NFTS_PER_ACCOUNT() view returns (uint256)",
       // Tier Management
       "function createTier(address dao, string name, uint256 multiplier, uint256 maxSupply, uint256 price) returns (uint256 tierId)",
+      "function createTierViaGovernance(address subdao, string name, uint256 multiplier, uint256 maxSupply, uint256 price) returns (uint256 tierId)",
       "function getTier(uint256 tierId) view returns (tuple(string name, uint256 multiplier, uint256 maxSupply, uint256 minted, uint256 price, address dao))",
       "function tierCount() view returns (uint256)",
       "function tiers(uint256) view returns (string name, uint256 multiplier, uint256 maxSupply, uint256 minted, uint256 price, address dao)",
@@ -6925,6 +6939,7 @@ var require_factory = __commonJS({
     var { Contract, Interface, getAddress } = require("ethers");
     var ABI = require_abi();
     var { SageSDKError, CODES } = require_errors();
+    var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
     function normalise(address, label) {
       if (!address) throw new SageSDKError(CODES.INVALID_ARGS, `${label} required`);
       try {
@@ -6933,6 +6948,14 @@ var require_factory = __commonJS({
         throw new SageSDKError(CODES.INVALID_ARGS, `invalid ${label}`, { cause: err });
       }
     }
+    function normaliseNonZero(address, label) {
+      const addr = normalise(address, label);
+      if (addr === ZERO_ADDRESS) {
+        const hint = label === "operatorAdmin" ? " (set it explicitly; it may be the same as operatorExecutor)" : "";
+        throw new SageSDKError(CODES.INVALID_ARGS, `${label} cannot be zero address${hint}`);
+      }
+      return addr;
+    }
     async function getFactoryConfig({ provider, factory: factory2 }) {
       if (!provider) throw new SageSDKError(CODES.INVALID_ARGS, "provider required");
       const addr = normalise(factory2, "factory");
@@ -6946,7 +6969,6 @@ var require_factory = __commonJS({
         allowStableForkFee,
         timelockMinDelay,
         premiumPromptsAddress,
-        simpleKeyStoreAddress,
         governanceConfigAddress,
         libraryRegistryAddress,
         templateModule
@@ -6969,7 +6991,6 @@ var require_factory = __commonJS({
         contract.allowStableForkFee().catch(() => null),
         contract.timelockMinDelay().catch(() => null),
         contract.premiumPromptsAddress().catch(() => null),
-        contract.simpleKeyStoreAddress().catch(() => null),
         contract.governanceConfigAddress().catch(() => null),
         contract.libraryRegistryAddress().catch(() => null),
         contract.templateModule().catch(() => null)
@@ -6984,7 +7005,6 @@ var require_factory = __commonJS({
         allowStableForkFee,
         timelockMinDelay,
         premiumPromptsAddress: premiumPromptsAddress && premiumPromptsAddress !== "0x0000000000000000000000000000000000000000" ? getAddress(premiumPromptsAddress) : null,
-        simpleKeyStoreAddress: simpleKeyStoreAddress && simpleKeyStoreAddress !== "0x0000000000000000000000000000000000000000" ? getAddress(simpleKeyStoreAddress) : null,
         governanceConfigAddress: governanceConfigAddress && governanceConfigAddress !== "0x0000000000000000000000000000000000000000" ? getAddress(governanceConfigAddress) : null,
         libraryRegistryAddress: libraryRegistryAddress && libraryRegistryAddress !== "0x0000000000000000000000000000000000000000" ? getAddress(libraryRegistryAddress) : null,
         templateModule: templateModule ? getAddress(templateModule) : null
@@ -7198,7 +7218,7 @@ var require_factory = __commonJS({
         0n,
         // minStakeAmount deprecated
         normalise(operatorExecutor, "operatorExecutor"),
-        normalise(operatorAdmin, "operatorAdmin"),
+        normaliseNonZero(operatorAdmin, "operatorAdmin"),
         tuple
       ]);
       return { to: addr, data: payload, value: 0n };
@@ -7230,7 +7250,7 @@ var require_factory = __commonJS({
         0n,
         // minStakeAmount deprecated
         normalise(operatorExecutor, "operatorExecutor"),
-        normalise(operatorAdmin, "operatorAdmin"),
+        normaliseNonZero(operatorAdmin, "operatorAdmin"),
         Boolean(anyoneExec),
         Boolean(governorProposer),
         tuple
@@ -9451,70 +9471,145 @@ var require_boost = __commonJS({
         throw new SageSDKError(CODES.RPC_ERROR, "failed to normalise bigint", { cause: err });
       }
     }
-    async function getMerkleConfig({ provider, manager, proposalId }) {
+    var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+    async function getMerkleBoost({ provider, manager, proposalId }) {
       if (!provider) throw new SageSDKError(CODES.INVALID_ARGS, "provider required");
       const addr = normalise(manager, "manager");
       const contract = new Contract(addr, ABI.GovernanceBoostMerkle, provider);
-      const config = await contract.getProposalConfig(proposalId).catch(() => null);
-      if (!config) return null;
+      const result = await contract.getBoost(proposalId).catch(() => null);
+      if (!result) return null;
+      const [totalPool, totalClaimed, merkleRoot, active, finalized, creator] = result;
+      const creatorAddr = creator ? getAddress(creator) : ZERO_ADDRESS;
+      const pool = toBigInt(totalPool);
+      if (!active && !finalized && pool === 0n && creatorAddr === ZERO_ADDRESS) return null;
       return {
         manager: addr,
-        proposalId: Number(config.proposalId ?? proposalId),
-        token: config.token ? getAddress(config.token) : null,
-        totalAmount: toBigInt(config.totalAmount),
-        startTime: Number(config.startTime ?? 0),
-        endTime: Number(config.endTime ?? 0),
-        merkleRoot: toBigInt(config.merkleRoot ?? 0n)
+        proposalId: Number(proposalId),
+        totalPool: pool,
+        totalClaimed: toBigInt(totalClaimed),
+        merkleRoot,
+        active: Boolean(active),
+        finalized: Boolean(finalized),
+        creator: creatorAddr
       };
     }
-    function buildMerkleFundTx({ manager, proposalId, amount }) {
+    function buildMerkleCreateTx({ manager, proposalId, totalPool, amount }) {
+      const addr = normalise(manager, "manager");
+      const pool = totalPool ?? amount;
+      const data = MerkleInterface.encodeFunctionData("createBoost", [Number(proposalId), BigInt(pool ?? 0n)]);
+      return { to: addr, data, value: 0n };
+    }
+    function buildMerkleSetMerkleRootTx({ manager, proposalId, root, merkleRoot }) {
+      const addr = normalise(manager, "manager");
+      const nextRoot = root ?? merkleRoot;
+      const data = MerkleInterface.encodeFunctionData("setMerkleRoot", [Number(proposalId), nextRoot]);
+      return { to: addr, data, value: 0n };
+    }
+    function buildMerkleFinalizeTx({ manager, proposalId }) {
       const addr = normalise(manager, "manager");
-      const data = MerkleInterface.encodeFunctionData("fund", [Number(proposalId), BigInt(amount ?? 0n)]);
+      const data = MerkleInterface.encodeFunctionData("finalize", [Number(proposalId)]);
       return { to: addr, data, value: 0n };
     }
-    function buildMerkleSetRootTx({ manager, proposalId, merkleRoot }) {
+    function buildMerkleClaimTx({ manager, proposalId, account, amount, proof }) {
       const addr = normalise(manager, "manager");
-      const data = MerkleInterface.encodeFunctionData("setRoot", [Number(proposalId), BigInt(merkleRoot ?? 0n)]);
+      const data = MerkleInterface.encodeFunctionData("claim", [
+        Number(proposalId),
+        normalise(account, "account"),
+        BigInt(amount ?? 0n),
+        proof || []
+      ]);
       return { to: addr, data, value: 0n };
     }
-    async function getDirectConfig({ provider, manager, proposalId }) {
+    async function getDirectBoost({ provider, manager, proposalId }) {
       if (!provider) throw new SageSDKError(CODES.INVALID_ARGS, "provider required");
       const addr = normalise(manager, "manager");
       const contract = new Contract(addr, ABI.GovernanceBoostDirect, provider);
-      const config = await contract.getDirectConfig(proposalId).catch(() => null);
-      if (!config) return null;
+      const boost2 = await contract.getBoost(proposalId).catch(() => null);
+      if (!boost2) return null;
+      const creatorAddr = boost2.creator ? getAddress(boost2.creator) : ZERO_ADDRESS;
+      const pool = toBigInt(boost2.totalPool);
+      if (!boost2.active && pool === 0n && creatorAddr === ZERO_ADDRESS) return null;
       return {
         manager: addr,
-        proposalId: Number(config.proposalId ?? proposalId),
-        token: config.token ? getAddress(config.token) : null,
-        perVoter: toBigInt(config.perVoter),
-        maxVoters: toBigInt(config.maxVoters),
-        startTime: Number(config.startTime ?? 0),
-        endTime: Number(config.endTime ?? 0)
+        proposalId: Number(boost2.proposalId ?? proposalId),
+        creator: creatorAddr,
+        governor: boost2.governor ? getAddress(boost2.governor) : null,
+        snapshot: toBigInt(boost2.snapshot),
+        perVoter: toBigInt(boost2.perVoter),
+        maxVoters: toBigInt(boost2.maxVoters),
+        votersPaid: toBigInt(boost2.votersPaid),
+        minVotes: toBigInt(boost2.minVotes),
+        payoutMode: Number(boost2.payoutMode ?? 0),
+        support: Number(boost2.support ?? 0),
+        startAt: Number(boost2.startAt ?? 0),
+        expiresAt: Number(boost2.expiresAt ?? 0),
+        totalPool: pool,
+        totalPaid: toBigInt(boost2.totalPaid),
+        kind: Number(boost2.kind ?? 0),
+        policy: boost2.policy ? getAddress(boost2.policy) : null,
+        active: Boolean(boost2.active),
+        paused: Boolean(boost2.paused)
       };
     }
-    function buildDirectCreateTx({ manager, proposalId, token: token2, perVoter, maxVoters }) {
+    function buildDirectCreateTx({
+      manager,
+      governor,
+      proposalId,
+      perVoter,
+      maxVoters,
+      kind = 0,
+      policy = ZERO_ADDRESS,
+      minVotes = 0n,
+      payoutMode = 0,
+      support = 0,
+      startAt = 0n,
+      expiresAt = 0n
+    }) {
       const addr = normalise(manager, "manager");
-      const data = DirectInterface.encodeFunctionData("create", [
-        Number(proposalId),
-        normalise(token2, "token"),
+      const params = [
+        normalise(governor, "governor"),
+        BigInt(proposalId ?? 0n),
         BigInt(perVoter ?? 0n),
-        BigInt(maxVoters ?? 0n)
-      ]);
+        BigInt(maxVoters ?? 0n),
+        Number(kind),
+        policy ? normalise(policy, "policy") : ZERO_ADDRESS,
+        BigInt(minVotes ?? 0n),
+        Number(payoutMode),
+        Number(support),
+        BigInt(startAt ?? 0n),
+        BigInt(expiresAt ?? 0n)
+      ];
+      const data = DirectInterface.encodeFunctionData("createBoost", [params]);
       return { to: addr, data, value: 0n };
     }
-    function buildDirectFundTx({ manager, proposalId, amount }) {
+    function buildDirectClaimTx({ manager, proposalId, data = "0x" }) {
       const addr = normalise(manager, "manager");
-      const data = DirectInterface.encodeFunctionData("fund", [Number(proposalId), BigInt(amount ?? 0n)]);
+      const callData = DirectInterface.encodeFunctionData("claim", [BigInt(proposalId ?? 0n), data]);
+      return { to: addr, data: callData, value: 0n };
+    }
+    function buildDirectFinalizeTx({ manager, proposalId }) {
+      const addr = normalise(manager, "manager");
+      const data = DirectInterface.encodeFunctionData("finalize", [BigInt(proposalId ?? 0n)]);
       return { to: addr, data, value: 0n };
     }
     module2.exports = {
-      getMerkleConfig,
-      buildMerkleFundTx,
-      buildMerkleSetRootTx,
-      getDirectConfig,
+      // Merkle manager (GovernanceBoostManagerMerkle)
+      getMerkleBoost,
+      buildMerkleCreateTx,
+      buildMerkleSetMerkleRootTx,
+      buildMerkleFinalizeTx,
+      buildMerkleClaimTx,
+      // Legacy names (back-compat)
+      getMerkleConfig: getMerkleBoost,
+      buildMerkleFundTx: buildMerkleCreateTx,
+      buildMerkleSetRootTx: buildMerkleSetMerkleRootTx,
+      // Direct manager (GovernanceBoostManager)
+      getDirectBoost,
       buildDirectCreateTx,
-      buildDirectFundTx
+      buildDirectClaimTx,
+      buildDirectFinalizeTx,
+      // Legacy name (back-compat)
+      getDirectConfig: getDirectBoost
     };
   }
 });
@@ -12024,20 +12119,6 @@ ${error}` : ""}`;
             const price = d[2].toString();
             const manifest = d[3];
             return { signature: sig, args: [hash, subdao2, price, `"${manifest}"`] };
-          } else if (data.startsWith(require("ethers").id("setWrappedKey(bytes32,bytes,bytes32)").slice(0, 10))) {
-            const { ethers: ethers2 } = require("ethers");
-            const sig = "setWrappedKey(bytes32,bytes,bytes32)";
-            const iface = new ethers2.Interface([`function ${sig}`]);
-            const d = iface.decodeFunctionData("setWrappedKey", data);
-            const cidHash = d[0];
-            const wrapped = d[1];
-            const wrapperId = d[2];
-            return { signature: sig, args: [cidHash, wrapped, wrapperId] };
-          } else if (data.startsWith(require("ethers").id("lockKey(bytes32)").slice(0, 10))) {
-            const { ethers: ethers2 } = require("ethers");
-            const iface = new ethers2.Interface(["function lockKey(bytes32)"]);
-            const d = iface.decodeFunctionData("lockKey", data);
-            return { signature: "lockKey(bytes32)", args: [d[0]] };
           } else if (data.startsWith(require("ethers").id("claim(uint256,address,uint256,bytes32[])").slice(0, 10))) {
             const { ethers: ethers2 } = require("ethers");
             const sig = "claim(uint256,address,uint256,bytes32[])";