adding script to configure fresh election

45930 · Nov 28, 2023 · 89382da · 89382da
1 parent a691113
commit 89382da
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 18 deletions.
diff --git a/config.json b/config.json
@@ -1,4 +1,21 @@
 {
   "version": 1,
-  "deployAliases": {}
-}
+  "deployAliases": {
+    "berkeleyx": {
+      "url": "https://proxy.berkeley.minaexplorer.com/graphql",
+      "keyPath": "keys/berkeley.json",
+      "feepayerKeyPath": "/Users/cobydurling/.cache/zkapp-cli/keys/berkeley-deployer.json",
+      "feepayerAlias": "berkeley-deployer",
+      "fee": "0.1",
+      "smartContract": "TokenElection"
+    },
+    "berkeley": {
+      "url": "https://proxy.berkeley.minaexplorer.com/graphql",
+      "keyPath": "keys/berkeley.json",
+      "feepayerKeyPath": "/Users/cobydurling/.cache/zkapp-cli/keys/berkeley-deployer.json",
+      "feepayerAlias": "berkeley-deployer",
+      "fee": "0.1",
+      "smartContract": "TokenElection"
+    }
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,10 +44,8 @@
         "ts-jest": "^27.0.7",
         "typescript": "^4.7.2"
     },
-    "peerDependencies": {
-        "o1js": "0.14.*"
-    },
     "dependencies": {
+        "o1js": "^0.14.2",
         "o1js-pack": "^0.4.3",
         "zkapp-cli": "^0.15.*"
     }

diff --git a/src/ElectionFactory.ts b/src/ElectionFactory.ts
diff --git a/src/TokenElection.test.ts → src/TokenElection/BaseTokenElection.test.ts b/src/TokenElection.test.ts → src/TokenElection/BaseTokenElection.test.ts
@@ -1,4 +1,4 @@
-import { Ballot, PartialBallot, TokenElection } from './TokenElection';
+import { Ballot, PartialBallot, TokenElection } from './BaseTokenElection';
 import { AccountUpdate, Mina, PrivateKey, PublicKey, UInt32 } from 'o1js';
 
 describe("TokenElection", () => {

diff --git a/src/TokenElection.ts → src/TokenElection/BaseTokenElection.ts b/src/TokenElection.ts → src/TokenElection/BaseTokenElection.ts
diff --git a/src/TokenElection/WhitelistTokenElection.ts b/src/TokenElection/WhitelistTokenElection.ts
@@ -0,0 +1,5 @@
+import { TokenElection } from "./BaseTokenElection";
+
+class WhitelistTokenElection extends TokenElection {
+
+}
diff --git a/src/examples/ZkIgnite/getElectionDetails.ts b/src/examples/ZkIgnite/getElectionDetails.ts
@@ -1,5 +1,5 @@
 import { Mina, PublicKey, fetchAccount } from 'o1js';
-import { TokenElection, IpfsHash } from './../../TokenElection.js';
+import { TokenElection, IpfsHash } from '../../TokenElection/BaseTokenElection.js';
 
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs
 import { stdin as input, stdout as output } from 'node:process';

diff --git a/src/examples/ZkIgnite/joinElection.ts b/src/examples/ZkIgnite/joinElection.ts
@@ -1,5 +1,5 @@
 import { AccountUpdate, Mina, PrivateKey, PublicKey, fetchAccount } from 'o1js';
-import { TokenElection, IpfsHash } from './../../TokenElection.js';
+import { TokenElection, IpfsHash } from '../../TokenElection/BaseTokenElection.js';
 import fs from 'fs/promises';
 
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs

diff --git a/src/examples/ZkIgnite/reduceVotes.ts b/src/examples/ZkIgnite/reduceVotes.ts
@@ -1,5 +1,5 @@
 import { AccountUpdate, Mina, PrivateKey, PublicKey, UInt32, fetchAccount, setArchiveGraphqlEndpoint } from 'o1js';
-import { TokenElection, IpfsHash, PartialBallot, Ballot } from './../../TokenElection.js';
+import { TokenElection, IpfsHash, PartialBallot, Ballot } from '../../TokenElection/BaseTokenElection.js';
 import fs from 'fs/promises';
 
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs

diff --git a/src/examples/ZkIgnite/submitVotes.ts b/src/examples/ZkIgnite/submitVotes.ts
@@ -1,5 +1,5 @@
 import { AccountUpdate, Mina, PrivateKey, PublicKey, UInt32, fetchAccount, setArchiveGraphqlEndpoint } from 'o1js';
-import { TokenElection, IpfsHash, PartialBallot, Ballot } from './../../TokenElection.js';
+import { TokenElection, IpfsHash, PartialBallot, Ballot } from '../../TokenElection/BaseTokenElection.js';
 import fs from 'fs/promises';
 
 import * as readline from 'node:readline/promises';  // This uses the promise-based APIs

diff --git a/src/set_election_details.ts b/src/set_election_details.ts
@@ -1,8 +1,8 @@
-const ELECTION_DETAILS_KEY = 'QmPKD74Pfc6aH5Suh1EXqjbfKBYDs5QVARxmpqsNKMKxe3';
+const ELECTION_DETAILS_KEY = 'Qmc8yEQqnYzrAhGSJgjLLyTSUxtsZmxn1grtwVATPSpS4E';
 
 import { Mina, PrivateKey } from 'o1js';
 import fs from 'fs/promises';
-import { TokenElection, IpfsHash } from './TokenElection.js';
+import { TokenElection, IpfsHash } from './TokenElection/BaseTokenElection.js';
 
 // check command line arg
 let deployAlias = process.argv[2];