Eden Upvote PR

.gitignore

@@ -22,3 +22,4 @@ main1.go
 dao-contracts
 migration.sh
 build_ninja
+lib

build_only.sh

@@ -0,0 +1,3 @@
+cd build
+make -j10
+wasm-opt -O3 dao/dao.wasm -o dao/dao_O3.wasm

deploy_eos_mainnet.sh

@@ -0,0 +1 @@
+cleos -u http://eos.greymass.com set contract dao.hypha build/dao dao_O3.wasm dao.abi

deploy_eos_testnet.sh

@@ -0,0 +1 @@
+cleos -u https://jungle4.dfuse.eosnation.io set contract daoxhypha111 build/dao dao_O3.wasm dao.abi

deploy_only.sh

@@ -0,0 +1,3 @@
+cd build
+wasm-opt -O3 dao/dao.wasm -o dao/dao_O3.wasm
+cleos set contract dao.hypha dao dao_O3.wasm dao.abi

deploy_telos_mainnet.sh

@@ -0,0 +1 @@
+cleos -u http://mainnet.telos.net set contract dao.hypha build/dao dao_O3.wasm dao.abi

deploy_testnet.sh

@@ -0,0 +1 @@
+cleos -u https://testnet.telos.net set contract mtdhoxhyphaa build/dao dao_O3.wasm dao.abi

include/assignment.hpp

@@ -13,6 +13,7 @@ namespace hypha
     class dao;
     class TimeShare;
     class Settings;
