@elgora/cli 7.2.1 → 7.2.3

package/dist/cli.js

@@ -3215,6 +3215,16 @@ function decodeBountyStatus(status) {
   }
   return decoded;
 }
+var BPS_DENOMINATOR = 10000n;
+function settlementAmounts(escrowAmount, treasuryFeeBps, guardianFeeBps) {
+  const treasuryAmount = escrowAmount * BigInt(treasuryFeeBps) / BPS_DENOMINATOR;
+  const guardianAmount = escrowAmount * BigInt(guardianFeeBps) / BPS_DENOMINATOR;
+  return {
+    treasuryAmount,
+    guardianAmount,
+    winnerPool: escrowAmount - treasuryAmount - guardianAmount
+  };
+}
 
 // ../../packages/core/src/api/bounty-detail.ts
 import { zeroAddress } from "viem";
@@ -4101,6 +4111,11 @@ async function main(env = process.env, argv = process.argv.slice(2)) {
         `Award for bounty_id ${args.bountyId.toString()} is already claimed or partially claimed`
       );
     }
+    claimableAmount = settlementAmounts(
+      parameters.escrowAmount,
+      parameters.treasuryFeeBps,
+      parameters.guardianFeeBps
+    ).winnerPool;
     functionName = "claimAward";
   } else if (status === "no_valid_submission" || status === "timed_out") {
     if (parameters.poster.toLowerCase() !== normalizedClaimant) {
@@ -4890,6 +4905,16 @@ function readArgs(argv) {
   };
 }
 
+// ../../packages/subgraph-client/src/errors.ts
+var SubgraphReadError = class extends Error {
+  reason;
+  constructor(reason, message, options) {
+    super(message, options);
+    this.name = "SubgraphReadError";
+    this.reason = reason;
+  }
+};
+
 // ../../packages/subgraph-client/src/status.ts
 function mapSubgraphStatus(value) {
   switch (value) {
@@ -4981,6 +5006,7 @@ var GUARDIAN_ROSTER_SNAPSHOT_FIELDS = `
   id
   memberCount
   members {
+    position
     account
     name
     encryptionPublicKey
@@ -5141,26 +5167,41 @@ function createElgoraSubgraphClient(options) {
     return options.hubAddress;
   }
   async function execute(query, variables) {
-    const response = await fetchImpl(
-      endpoint,
-      JSON.stringify({ query, variables })
-    );
-    const raw = await response.text();
+    let response;
+    let raw;
+    try {
+      response = await fetchImpl(
+        endpoint,
+        JSON.stringify({ query, variables })
+      );
+      raw = await response.text();
+    } catch (cause) {
+      throw new SubgraphReadError(
+        "transport_failed",
+        "Subgraph request did not complete",
+        { cause }
+      );
+    }
     if (!response.ok) {
-      throw new Error(
+      throw new SubgraphReadError(
+        "request_failed",
         `Subgraph request failed with status ${response.status}: ${raw}`
       );
     }
     const parsed = parseJson(raw);
     const errors = readRecord(parsed).errors;
     if (Array.isArray(errors) && errors.length > 0) {
-      throw new Error(
+      throw new SubgraphReadError(
+        "query_errors",
         `Subgraph query returned errors: ${JSON.stringify(errors)}`
       );
     }
     const data = readRecord(parsed).data;
     if (data === void 0 || data === null) {
-      throw new Error("Subgraph response did not include a data object");
+      throw new SubgraphReadError(
+        "malformed_response",
+        "Subgraph response did not include a data object"
+      );
     }
     return data;
   }
@@ -5350,7 +5391,8 @@ function mapAnalyticsGuardianRoster(row) {
   const members = asArray(record.members, "members");
   const memberCount = asNumber(record.memberCount, "memberCount");
   if (members.length !== memberCount) {
-    throw new Error(
+    throw new SubgraphReadError(
+      "unexpected_shape",
       "Historical Guardian roster members do not match memberCount"
     );
   }
@@ -5457,6 +5499,7 @@ function mapSubmissionFields(row) {
 function mapGuardianRosterMember(row) {
   const record = readRecord(row);
   return {
+    position: asSafeInteger(record.position, "members.position"),
     account: asHex(record.account, "account"),
     name: asString(record.name, "name"),
     encryptionPublicKey: asString(
@@ -5467,10 +5510,19 @@ function mapGuardianRosterMember(row) {
 }
 function mapGuardianRosterSnapshot(row) {
   const record = readRecord(row);
+  const members = asArray(record.members, "members").map(mapGuardianRosterMember).sort((left, right) => left.position - right.position);
+  members.forEach((member, index) => {
+    if (member.position !== index) {
+      throw new SubgraphReadError(
+        "unexpected_shape",
+        `Guardian roster snapshot positions are not 0..n-1 for '${asHex(record.id, "id")}'`
+      );
+    }
+  });
   return {
     rosterHash: asHex(record.id, "id"),
     memberCount: asNumber(record.memberCount, "memberCount"),
-    members: asArray(record.members, "members").map(mapGuardianRosterMember),
+    members: members.map(({ position: _position, ...member }) => member),
     recordedAt: asString(record.recordedAt, "recordedAt")
   };
 }
@@ -5549,7 +5601,10 @@ function parseJson(raw) {
   try {
     return JSON.parse(raw);
   } catch {
-    throw new Error(`Subgraph returned non-JSON response: ${raw}`);
+    throw new SubgraphReadError(
+      "malformed_response",
+      `Subgraph returned non-JSON response: ${raw}`
+    );
   }
 }
 function readRecord(value) {
@@ -5557,12 +5612,16 @@ function readRecord(value) {
 }
 function asString(value, field) {
   if (typeof value === "string") return value;
-  throw new Error(`Expected string for subgraph field '${field}'`);
+  throw new SubgraphReadError(
+    "unexpected_shape",
+    `Expected string for subgraph field '${field}'`
+  );
 }
 function asUnsignedBigInt(value, field) {
   const text = asString(value, field);
   if (/^(?:0|[1-9][0-9]*)$/.test(text)) return BigInt(text);
-  throw new Error(
+  throw new SubgraphReadError(
+    "unexpected_shape",
     `Expected non-negative integer string for subgraph field '${field}'`
   );
 }
@@ -5572,29 +5631,42 @@ function asNullableString(value, field) {
 }
 function asNumber(value, field) {
   if (typeof value === "number" && Number.isFinite(value)) return value;
-  throw new Error(`Expected number for subgraph field '${field}'`);
+  throw new SubgraphReadError(
+    "unexpected_shape",
+    `Expected number for subgraph field '${field}'`
+  );
 }
 function asSafeInteger(value, field) {
   if (typeof value === "number" && Number.isSafeInteger(value) && value >= 0) {
     return value;
   }
-  throw new Error(
+  throw new SubgraphReadError(
+    "unexpected_shape",
     `Expected non-negative integer for subgraph field '${field}'`
   );
 }
 function asBoolean(value, field) {
   if (typeof value === "boolean") return value;
-  throw new Error(`Expected boolean for subgraph field '${field}'`);
+  throw new SubgraphReadError(
+    "unexpected_shape",
+    `Expected boolean for subgraph field '${field}'`
+  );
 }
 function asArray(value, field) {
   if (Array.isArray(value)) return value;
-  throw new Error(`Expected array for subgraph field '${field}'`);
+  throw new SubgraphReadError(
+    "unexpected_shape",
+    `Expected array for subgraph field '${field}'`
+  );
 }
 function asHex(value, field) {
   if (typeof value === "string" && value.startsWith("0x")) {
     return value.toLowerCase();
   }
-  throw new Error(`Expected hex string for subgraph field '${field}'`);
+  throw new SubgraphReadError(
+    "unexpected_shape",
+    `Expected hex string for subgraph field '${field}'`
+  );
 }
 function asNullableHex(value, field) {
   if (value === null || value === void 0) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elgora/cli",
-  "version": "7.2.1",
+  "version": "7.2.3",
   "description": "Command-line client for Elgora, a decentralized bounty marketplace for science. Lets Posters, Solvers, and Guardians interact with Elgora's public API and on-chain contracts.",
   "type": "module",
   "license": "MIT",