@vocdoni/davinci-sdk 0.0.6 → 0.0.7

package/dist/index.umd.js

@@ -193,18 +193,20 @@
   }
 
   var CensusOrigin = /* @__PURE__ */ ((CensusOrigin2) => {
-    CensusOrigin2[CensusOrigin2["CensusOriginMerkleTree"] = 1] = "CensusOriginMerkleTree";
-    CensusOrigin2[CensusOrigin2["CensusOriginCSP"] = 2] = "CensusOriginCSP";
+    CensusOrigin2[CensusOrigin2["OffchainStatic"] = 1] = "OffchainStatic";
+    CensusOrigin2[CensusOrigin2["OffchainDynamic"] = 2] = "OffchainDynamic";
+    CensusOrigin2[CensusOrigin2["Onchain"] = 3] = "Onchain";
+    CensusOrigin2[CensusOrigin2["CSP"] = 4] = "CSP";
     return CensusOrigin2;
   })(CensusOrigin || {});
   function isBaseCensusProof(proof) {
     return !!proof && typeof proof.root === "string" && typeof proof.address === "string" && typeof proof.censusOrigin === "number" && Object.values(CensusOrigin).includes(proof.censusOrigin);
   }
   function isMerkleCensusProof(proof) {
-    return isBaseCensusProof(proof) && proof.censusOrigin === 1 /* CensusOriginMerkleTree */ && typeof proof.weight === "string" && typeof proof.value === "string" && typeof proof.siblings === "string";
+    return isBaseCensusProof(proof) && (proof.censusOrigin === 1 /* OffchainStatic */ || proof.censusOrigin === 2 /* OffchainDynamic */ || proof.censusOrigin === 3 /* Onchain */) && typeof proof.weight === "string" && typeof proof.value === "string" && typeof proof.siblings === "string";
   }
   function isCSPCensusProof(proof) {
-    return isBaseCensusProof(proof) && proof.censusOrigin === 2 /* CensusOriginCSP */ && typeof proof.weight === "string" && typeof proof.processId === "string" && typeof proof.publicKey === "string" && typeof proof.signature === "string";
+    return isBaseCensusProof(proof) && proof.censusOrigin === 4 /* CSP */ && typeof proof.weight === "string" && typeof proof.processId === "string" && typeof proof.publicKey === "string" && typeof proof.signature === "string";
   }
   function assertMerkleCensusProof(proof) {
     if (!isMerkleCensusProof(proof)) {
@@ -224,12 +226,27 @@
     return CensusType2;
   })(CensusType || {});
   class Census {
-    constructor(type) {
+    constructor(type, censusOrigin) {
       this._censusId = null;
       this._censusRoot = null;
       this._censusURI = null;
       this._size = null;
       this._type = type;
+      if (censusOrigin !== void 0) {
+        this._censusOrigin = censusOrigin;
+      } else {
+        switch (type) {
+          case "plain" /* PLAIN */:
+          case "weighted" /* WEIGHTED */:
+            this._censusOrigin = CensusOrigin.OffchainStatic;
+            break;
+          case "csp" /* CSP */:
+            this._censusOrigin = CensusOrigin.CSP;
+            break;
+          default:
+            throw new Error(`Unknown census type: ${type}`);
+        }
+      }
     }
     get censusId() {
       return this._censusId;
@@ -250,24 +267,20 @@
       return this._censusRoot !== null && this._censusURI !== null;
     }
     /**
-     * Convert CensusType to CensusOrigin enum for API compatibility
+     * Get the census origin (OffchainStatic, OffchainDynamic, Onchain, or CSP)
      */
     get censusOrigin() {
-      switch (this._type) {
-        case "plain" /* PLAIN */:
-        case "weighted" /* WEIGHTED */:
-          return CensusOrigin.CensusOriginMerkleTree;
-        case "csp" /* CSP */:
-          return CensusOrigin.CensusOriginCSP;
-        default:
-          throw new Error(`Unknown census type: ${this._type}`);
-      }
+      return this._censusOrigin;
     }
   }
 
   class PlainCensus extends Census {
-    constructor() {
-      super(CensusType.PLAIN);
+    /**
+     * Creates a new PlainCensus
+     * @param censusOrigin - The census origin (defaults to OffchainStatic for backward compatibility)
+     */
+    constructor(censusOrigin) {
+      super(CensusType.PLAIN, censusOrigin);
       this._participants = /* @__PURE__ */ new Set();
     }
     /**
@@ -325,8 +338,12 @@
   }
 
   class WeightedCensus extends Census {
-    constructor() {
-      super(CensusType.WEIGHTED);
+    /**
+     * Creates a new WeightedCensus
+     * @param censusOrigin - The census origin (defaults to OffchainStatic for backward compatibility)
+     */
+    constructor(censusOrigin) {
+      super(CensusType.WEIGHTED, censusOrigin);
       this._participants = /* @__PURE__ */ new Map();
     }
     /**
@@ -418,7 +435,7 @@
 
   class CspCensus extends Census {
     constructor(publicKey, cspURI, size) {
-      super(CensusType.CSP);
+      super(CensusType.CSP, CensusOrigin.CSP);
       if (!/^(0x)?[0-9a-fA-F]+$/.test(publicKey)) {
         throw new Error("Public key is missing or invalid");
       }
@@ -442,8 +459,16 @@
   }
 
   class PublishedCensus extends Census {
-    constructor(type, root, uri, size) {
-      super(type);
+    /**
+     * Creates a PublishedCensus from existing census data
+     * @param type - The census type (PLAIN, WEIGHTED, or CSP)
+     * @param root - The census root
+     * @param uri - The census URI
+     * @param size - The census size (number of participants)
+     * @param censusOrigin - The census origin (optional - defaults based on type if not provided)
+     */
+    constructor(type, root, uri, size, censusOrigin) {
+      super(type, censusOrigin);
       this._censusRoot = root;
       this._censusURI = uri;
       this._size = size;
@@ -942,6 +967,8 @@
   }
   class ProcessCensusError extends ContractServiceError {
   }
+  class CensusNotUpdatable extends ContractServiceError {
+  }
   class ProcessDurationError extends ContractServiceError {
   }
   class ProcessStateTransitionError extends ContractServiceError {
@@ -1121,12 +1148,12 @@
         cb
       ).catch((err) => console.error("Error setting up ProcessDurationChanged listener:", err));
     }
-    onStateRootUpdated(cb) {
+    onStateTransitioned(cb) {
       this.setupEventListener(
         this.contract,
-        this.contract.filters.ProcessStateRootUpdated(),
+        this.contract.filters.ProcessStateTransitioned(),
         cb
-      ).catch((err) => console.error("Error setting up StateRootUpdated listener:", err));
+      ).catch((err) => console.error("Error setting up ProcessStateTransitioned listener:", err));
     }
     onProcessResultsSet(cb) {
       this.setupEventListener(
@@ -2020,7 +2047,7 @@
         signature,
         voteId
       };
-      if (process.census.censusOrigin === CensusOrigin.CensusOriginCSP) {
+      if (process.census.censusOrigin === CensusOrigin.CSP) {
         voteRequest.censusProof = censusProof;
       }
       await this.submitVoteRequest(voteRequest);
@@ -2136,7 +2163,7 @@
      * Get census proof based on census origin type
      */
     async getCensusProof(censusOrigin, censusRoot, voterAddress, processId) {
-      if (censusOrigin === CensusOrigin.CensusOriginMerkleTree) {
+      if (censusOrigin === CensusOrigin.OffchainStatic || censusOrigin === CensusOrigin.OffchainDynamic || censusOrigin === CensusOrigin.Onchain) {
         if (this.censusProviders.merkle) {
           const proof = await this.censusProviders.merkle({
             censusRoot,
@@ -2150,13 +2177,13 @@
             root: censusRoot,
             address: voterAddress,
             weight,
-            censusOrigin: CensusOrigin.CensusOriginMerkleTree,
+            censusOrigin,
             value: "",
             siblings: ""
           };
         }
       }
-      if (censusOrigin === CensusOrigin.CensusOriginCSP) {
+      if (censusOrigin === CensusOrigin.CSP) {
         if (!this.censusProviders.csp) {
           throw new Error(
             "CSP voting requires a CSP census proof provider. Pass one via VoteOrchestrationService(..., { csp: yourFn })."
@@ -2730,7 +2757,7 @@
      *   title: "My Election",
      *   description: "A simple election",
      *   census: {
-     *     type: CensusOrigin.CensusOriginMerkleTree,
+     *     type: CensusOrigin.OffchainStatic,
      *     root: "0x1234...",
      *     size: 100,
      *     uri: "ipfs://..."
@@ -2817,7 +2844,7 @@
      *   title: "My Election",
      *   description: "A simple election",
      *   census: {
-     *     type: CensusOrigin.CensusOriginMerkleTree,
+     *     type: CensusOrigin.OffchainStatic,
      *     root: "0x1234...",
      *     size: 100,
      *     uri: "ipfs://your-census-uri"
@@ -3516,6 +3543,7 @@
 
   exports.BaseService = BaseService;
   exports.Census = Census;
+  exports.CensusNotUpdatable = CensusNotUpdatable;
   exports.CensusOrchestrator = CensusOrchestrator;
   exports.CensusOrigin = CensusOrigin;
   exports.CensusType = CensusType;

package/dist/sequencer.d.ts

@@ -99,10 +99,14 @@ declare class BaseService {
  * Census origin types
  */
 declare enum CensusOrigin {
-    /** Indicates that the census is derived from a Merkle Tree structure */
-    CensusOriginMerkleTree = 1,
-    /** Indicates that the census is provided by a Credential Service Provider (CSP) */
-    CensusOriginCSP = 2
+    /** Offchain static Merkle Tree census */
+    OffchainStatic = 1,
+    /** Offchain dynamic Merkle Tree census */
+    OffchainDynamic = 2,
+    /** Onchain Merkle Tree census */
+    Onchain = 3,
+    /** Credential Service Provider (CSP) census using EdDSA BLS12-377 */
+    CSP = 4
 }
 interface BaseCensusProof {
     /** The Merkle root (hex-prefixed). */
@@ -111,18 +115,18 @@ interface BaseCensusProof {
     address: string;
     /** The weight as a decimal string. */
     weight: string;
-    /** Census origin type: CensusOriginMerkleTree for merkle proofs, CensusOriginCSP for csp proofs */
+    /** Census origin type: OffchainStatic/OffchainDynamic/Onchain for merkle proofs, CSP for csp proofs */
     censusOrigin: CensusOrigin;
 }
 interface MerkleCensusProof extends BaseCensusProof {
-    censusOrigin: CensusOrigin.CensusOriginMerkleTree;
+    censusOrigin: CensusOrigin.OffchainStatic | CensusOrigin.OffchainDynamic | CensusOrigin.Onchain;
     /** The leaf value (hex-prefixed weight). */
     value: string;
     /** The serialized sibling path (hex-prefixed). */
     siblings: string;
 }
 interface CSPCensusProof extends BaseCensusProof {
-    censusOrigin: CensusOrigin.CensusOriginCSP;
+    censusOrigin: CensusOrigin.CSP;
     /** The process id signed with the address (hex-prefixed). */
     processId: string;
     /** The public key of the csp (hex-prefixed). */
@@ -181,6 +185,7 @@ interface GetProcessResponse {
     ballotMode: BallotMode;
     census: CensusData;
     votersCount: string;
+    maxVoters: string;
     overwrittenVotesCount: string;
     isAcceptingVotes: boolean;
     sequencerStats: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocdoni/davinci-sdk",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@ethereumjs/common": "^4.4.0",
-    "@vocdoni/davinci-contracts": "0.0.29",
+    "@vocdoni/davinci-contracts": "0.0.31",
     "axios": "^1.8.4",
     "ethers": "^6.7.1",
     "snarkjs": "^0.7.5"