+    struct AssetBatch;
 
     class Assignment : public RecurringActivity
     {
@@ -26,9 +27,7 @@ namespace hypha
         TimeShare getCurrentTimeShare();
         TimeShare getLastTimeShare();
 
-        eosio::asset getRewardSalary();
-        eosio::asset getVoiceSalary();
-        eosio::asset getPegSalary();
+        AssetBatch getSalary();
 
         inline uint64_t getDaoID() { return m_daoID; }
     private: 

include/badges/common.hpp

@@ -29,10 +29,10 @@ namespace items {
 }
 
 namespace links {
-    // inline constexpr auto TREASURY_BADGE = "treasurerbdg";
+    inline constexpr auto TREASURY_BADGE = eosio::name("treasurerbdg");
     inline constexpr auto ADMIN_BADGE = eosio::name("adminbdg");
     inline constexpr auto ENROLLER_BADGE = eosio::name("enrollerbdg");
-    // inline constexpr auto NORTH_STAR_BADGE = "northstarbdg";
+    inline constexpr auto NORTH_STAR_BADGE = eosio::name("northstarbdg");
     inline constexpr auto VOTER = eosio::name("voter");
     inline constexpr auto DELEGATE = eosio::name("delegate"); 
     inline constexpr auto HEAD_DELEGATE = eosio::name("headdelegate"); 

include/common.hpp

@@ -24,7 +24,6 @@ namespace hypha::common
     inline constexpr auto PEG_TOKEN = "peg_token";
     inline constexpr auto VOICE_TOKEN = "voice_token";
     inline constexpr auto REWARD_TOKEN = "reward_token";
-    inline constexpr auto REWARD_TO_PEG_RATIO = "reward_to_peg_ratio";
     inline constexpr auto NATIVE_TOKEN_TO_USD_RATIO = "native_token_to_usd_ratio";
     inline constexpr symbol S_REWARD("BM", 2);
     inline constexpr symbol S_VOICE("BMV", 2);

include/config/config.hpp

@@ -1,5 +1,5 @@
 #pragma once
 #define PRODUCTION_BUILD
 #define USE_TREASURY
-// #define USE_UPVOTE_ELECTIONS
+#define USE_UPVOTE_ELECTIONS
 // #define USE_PRICING_PLAN

include/dao.hpp

@@ -19,6 +19,9 @@
 #include <period.hpp>
 #include <settings.hpp>
 
+// TODO: Move this to upvote code section
+#include <upvote_election/random_number_generator.hpp>
+
 #include <config/config.hpp>
 
 using eosio::multi_index;
@@ -192,10 +195,14 @@ namespace pricing {
 
       ACTION remdoc(uint64_t doc_id);
 
+      ACTION cleandao(uint64_t dao_id);
+
       ACTION createcalen(bool is_default);
 
       ACTION initcalendar(uint64_t calendar_id, uint64_t next_period);
 
+      ACTION reset(); // debugging - maybe with the dev flags
+
 #ifdef DEVELOP_BUILD_HELPERS
 
       struct InputEdge {
@@ -297,6 +304,7 @@ namespace pricing {
 
       ACTION createroot(const std::string &notes);
       ACTION createdao(ContentGroups &config);
+
       ACTION createdaodft(ContentGroups &config);
       ACTION deletedaodft(uint64_t dao_draft_id);
       ACTION archiverecur(uint64_t document_id);
@@ -326,11 +334,22 @@ namespace pricing {
 #endif
 #ifdef USE_UPVOTE_ELECTIONS
       //Upvote System
+      // ACTION testgrouprng(std::vector<uint64_t> ids, uint32_t seed);
+      // ACTION testgroupr1(uint32_t num_members, uint32_t seed);
+      // ACTION testround(uint64_t dao_id);
+
+      ACTION castupvote(uint64_t round_id, uint64_t group_id, name voter, uint64_t voted_id);
+      ACTION uesubmitseed(uint64_t dao_id, eosio::checksum256 seed, name account);
+      ACTION upvotevideo(uint64_t group_id, name account, std::string link);
+
+
       ACTION createupvelc(uint64_t dao_id, ContentGroups& election_config);
       ACTION editupvelc(uint64_t election_id, ContentGroups& election_config);
       ACTION cancelupvelc(uint64_t election_id);
-      ACTION updateupvelc(uint64_t election_id, bool reschedule);
-      ACTION castelctnvote(uint64_t round_id, name voter, std::vector<uint64_t> voted);
+      ACTION updateupvelc(uint64_t election_id, bool reschedule, bool force);
+
+
+
 #ifdef EOS_BUILD
       ACTION importelct(uint64_t dao_id, bool deferred);
 #endif
@@ -482,6 +501,19 @@ namespace pricing {
 
       void createToken(const std::string& contractType, name issuer, const asset& token);
 
+      template <typename T>
+      inline void delete_table (const name & code, const uint64_t & scope) {
+
+         T table(code, scope);
+         auto itr = table.begin();
+
+         while (itr != table.end()) {
+            itr = table.erase(itr);
+         }
+
+      }
+
+
    private:
 
       void onRewardTransfer(const name& from, const name& to, const asset& amount);
@@ -509,6 +541,12 @@ namespace pricing {
 
       void addDefaultSettings(ContentGroup& settingsGroup, const string& daoTitle, const string& daoDescStr);
 
+      void _setupdefs(uint64_t dao_id);
+
+      void initSysBadges();
+      void createSystemBadge(name badge_edge, string label, string icon);
+
+
       template<class Table>
       std::optional<uint64_t> getNameID(const name& n) const
       {

include/upvote_election/common.hpp

@@ -5,6 +5,7 @@
 namespace hypha::upvote_election::common {
 
 namespace round_types {
+    // TODO: We can remove round types - not needed
     inline constexpr auto DELEGATE = "delegate";
     inline constexpr auto CHIEF = "chief";
     inline constexpr auto HEAD = "head";
@@ -17,8 +18,12 @@ namespace groups {
 namespace types {
     inline constexpr auto UPVOTE_ELECTION = eosio::name("upvt.electn");
     inline constexpr auto ELECTION_ROUND = eosio::name("electn.round");
+    inline constexpr auto ELECTION_GROUP = eosio::name("electn.group");
     inline constexpr auto ELECTION_VOTE = eosio::name("election.vote");
-    inline constexpr auto ELECTION_VOTE_GROUP = eosio::name("vote.group");
+    inline constexpr auto ELECTION_UP_VOTE = eosio::name("upvt.vote");
+
+    // TODO: Remove this
+    inline constexpr auto ELECTION_VOTE_GROUP = eosio::name("vote.group");//??
 }
 
 namespace upvote_status {
@@ -29,31 +34,36 @@ namespace upvote_status {
 }
 
 namespace links {
-    inline constexpr auto UPCOMING_ELECTION = eosio::name("upcomingelct");
-    inline constexpr auto ONGOING_ELECTION = eosio::name("ongoingelct");
-    inline constexpr auto PREVIOUS_ELECTION = eosio::name("previouselct");
-    inline constexpr auto ELECTION = eosio::name("election");
-    inline constexpr auto START_ROUND = eosio::name("startround");
-    inline constexpr auto CURRENT_ROUND = eosio::name("currentround");
-    inline constexpr auto CHIEF_ROUND = eosio::name("chiefround");
-    inline constexpr auto HEAD_ROUND = eosio::name("headround");
-    inline constexpr auto ROUND = eosio::name("round");
-    inline constexpr auto NEXT_ROUND = eosio::name("nextround");
-    inline constexpr auto ROUND_CANDIDATE = eosio::name("candidate");
-    inline constexpr auto ROUND_WINNER = eosio::name("winner");
-    inline constexpr auto ELECTION_GROUP = eosio::name("elctngroup");
-    inline constexpr auto VOTE = eosio::name("vote");
-    inline constexpr auto CHIEF_DELEGATE = eosio::name("chiefdelegate");
-    inline constexpr auto HEAD_DELEGATE = eosio::name("headdelegate");
+    inline constexpr auto ELECTION = eosio::name("ue.election");
+    inline constexpr auto UPCOMING_ELECTION = eosio::name("ue.upcoming");
+    inline constexpr auto ONGOING_ELECTION = eosio::name("ue.ongoing");
+    inline constexpr auto PREVIOUS_ELECTION = eosio::name("ue.previous");
+    inline constexpr auto START_ROUND = eosio::name("ue.startrnd");
+    inline constexpr auto CURRENT_ROUND = eosio::name("ue.currnd");
+    inline constexpr auto ELECTION_ROUND = eosio::name("ue.round");
+    inline constexpr auto ELECTION_ROUND_MEMBER = eosio::name("ue.rd.member");
+    inline constexpr auto ELECTION_GROUP_LINK = eosio::name("ue.group.lnk");
+    inline constexpr auto NEXT_ROUND = eosio::name("ue.nextrnd");
+    inline constexpr auto ROUND_CANDIDATE = eosio::name("ue.candidate");
+    inline constexpr auto ROUND_WINNER = eosio::name("ue.winner");
+    inline constexpr auto GROUP_WINNER = eosio::name("ue.group.win");
+    inline constexpr auto ELECTION_GROUP = eosio::name("ue.elctngrp");
+    inline constexpr auto UP_VOTE_VOTE = eosio::name("ue.vote");
+    inline constexpr auto UPVOTE_GROUP_WINNER = eosio::name("ue.winner");
+    inline constexpr auto VOTE = eosio::name("vote"); // ?? 
+
+    // these are defined in badges::common::links
+    // inline constexpr auto CHIEF_DELEGATE 
+    // inline constexpr auto HEAD_DELEGATE 
 }
 
 namespace items {
     inline constexpr auto UPVOTE_STARTDATE = "upvote_start_date_time";
     inline constexpr auto UPVOTE_DURATION = "upvote_duration";
     inline constexpr auto ROUND_DURATION = "duration";
-    inline constexpr auto PASSING_AMOUNT = "passing_count";
     inline constexpr auto ROUND_ID = "round_id";
     inline constexpr auto ROUND_TYPE = "type";
+    inline constexpr auto WINNER = "winner"; // ?? delete?
 }
 
 } // namespace hypha::upvote

include/upvote_election/convert.hpp

@@ -0,0 +1,120 @@
+#pragma once
+
+#include <optional>
+#include <type_traits>
+#include <utility>
+#include <variant>
+#include <vector>
+#include "for_each_field.hpp"
+#include "stream.hpp"
+
+namespace eosio
+{
+   struct no_conversion
+   {
+      using reverse = no_conversion;
+   };
+   struct widening_conversion;
+   // Fields must match exactly
+   struct strict_conversion
+   {
+      using reverse = strict_conversion;
+   };
+   // Can discard some fields
+   struct narrowing_conversion
+   {
+      using reverse = widening_conversion;
+   };
+   // Can default construct some fields
+   struct widening_conversion
+   {
+      using reverse = narrowing_conversion;
+   };
+
+   no_conversion conversion_kind(...);
+   void serialize_as(...);
+
+   template <typename T>
+   using serialization_type = decltype(serialize_as(std::declval<T>()));
+
+   template <typename T, typename U>
+   using conversion_kind_t = std::conditional_t<
+       std::is_same_v<decltype(conversion_kind(std::declval<T>(), std::declval<U>())),
+                      no_conversion>,
+       typename decltype(conversion_kind(std::declval<U>(), std::declval<T>()))::reverse,
+       decltype(conversion_kind(std::declval<T>(), std::declval<U>()))>;
+
+   template <typename Field, typename T, typename U, typename F>
+   auto convert_impl(Field field, const T& src, U& dst, F&& f, int)
+       -> std::void_t<decltype(field(&src)), decltype(field(&dst))>
+   {
+      convert(field(&src), field(&dst), f);
+   }
+
+   template <typename Field, typename T, typename U, typename F>
+   auto convert_impl(Field field, const T& src, U& dst, F&& f, long)
+   {
+      static_assert(!std::is_same_v<conversion_kind_t<T, U>, strict_conversion>,
+                    "Member not found");
+      static_assert(!std::is_same_v<conversion_kind_t<T, U>, widening_conversion>,
+                    "Member not found");
+   }
+
+   inline constexpr auto choose_first = [](auto src, auto dest) { return src; };
+   inline constexpr auto choose_second = [](auto src, auto dest) { return dest; };
+
+   // TODO: add some validation
+
+   template <typename T, typename U, typename F>
+   void convert(const T& src, U& dst, F&& chooser)
+   {
+      if constexpr (std::is_same_v<T, U>)
+      {
+         dst = src;
+      }
+      else
+      {
+         static_assert(!std::is_same_v<conversion_kind_t<T, U>, no_conversion>,
+                       "Conversion not defined");
+         for_each_field<std::decay_t<decltype(*chooser((T*)nullptr, (U*)nullptr))>>(
+             [&](const char*, auto field) { convert_impl(field, src, dst, chooser, 0); });
+      }
+   }
+
+   template <typename... T, typename U, typename F>
+   void convert(const std::variant<T...>& src, U& dst, F&& chooser)
+   {
+      std::visit([&](auto& src) { return convert(src, dst, chooser); }, src);
+   }
+
+   template <typename T, typename U, typename F>
+   void convert(const std::vector<T>& src, std::vector<U>& dst, F&& chooser)
+   {
+      dst.resize(src.size());
+      for (std::size_t i = 0; i < src.size(); ++i)
+      {
+         convert(src[i], dst[i], chooser);
+      }
+   }
+
+   template <typename T, typename U, typename F>
+   void convert(const std::optional<T>& src, std::optional<U>& dst, F&& chooser)
+   {
+      if (src)
+      {
+         dst.emplace();
+         convert(*src, *dst, chooser);
+      }
+      else
+      {
+         dst = std::nullopt;
+      }
+   }
+
+   struct stream;
+   template <typename F>
+   void convert(const input_stream& src, std::vector<char>& dst, F&& chooser)
+   {
+      dst.assign(src.pos, src.end);
+   }
+}  // namespace eosio