diff --git a/dist/bundle.js b/dist/bundle.js index 95d731a..4541555 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -59,7 +59,7 @@ eval("var basex = __webpack_require__(/*! base-x */ \"./node_modules/@solana/web /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @solana/web3.js */ \"./node_modules/@solana/web3.js/lib/index.browser.esm.js\");\n/* harmony import */ var bs58__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! bs58 */ \"./node_modules/bs58/index.js\");\n/* harmony import */ var bs58__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(bs58__WEBPACK_IMPORTED_MODULE_1__);\nfunction _typeof(o) { \"@babel/helpers - typeof\"; return _typeof = \"function\" == typeof Symbol && \"symbol\" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && \"function\" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? \"symbol\" : typeof o; }, _typeof(o); }\nfunction _regeneratorRuntime() { \"use strict\"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = \"function\" == typeof Symbol ? Symbol : {}, a = i.iterator || \"@@iterator\", c = i.asyncIterator || \"@@asyncIterator\", u = i.toStringTag || \"@@toStringTag\"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, \"\"); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, \"_invoke\", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: \"normal\", arg: t.call(e, r) }; } catch (t) { return { type: \"throw\", arg: t }; } } e.wrap = wrap; var h = \"suspendedStart\", l = \"suspendedYield\", f = \"executing\", s = \"completed\", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { [\"next\", \"throw\", \"return\"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if (\"throw\" !== c.type) { var u = c.arg, h = u.value; return h && \"object\" == _typeof(h) && n.call(h, \"__await\") ? e.resolve(h.__await).then(function (t) { invoke(\"next\", t, i, a); }, function (t) { invoke(\"throw\", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke(\"throw\", t, i, a); }); } a(c.arg); } var r; o(this, \"_invoke\", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error(\"Generator is already running\"); if (o === s) { if (\"throw\" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if (\"next\" === n.method) n.sent = n._sent = n.arg;else if (\"throw\" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else \"return\" === n.method && n.abrupt(\"return\", n.arg); o = f; var p = tryCatch(e, r, n); if (\"normal\" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } \"throw\" === p.type && (o = s, n.method = \"throw\", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, \"throw\" === n && e.iterator[\"return\"] && (r.method = \"return\", r.arg = t, maybeInvokeDelegate(e, r), \"throw\" === r.method) || \"return\" !== n && (r.method = \"throw\", r.arg = new TypeError(\"The iterator does not provide a '\" + n + \"' method\")), y; var i = tryCatch(o, e.iterator, r.arg); if (\"throw\" === i.type) return r.method = \"throw\", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, \"return\" !== r.method && (r.method = \"next\", r.arg = t), r.delegate = null, y) : a : (r.method = \"throw\", r.arg = new TypeError(\"iterator result is not an object\"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = \"normal\", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: \"root\" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || \"\" === e) { var r = e[a]; if (r) return r.call(e); if (\"function\" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + \" is not iterable\"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, \"constructor\", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, \"constructor\", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, \"GeneratorFunction\"), e.isGeneratorFunction = function (t) { var e = \"function\" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || \"GeneratorFunction\" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, \"GeneratorFunction\")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, \"Generator\"), define(g, a, function () { return this; }), define(g, \"toString\", function () { return \"[object Generator]\"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = \"next\", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) \"t\" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if (\"throw\" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = \"throw\", a.arg = e, r.next = n, o && (r.method = \"next\", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if (\"root\" === i.tryLoc) return handle(\"end\"); if (i.tryLoc <= this.prev) { var c = n.call(i, \"catchLoc\"), u = n.call(i, \"finallyLoc\"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error(\"try statement without catch or finally\"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, \"finallyLoc\") && this.prev < o.finallyLoc) { var i = o; break; } } i && (\"break\" === t || \"continue\" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = \"next\", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if (\"throw\" === t.type) throw t.arg; return \"break\" === t.type || \"continue\" === t.type ? this.next = t.arg : \"return\" === t.type ? (this.rval = this.arg = t.arg, this.method = \"return\", this.next = \"end\") : \"normal\" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, \"catch\": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if (\"throw\" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error(\"illegal catch attempt\"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, \"next\" === this.method && (this.arg = t), y; } }, e; }\nfunction _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== \"undefined\" && o[Symbol.iterator] || o[\"@@iterator\"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === \"number\") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError(\"Invalid attempt to iterate non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.\"); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it[\"return\"] != null) it[\"return\"](); } finally { if (didErr) throw err; } } }; }\nfunction _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === \"string\") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === \"Object\" && o.constructor) n = o.constructor.name; if (n === \"Map\" || n === \"Set\") return Array.from(o); if (n === \"Arguments\" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }\nfunction _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }\nfunction asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }\nfunction _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, \"next\", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, \"throw\", err); } _next(undefined); }); }; }\n\n\ndocument.addEventListener('DOMContentLoaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {\n var testing, TOKENID, supply, balance, solana, getTokenAccountBalance, formatNumber, connection, publicKey, sol_balance, TOKEN_PROGRAM_ID, balancePromise;\n return _regeneratorRuntime().wrap(function _callee3$(_context3) {\n while (1) switch (_context3.prev = _context3.next) {\n case 0:\n // Set testing to true if running in a local environment\n testing = false;\n TOKENID = \"G9GQFWQmTiBzm1Hh4gM4ydQB4en3wPUxBZ1PS8DruXy8\";\n supply = 100000;\n balance = 0;\n if (testing) {\n TOKENID = \"9YZ2syoQHvMeksp4MYZoYMtLyFWkkyBgAsVuuJzSZwVu\";\n supply = 17 * 1000000000;\n }\n\n // Initialize Solana connection\n solana = window.solana;\n if (!(!solana || !solana.isPhantom)) {\n _context3.next = 9;\n break;\n }\n alert('Phantom wallet not detected. Please install Phantom and try again.');\n return _context3.abrupt(\"return\");\n case 9:\n _context3.prev = 9;\n getTokenAccountBalance = /*#__PURE__*/function () {\n var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(wallet, solanaConnection) {\n var filters, accounts, balance, _iterator, _step, account, parsedAccountInfo, mintAddress, tokenBalance;\n return _regeneratorRuntime().wrap(function _callee$(_context) {\n while (1) switch (_context.prev = _context.next) {\n case 0:\n filters = [{\n dataSize: 165 // size of account (bytes)\n }, {\n memcmp: {\n offset: 32,\n // location of our query in the account (bytes)\n bytes: wallet // our search criteria, a base58 encoded string\n }\n }];\n _context.next = 3;\n return solanaConnection.getParsedProgramAccounts(new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.PublicKey(TOKEN_PROGRAM_ID), {\n filters: filters\n });\n case 3:\n accounts = _context.sent;\n console.log(\"Found \".concat(accounts.length, \" token account(s) for wallet \").concat(wallet, \".\"));\n balance = 0;\n _iterator = _createForOfIteratorHelper(accounts);\n _context.prev = 7;\n _iterator.s();\n case 9:\n if ((_step = _iterator.n()).done) {\n _context.next = 21;\n break;\n }\n account = _step.value;\n parsedAccountInfo = account.account.data;\n mintAddress = parsedAccountInfo[\"parsed\"][\"info\"][\"mint\"];\n tokenBalance = parsedAccountInfo[\"parsed\"][\"info\"][\"tokenAmount\"][\"uiAmount\"];\n if (!(mintAddress === TOKENID)) {\n _context.next = 19;\n break;\n }\n console.log('Found our token account:', account.pubkey.toString());\n console.log('Balance:', tokenBalance);\n balance = tokenBalance;\n return _context.abrupt(\"break\", 21);\n case 19:\n _context.next = 9;\n break;\n case 21:\n _context.next = 26;\n break;\n case 23:\n _context.prev = 23;\n _context.t0 = _context[\"catch\"](7);\n _iterator.e(_context.t0);\n case 26:\n _context.prev = 26;\n _iterator.f();\n return _context.finish(26);\n case 29:\n return _context.abrupt(\"return\", balance);\n case 30:\n case \"end\":\n return _context.stop();\n }\n }, _callee, null, [[7, 23, 26, 29]]);\n }));\n return function getTokenAccountBalance(_x, _x2) {\n return _ref2.apply(this, arguments);\n };\n }();\n formatNumber = function formatNumber(value) {\n var suffixes = [\"\", \"K\", \"M\", \"B\", \"T\"];\n var suffixNum = Math.floor((\"\" + value).length / 3);\n var shortValue = parseFloat((suffixNum !== 0 ? value / Math.pow(1000, suffixNum) : value).toPrecision(2));\n if (shortValue % 1 !== 0) {\n shortValue = shortValue.toFixed(1);\n }\n return shortValue + suffixes[suffixNum];\n };\n _context3.next = 14;\n return solana.connect();\n case 14:\n console.log('Wallet connected:', solana.publicKey.toString());\n // Get token balance\n // Connect to https://api.metaplex.solana.com/\n connection = new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.Connection('https://api.metaplex.solana.com/');\n publicKey = new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.PublicKey(solana.publicKey.toString());\n _context3.next = 19;\n return connection.getBalance(publicKey);\n case 19:\n sol_balance = _context3.sent;\n console.log('Balance:', sol_balance / _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.LAMPORTS_PER_SOL, 'SOL');\n\n // Add your actual program ID here\n TOKEN_PROGRAM_ID = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';\n balancePromise = getTokenAccountBalance(publicKey, connection);\n balancePromise.then(function (output) {\n var percent_of_votes = output / supply * 100;\n var roundedOutput = output > 10 ? Math.round(output) : output;\n var roundedPercent = percent_of_votes > 5 ? Math.round(percent_of_votes) : percent_of_votes;\n var formattedOutput = formatNumber(roundedOutput);\n document.getElementById('balance').textContent = formattedOutput;\n document.getElementById('percent').textContent = roundedPercent.toString();\n balance = output;\n });\n _context3.next = 31;\n break;\n case 26:\n _context3.prev = 26;\n _context3.t0 = _context3[\"catch\"](9);\n console.error('Error connecting wallet:', _context3.t0);\n alert('Error connecting wallet. Check the console for details.');\n return _context3.abrupt(\"return\");\n case 31:\n document.getElementById('signMessageForm').addEventListener('submit', /*#__PURE__*/function () {\n var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {\n var inputs, options, total, key, element, vote, messageUint8Array, _yield$solana$request, public_key, signature, url, sig;\n return _regeneratorRuntime().wrap(function _callee2$(_context2) {\n while (1) switch (_context2.prev = _context2.next) {\n case 0:\n event.preventDefault();\n // Get all inputs in #advancedOptions\n inputs = document.querySelectorAll('#advancedOptions input'); // Store values in json with matching names\n options = {};\n inputs.forEach(function (input) {\n options[input.name] = input.value;\n });\n console.log(options);\n // Make sure the votes total 100\n total = 0;\n _context2.t0 = _regeneratorRuntime().keys(options);\n case 7:\n if ((_context2.t1 = _context2.t0()).done) {\n _context2.next = 17;\n break;\n }\n key = _context2.t1.value;\n if (!options.hasOwnProperty(key)) {\n _context2.next = 15;\n break;\n }\n element = options[key];\n total += parseInt(element);\n // If value less than 0 or greater than 100, alert and return\n if (!(element < 0 || element > 100)) {\n _context2.next = 15;\n break;\n }\n alert('Votes must be between 0 and 100');\n return _context2.abrupt(\"return\");\n case 15:\n _context2.next = 7;\n break;\n case 17:\n if (!(total > 100)) {\n _context2.next = 20;\n break;\n }\n alert('Votes must be less than or equal to 100');\n return _context2.abrupt(\"return\");\n case 20:\n vote = JSON.stringify(options); // Encode the message as a buffer-like object\n messageUint8Array = new TextEncoder().encode(vote); // Request signature from Phantom\n _context2.prev = 22;\n _context2.next = 25;\n return solana.request({\n method: 'signMessage',\n params: {\n message: messageUint8Array,\n display: \"utf8\"\n }\n });\n case 25:\n _yield$solana$request = _context2.sent;\n public_key = _yield$solana$request.public_key;\n signature = _yield$solana$request.signature;\n url = 'http://localhost:5000/vote'; // Update the URL as needed\n // Convert signature to readable format\n sig = bs58__WEBPACK_IMPORTED_MODULE_1___default().encode(signature);\n console.log(sig);\n window.location.href = \"/vote?message=\".concat(encodeURIComponent(vote), \"&signature=\").concat(encodeURIComponent(sig), \"&walletAddress=\").concat(encodeURIComponent(solana.publicKey.toBase58()), \"&votes=\").concat(encodeURIComponent(balance), \"&percent=\").concat(encodeURIComponent(balance / supply * 100));\n _context2.next = 38;\n break;\n case 34:\n _context2.prev = 34;\n _context2.t2 = _context2[\"catch\"](22);\n console.error('Error submitting vote:', _context2.t2);\n alert('Error submitting vote. Check the console for details.');\n case 38:\n case \"end\":\n return _context2.stop();\n }\n }, _callee2, null, [[22, 34]]);\n }));\n return function (_x3) {\n return _ref3.apply(this, arguments);\n };\n }());\n case 32:\n case \"end\":\n return _context3.stop();\n }\n }, _callee3, null, [[9, 26]]);\n})));\n\n//# sourceURL=webpack:///./src/index.js?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @solana/web3.js */ \"./node_modules/@solana/web3.js/lib/index.browser.esm.js\");\n/* harmony import */ var bs58__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! bs58 */ \"./node_modules/bs58/index.js\");\n/* harmony import */ var bs58__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(bs58__WEBPACK_IMPORTED_MODULE_1__);\nfunction _typeof(o) { \"@babel/helpers - typeof\"; return _typeof = \"function\" == typeof Symbol && \"symbol\" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && \"function\" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? \"symbol\" : typeof o; }, _typeof(o); }\nfunction _regeneratorRuntime() { \"use strict\"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = \"function\" == typeof Symbol ? Symbol : {}, a = i.iterator || \"@@iterator\", c = i.asyncIterator || \"@@asyncIterator\", u = i.toStringTag || \"@@toStringTag\"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, \"\"); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, \"_invoke\", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: \"normal\", arg: t.call(e, r) }; } catch (t) { return { type: \"throw\", arg: t }; } } e.wrap = wrap; var h = \"suspendedStart\", l = \"suspendedYield\", f = \"executing\", s = \"completed\", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { [\"next\", \"throw\", \"return\"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if (\"throw\" !== c.type) { var u = c.arg, h = u.value; return h && \"object\" == _typeof(h) && n.call(h, \"__await\") ? e.resolve(h.__await).then(function (t) { invoke(\"next\", t, i, a); }, function (t) { invoke(\"throw\", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke(\"throw\", t, i, a); }); } a(c.arg); } var r; o(this, \"_invoke\", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error(\"Generator is already running\"); if (o === s) { if (\"throw\" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if (\"next\" === n.method) n.sent = n._sent = n.arg;else if (\"throw\" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else \"return\" === n.method && n.abrupt(\"return\", n.arg); o = f; var p = tryCatch(e, r, n); if (\"normal\" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } \"throw\" === p.type && (o = s, n.method = \"throw\", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, \"throw\" === n && e.iterator[\"return\"] && (r.method = \"return\", r.arg = t, maybeInvokeDelegate(e, r), \"throw\" === r.method) || \"return\" !== n && (r.method = \"throw\", r.arg = new TypeError(\"The iterator does not provide a '\" + n + \"' method\")), y; var i = tryCatch(o, e.iterator, r.arg); if (\"throw\" === i.type) return r.method = \"throw\", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, \"return\" !== r.method && (r.method = \"next\", r.arg = t), r.delegate = null, y) : a : (r.method = \"throw\", r.arg = new TypeError(\"iterator result is not an object\"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = \"normal\", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: \"root\" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || \"\" === e) { var r = e[a]; if (r) return r.call(e); if (\"function\" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + \" is not iterable\"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, \"constructor\", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, \"constructor\", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, \"GeneratorFunction\"), e.isGeneratorFunction = function (t) { var e = \"function\" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || \"GeneratorFunction\" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, \"GeneratorFunction\")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, \"Generator\"), define(g, a, function () { return this; }), define(g, \"toString\", function () { return \"[object Generator]\"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = \"next\", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) \"t\" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if (\"throw\" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = \"throw\", a.arg = e, r.next = n, o && (r.method = \"next\", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if (\"root\" === i.tryLoc) return handle(\"end\"); if (i.tryLoc <= this.prev) { var c = n.call(i, \"catchLoc\"), u = n.call(i, \"finallyLoc\"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error(\"try statement without catch or finally\"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, \"finallyLoc\") && this.prev < o.finallyLoc) { var i = o; break; } } i && (\"break\" === t || \"continue\" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = \"next\", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if (\"throw\" === t.type) throw t.arg; return \"break\" === t.type || \"continue\" === t.type ? this.next = t.arg : \"return\" === t.type ? (this.rval = this.arg = t.arg, this.method = \"return\", this.next = \"end\") : \"normal\" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, \"catch\": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if (\"throw\" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error(\"illegal catch attempt\"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, \"next\" === this.method && (this.arg = t), y; } }, e; }\nfunction _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== \"undefined\" && o[Symbol.iterator] || o[\"@@iterator\"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === \"number\") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError(\"Invalid attempt to iterate non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.\"); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it[\"return\"] != null) it[\"return\"](); } finally { if (didErr) throw err; } } }; }\nfunction _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === \"string\") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === \"Object\" && o.constructor) n = o.constructor.name; if (n === \"Map\" || n === \"Set\") return Array.from(o); if (n === \"Arguments\" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }\nfunction _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }\nfunction asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }\nfunction _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, \"next\", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, \"throw\", err); } _next(undefined); }); }; }\n\n\ndocument.addEventListener('DOMContentLoaded', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {\n var testing, TOKENID, supply, balance, solana, getTokenAccountBalance, formatNumber, connection, publicKey, sol_balance, TOKEN_PROGRAM_ID, balancePromise, response, votes, userVote, vote, existingVote, total, key, value, li, sub;\n return _regeneratorRuntime().wrap(function _callee3$(_context3) {\n while (1) switch (_context3.prev = _context3.next) {\n case 0:\n // Set testing to true if running in a local environment\n testing = true;\n TOKENID = \"G9GQFWQmTiBzm1Hh4gM4ydQB4en3wPUxBZ1PS8DruXy8\";\n supply = 100000;\n balance = 0;\n if (testing) {\n TOKENID = \"9YZ2syoQHvMeksp4MYZoYMtLyFWkkyBgAsVuuJzSZwVu\";\n supply = 17 * 1000000000;\n }\n\n // Initialize Solana connection\n solana = window.solana;\n if (!(!solana || !solana.isPhantom)) {\n _context3.next = 8;\n break;\n }\n return _context3.abrupt(\"return\");\n case 8:\n _context3.prev = 8;\n getTokenAccountBalance = /*#__PURE__*/function () {\n var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(wallet, solanaConnection) {\n var filters, accounts, balance, _iterator, _step, account, parsedAccountInfo, mintAddress, tokenBalance;\n return _regeneratorRuntime().wrap(function _callee$(_context) {\n while (1) switch (_context.prev = _context.next) {\n case 0:\n filters = [{\n dataSize: 165 // size of account (bytes)\n }, {\n memcmp: {\n offset: 32,\n // location of our query in the account (bytes)\n bytes: wallet // our search criteria, a base58 encoded string\n }\n }];\n _context.next = 3;\n return solanaConnection.getParsedProgramAccounts(new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.PublicKey(TOKEN_PROGRAM_ID), {\n filters: filters\n });\n case 3:\n accounts = _context.sent;\n console.log(\"Found \".concat(accounts.length, \" token account(s) for wallet \").concat(wallet, \".\"));\n balance = 0;\n _iterator = _createForOfIteratorHelper(accounts);\n _context.prev = 7;\n _iterator.s();\n case 9:\n if ((_step = _iterator.n()).done) {\n _context.next = 21;\n break;\n }\n account = _step.value;\n parsedAccountInfo = account.account.data;\n mintAddress = parsedAccountInfo[\"parsed\"][\"info\"][\"mint\"];\n tokenBalance = parsedAccountInfo[\"parsed\"][\"info\"][\"tokenAmount\"][\"uiAmount\"];\n if (!(mintAddress === TOKENID)) {\n _context.next = 19;\n break;\n }\n console.log('Found our token account:', account.pubkey.toString());\n console.log('Balance:', tokenBalance);\n balance = tokenBalance;\n return _context.abrupt(\"break\", 21);\n case 19:\n _context.next = 9;\n break;\n case 21:\n _context.next = 26;\n break;\n case 23:\n _context.prev = 23;\n _context.t0 = _context[\"catch\"](7);\n _iterator.e(_context.t0);\n case 26:\n _context.prev = 26;\n _iterator.f();\n return _context.finish(26);\n case 29:\n return _context.abrupt(\"return\", balance);\n case 30:\n case \"end\":\n return _context.stop();\n }\n }, _callee, null, [[7, 23, 26, 29]]);\n }));\n return function getTokenAccountBalance(_x, _x2) {\n return _ref2.apply(this, arguments);\n };\n }();\n formatNumber = function formatNumber(value) {\n var suffixes = [\"\", \"K\", \"M\", \"B\", \"T\"];\n var suffixNum = Math.floor((\"\" + value).length / 3);\n var shortValue = parseFloat((suffixNum !== 0 ? value / Math.pow(1000, suffixNum) : value).toPrecision(2));\n if (shortValue % 1 !== 0) {\n shortValue = shortValue.toFixed(1);\n }\n return shortValue + suffixes[suffixNum];\n };\n _context3.next = 13;\n return solana.connect();\n case 13:\n console.log('Wallet connected:', solana.publicKey.toString());\n // Get token balance\n // Connect to https://api.metaplex.solana.com/\n connection = new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.Connection('https://api.metaplex.solana.com/');\n publicKey = new _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.PublicKey(solana.publicKey.toString());\n _context3.next = 18;\n return connection.getBalance(publicKey);\n case 18:\n sol_balance = _context3.sent;\n console.log('Balance:', sol_balance / _solana_web3_js__WEBPACK_IMPORTED_MODULE_0__.LAMPORTS_PER_SOL, 'SOL');\n\n // Add your actual program ID here\n TOKEN_PROGRAM_ID = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';\n balancePromise = getTokenAccountBalance(publicKey, connection);\n balancePromise.then(function (output) {\n var percent_of_votes = output / supply * 100;\n var roundedOutput = output > 10 ? Math.round(output) : output;\n var roundedPercent = percent_of_votes > 5 ? Math.round(percent_of_votes) : percent_of_votes;\n var formattedOutput = formatNumber(roundedOutput);\n document.getElementById('balance').textContent = formattedOutput;\n document.getElementById('percent').textContent = roundedPercent.toString();\n balance = output;\n });\n\n // Show the user their existing vote if they have one\n // Read list of votes from the server\n _context3.next = 25;\n return fetch('/votes?walletAddress=' + solana.publicKey.toString());\n case 25:\n response = _context3.sent;\n _context3.next = 28;\n return response.json();\n case 28:\n votes = _context3.sent;\n // Find the user's vote\n userVote = votes.find(function (vote) {\n return vote.walletAddress === solana.publicKey.toString();\n });\n if (userVote) {\n // Display the user's vote\n vote = JSON.parse(userVote.message);\n existingVote = document.getElementById('existingVote');\n existingVote.innerHTML = '

Your existing vote:

';\n total = 0;\n for (key in vote) {\n if (vote.hasOwnProperty(key)) {\n value = vote[key];\n total += parseInt(value);\n li = document.createElement('li');\n li.textContent = \"\".concat(key, \": \").concat(value, \"%\");\n // Remove the bullet points\n li.style.listStyleType = 'none';\n if (parseInt(value) > 0) {\n existingVote.appendChild(li);\n }\n }\n }\n sub = document.createElement('p');\n sub.textContent = \"You have used \".concat(total, \"% of your voting power\");\n existingVote.appendChild(sub);\n existingVote.style.display = 'block';\n existingVote.style.marginBottom = '20px';\n existingVote.style.backgroundColor = 'black';\n existingVote.style.color = 'white';\n existingVote.style.padding = '10px';\n }\n _context3.next = 37;\n break;\n case 33:\n _context3.prev = 33;\n _context3.t0 = _context3[\"catch\"](8);\n console.error('Error connecting wallet:', _context3.t0);\n return _context3.abrupt(\"return\");\n case 37:\n document.getElementById('signMessageForm').addEventListener('submit', /*#__PURE__*/function () {\n var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {\n var inputs, options, total, _key, element, vote, messageUint8Array, _yield$solana$request, public_key, signature, url, sig;\n return _regeneratorRuntime().wrap(function _callee2$(_context2) {\n while (1) switch (_context2.prev = _context2.next) {\n case 0:\n event.preventDefault();\n // Get all inputs in #advancedOptions\n inputs = document.querySelectorAll('#advancedOptions input'); // Store values in json with matching names\n options = {};\n inputs.forEach(function (input) {\n options[input.name] = input.value;\n });\n console.log(options);\n // Make sure the votes total 100\n total = 0;\n _context2.t0 = _regeneratorRuntime().keys(options);\n case 7:\n if ((_context2.t1 = _context2.t0()).done) {\n _context2.next = 17;\n break;\n }\n _key = _context2.t1.value;\n if (!options.hasOwnProperty(_key)) {\n _context2.next = 15;\n break;\n }\n element = options[_key];\n total += parseInt(element);\n // If value less than 0 or greater than 100, alert and return\n if (!(element < 0 || element > 100)) {\n _context2.next = 15;\n break;\n }\n alert('Votes must be between 0 and 100');\n return _context2.abrupt(\"return\");\n case 15:\n _context2.next = 7;\n break;\n case 17:\n if (!(total > 100)) {\n _context2.next = 20;\n break;\n }\n alert('Votes must be less than or equal to 100');\n return _context2.abrupt(\"return\");\n case 20:\n vote = JSON.stringify(options); // Encode the message as a buffer-like object\n messageUint8Array = new TextEncoder().encode(vote); // Request signature from Phantom\n _context2.prev = 22;\n _context2.next = 25;\n return solana.request({\n method: 'signMessage',\n params: {\n message: messageUint8Array,\n display: \"utf8\"\n }\n });\n case 25:\n _yield$solana$request = _context2.sent;\n public_key = _yield$solana$request.public_key;\n signature = _yield$solana$request.signature;\n url = 'http://localhost:5000/vote'; // Update the URL as needed\n // Convert signature to readable format\n sig = bs58__WEBPACK_IMPORTED_MODULE_1___default().encode(signature);\n console.log(sig);\n window.location.href = \"/vote?message=\".concat(encodeURIComponent(vote), \"&signature=\").concat(encodeURIComponent(sig), \"&walletAddress=\").concat(encodeURIComponent(solana.publicKey.toBase58()), \"&votes=\").concat(encodeURIComponent(balance), \"&percent=\").concat(encodeURIComponent(balance / supply * 100));\n _context2.next = 37;\n break;\n case 34:\n _context2.prev = 34;\n _context2.t2 = _context2[\"catch\"](22);\n console.error('Error submitting vote:', _context2.t2);\n case 37:\n case \"end\":\n return _context2.stop();\n }\n }, _callee2, null, [[22, 34]]);\n }));\n return function (_x3) {\n return _ref3.apply(this, arguments);\n };\n }());\n case 38:\n case \"end\":\n return _context3.stop();\n }\n }, _callee3, null, [[8, 33]]);\n})));\n\n//# sourceURL=webpack:///./src/index.js?"); /***/ }), diff --git a/main.py b/main.py index 4e60c37..e3fcc28 100644 --- a/main.py +++ b/main.py @@ -10,13 +10,13 @@ import nacl.encoding import nacl.exceptions import base58 import render +import hashlib +import random app = Flask(__name__) dotenv.load_dotenv() -CURRENT_VOTE = os.getenv('CURRENT_VOTE') -OPTIONS = os.getenv('OPTIONS') -OPTIONS = json.loads(OPTIONS) + DISCORD_WEBHOOK = os.getenv('DISCORD_WEBHOOK') # If votes file doesn't exist, create it @@ -53,10 +53,28 @@ def faviconPNG(): @app.route('/') def index(): year = datetime.datetime.now().year - votes = render.votes() - options = render.options(OPTIONS) + + + info = get_vote_info() + options = render.options(info["options"]) - return render_template('index.html',year=year,votes=votes, current_vote=CURRENT_VOTE, options=options) + enabled = info["enabled"] + end = datetime.datetime.strptime(info["end"], "%Y-%m-%d") + if end < datetime.datetime.now(): + enabled = False + end = "Voting has closed" + info["public"] = True + else: + end = f'Voting ends on {end.strftime("%B %d, %Y")}' + + revote = "not" if not info["revote"] else "" + if info["public"]: + votes = render.votes() + else: + votes = "" + + return render_template('index.html',year=year,votes=votes, options=options, + current_vote=info["vote"], description=info["description"], end=end,enabled=enabled, public=info["public"], revote=revote) @app.route('/') def catch_all(path): @@ -87,6 +105,24 @@ def vote(): public_key = data["walletAddress"] percent = data["percent"] + # Check if revote is enabled + info = get_vote_info() + if not info['revote']: + with open('data/votes.json') as file: + votes = json.load(file) + for vote in votes: + if vote["walletAddress"] == public_key: + return render_template('revotes.html', year=datetime.datetime.now().year) + + # Make sure the voting is enabled and hasn't ended + if not info['enabled']: + return render_template('404.html', year=datetime.datetime.now().year) + + end = datetime.datetime.strptime(info['end'], "%Y-%m-%d") + if end < datetime.datetime.now(): + return render_template('404.html', year=datetime.datetime.now().year) + + # Verify signature try: # Decode base58 encoded strings @@ -108,7 +144,17 @@ def vote(): # Send message to discord send_discord_message(data) save_vote(data) - return render_template('success.html', year=datetime.datetime.now().year, vote=data["message"],percent=percent,signature=signature,votes=render.votes()) + + vote_chart = "" + if info['public']: + vote_chart = render.votes() + else: + date = datetime.datetime.strptime(info['end'], "%Y-%m-%d") + if date < datetime.datetime.now(): + vote_chart = render.votes() + + + return render_template('success.html', year=datetime.datetime.now().year, vote=data["message"],percent=percent,signature=signature,votes=vote_chart) def save_vote(data): # Load votes @@ -176,11 +222,137 @@ def send_discord_message(data): @app.route('/votes') def download(): + if 'walletAddress' in request.args: + address = request.args['walletAddress'] + with open('data/votes.json') as file: + votes = json.load(file) + for vote in votes: + if vote["walletAddress"] == address: + return jsonify([vote]) + return jsonify([]) + + + + info = get_vote_info() + if not info['public']: + end = datetime.datetime.strptime(info['end'], "%Y-%m-%d") + if end > datetime.datetime.now(): + return render_template('blocked.html', year=datetime.datetime.now().year), 404 + + resp = make_response(send_from_directory('data', 'votes.json')) # Set as json resp.headers['Content-Type'] = 'application/json' return resp + +#region admin +@app.route('/login', methods=['POST']) +def login(): + # If account.json doesn't exist, create it + if not os.path.isfile('data/account.json'): + + user = request.form['email'] + # Hash password + password = request.form['password'] + hashed = hashlib.sha256(password.encode()).hexdigest() + token = random.randint(100000, 999999) + with open('data/account.json', 'w') as file: + json.dump({'email': user, 'password': hashed, 'token': token}, file) + resp = make_response(redirect('/admin')) + resp.set_cookie('token', str(token)) + return resp + + + # Read account.json + with open('data/account.json') as file: + account = json.load(file) + + + + user = request.form['email'] + # Hash password + password = request.form['password'] + hashed = hashlib.sha256(password.encode()).hexdigest() + + if user == account['email'] and hashed == account['password']: + token = random.randint(100000, 999999) + account['token'] = token + with open('data/account.json', 'w') as file: + json.dump(account, file) + resp = make_response(redirect('/admin')) + resp.set_cookie('token', str(token)) + return resp + + return redirect('/') + +@app.route('/admin') +def admin(): + if not 'token' in request.cookies: + return redirect('/login') + with open('data/account.json') as file: + account = json.load(file) + if request.cookies['token'] != str(account['token']): + return redirect('/login') + + info = get_vote_info() + options = ','.join(info['options']) + + return render_template('admin.html', year=datetime.datetime.now().year, name=info['vote'], description=info['description'], end=info['end'], enabled=info['enabled'], public=info['public'], revote=info['revote'], options=options) + +@app.route('/admin', methods=['POST']) +def admin_post(): + if not 'token' in request.cookies: + return redirect('/login') + with open('data/account.json') as file: + account = json.load(file) + if request.cookies['token'] != str(account['token']): + return redirect('/login') + + info = get_vote_info() + + info['vote'] = request.form['name'] + info['description'] = request.form['description'] + info['end'] = request.form['end'] + info['enabled'] = 'enabled' in request.form + info['public'] = 'public' in request.form + info['revote'] = 'revote' in request.form + options = request.form['options'] + options = options.split(',') + info['options'] = options + + with open('data/info.json', 'w') as file: + json.dump(info, file) + + return redirect('/admin') + +@app.route('/admin/clear') +def clear(): + if not 'token' in request.cookies: + return redirect('/login') + with open('data/account.json') as file: + account = json.load(file) + if request.cookies['token'] != str(account['token']): + return redirect('/login') + with open('data/votes.json', 'w') as file: + json.dump([], file) + return redirect('/admin') + + +#endregion + +def get_vote_info(): + if not os.path.isfile('data/info.json'): + with open('data/info.json', 'w') as file: + end = datetime.datetime.now() + datetime.timedelta(days=7) + end = end.strftime("%Y-%m-%d") + + json.dump({'vote': '','description':'', 'end': end,'enabled': False, 'public': True, 'revote': True, 'options': []}, file) + with open('data/info.json') as file: + info = json.load(file) + return info + + # 404 catch all @app.errorhandler(404) def not_found(e): diff --git a/src/index.js b/src/index.js index 34a667d..9c78b37 100644 --- a/src/index.js +++ b/src/index.js @@ -4,7 +4,7 @@ import base58 from 'bs58' document.addEventListener('DOMContentLoaded', async function() { // Set testing to true if running in a local environment - const testing = false; + const testing = true; let TOKENID = "G9GQFWQmTiBzm1Hh4gM4ydQB4en3wPUxBZ1PS8DruXy8"; let supply = 100000; let balance = 0; @@ -18,7 +18,6 @@ document.addEventListener('DOMContentLoaded', async function() { // Initialize Solana connection const solana = window.solana; if (!solana || !solana.isPhantom) { - alert('Phantom wallet not detected. Please install Phantom and try again.'); return; } @@ -89,9 +88,48 @@ document.addEventListener('DOMContentLoaded', async function() { document.getElementById('percent').textContent = roundedPercent.toString(); balance = output; }); + + // Show the user their existing vote if they have one + // Read list of votes from the server + const response = await fetch('/votes?walletAddress=' + solana.publicKey.toString()); + const votes = await response.json(); + + // Find the user's vote + const userVote = votes.find(vote => vote.walletAddress === solana.publicKey.toString()); + if (userVote) { + // Display the user's vote + const vote = JSON.parse(userVote.message); + const existingVote = document.getElementById('existingVote'); + existingVote.innerHTML = '

Your existing vote:

'; + let total = 0; + for (const key in vote) { + if (vote.hasOwnProperty(key)) { + const value = vote[key]; + total += parseInt(value); + const li = document.createElement('li'); + li.textContent = `${key}: ${value}%`; + // Remove the bullet points + li.style.listStyleType = 'none'; + if (parseInt(value) > 0) { + existingVote.appendChild(li); + } + } + } + const sub = document.createElement('p'); + sub.textContent = `You have used ${total}% of your voting power`; + existingVote.appendChild(sub); + + existingVote.style.display = 'block'; + existingVote.style.marginBottom = '20px'; + existingVote.style.backgroundColor = 'black'; + existingVote.style.color = 'white'; + existingVote.style.padding = '10px'; + } + + + } catch (error) { console.error('Error connecting wallet:', error); - alert('Error connecting wallet. Check the console for details.'); return; } @@ -152,7 +190,6 @@ document.addEventListener('DOMContentLoaded', async function() { } catch (error) { console.error('Error submitting vote:', error); - alert('Error submitting vote. Check the console for details.'); } }); }); diff --git a/templates/admin.html b/templates/admin.html new file mode 100644 index 0000000..c446a87 --- /dev/null +++ b/templates/admin.html @@ -0,0 +1,112 @@ + + + + + + + Admin - Vote | Nathan.Woodburn/ + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+

Admin

+
+
{% if revote %} +
+ + +
+{% else %} +
+ + +
+{% endif %} +{% if public %} +
+ + +
+{% else %} +
+ + +
+{% endif %}{% if enabled %} +
+ + +
+{% else %} +
+ + +
+{% endif %} +
+
+

Reset Votes

+

Clear all votes to allow for the next vote

Reset Votes +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/templates/assets/img/illustrations/login.svg b/templates/assets/img/illustrations/login.svg new file mode 100644 index 0000000..e8303dd --- /dev/null +++ b/templates/assets/img/illustrations/login.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/blocked.html b/templates/blocked.html new file mode 100644 index 0000000..10bf60e --- /dev/null +++ b/templates/blocked.html @@ -0,0 +1,70 @@ + + + + + + + Page Not Found - Vote | Nathan.Woodburn/ + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+

Votes are not public until after this vote.

+

You will be able to verify the votes after the voting has finished

Home +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index be39f03..9fb6142 100644 --- a/templates/index.html +++ b/templates/index.html @@ -44,24 +44,37 @@

Vote on projects from
Nathan.Woodburn/

-

{{current_vote}}

-

You have 0 votes.

-

0% of the voting power.

-

Vote here

-
-
-

Select your vote or split your votes between options.

{{options|safe}} -
-
-
-
{{votes|safe}} -
-
-
View vote proofs
+
+
+
+
+
+

{{current_vote}}

+

{{description}}

+

{{end}}
You are {{revote}} allowed to redo your vote.

{{votes|safe}} +
+
+

You have 0 votes.

+

0% of the voting power.

+
+
Vote Here
+
+
+

Select your vote or split your votes between options.

{{options|safe}} +
+
+
+
+
+
+
View vote proofs
+
+
+