Merge branch 'master' into master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.4.65",
+  "version": "0.4.68",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",

src/constants.json

@@ -6,5 +6,9 @@
   "testnet": {
     "hub": "https://testnet.snapshot.org",
     "sequencer": "https://testnet.seq.snapshot.org"
+  },
+  "local": {
+    "hub": "http://localhost:3000",
+    "sequencer": "http://localhost:3001"
   }
 }

src/sign/index.ts

@@ -48,13 +48,14 @@ export default class Client {
 
   constructor(address: string = constants.livenet.sequencer) {
     address = address.replace(
-      'https://hub.snapshot.org',
+      constants.livenet.hub,
       constants.livenet.sequencer
     );
     address = address.replace(
-      'https://testnet.snapshot.org',
+      constants.testnet.hub,
       constants.testnet.sequencer
     );
+    address = address.replace(constants.local.hub, constants.local.sequencer);
     this.address = address;
   }
 

src/voting/approval.spec.js

@@ -19,7 +19,7 @@ const example2 = () => {
     [139, 139, 139],
     [125, 125, 125]
   ];
-  const scoresTotal = 1161;
+  const scoresTotal = 1218;
   const votes = example.votes.map((vote) => ({
     choice: vote.choice,
     balance: 3,
@@ -57,7 +57,7 @@ const rndChoices = () => {
     rndNumber(),
     rndNumber()
   ];
-  return Math.random() < 0.9 ? choices : [];
+  return choices;
 };
 
 const votesWithInvalidChoices = () => {
@@ -161,23 +161,11 @@ test.each(getScoresByStrategyTests)(
 
 const getScoresTotalTests = [
   [example.proposal, example.votes, example.strategies, example.scoresTotal],
-  [
-    example.proposal,
-    votesWithInvalidChoices(),
-    example.strategies,
-    example.scoresTotal
-  ],
   [
     example2().proposal,
     example2().votes,
     example2().strategies,
     example2().scoresTotal
-  ],
-  [
-    example2().proposal,
-    votesWithInvalidChoices2(),
-    example2().strategies,
-    example2().scoresTotal
   ]
 ];
 

src/voting/approval.ts

@@ -29,9 +29,7 @@ export default class ApprovalVoting {
         (choice) => proposalChoices?.[choice - 1] !== undefined
       ) &&
       // If any voteChoice is duplicated, return false
-      voteChoice.length === new Set(voteChoice).size &&
-      // If voteChoice is empty, return false
-      voteChoice.length > 0
+      voteChoice.length === new Set(voteChoice).size
     );
   }
 
@@ -64,7 +62,7 @@ export default class ApprovalVoting {
   }
 
   getScoresTotal(): number {
-    return this.getValidVotes().reduce((a, b) => a + b.balance, 0);
+    return this.votes.reduce((a, b) => a + b.balance, 0);
   }
 
   getChoiceString(): string {

src/voting/examples/approval.json

@@ -5,7 +5,7 @@
   "strategies": [{ "name": "ticket", "network": 1, "params": {} }],
   "scores": [257, 171, 139, 125],
   "scoresByStrategy": [[257], [171], [139], [125]],
-  "scoresTotal": 387,
+  "scoresTotal": 406,
   "selectedChoice": [1, 3],
   "votes": [
     {