Skip to content

Commit

Permalink
Add calendar document
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerard097
Gerard097 committed Aug 31, 2023
1 parent 13c9aac commit 127c779
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 76 deletions.
1 change: 1 addition & 0 deletions include/common.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ namespace hypha::common
inline constexpr name COMMEMBER = name("commember");
inline constexpr name DHO = name ("dho");
inline constexpr name DAO = name ("dao");
inline constexpr name CALENDAR = name ("calendar");
inline constexpr name MSIG = name ("multisig");
inline constexpr name OPEN_MSIG = name ("openmultisig");
inline constexpr name FAILED_MSIG = name ("failnmultisig");
Expand Down
7 changes: 5 additions & 2 deletions include/dao.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ namespace pricing {
//ACTION remsetting(const string &key);

ACTION genperiods(uint64_t dao_id, int64_t period_count/*, int64_t period_duration_sec*/);
ACTION initperiods(uint64_t dao_id, int64_t next_period);

ACTION claimnextper(uint64_t assignment_id);
// ACTION simclaimall(name account, uint64_t dao_id, bool only_ids);
Expand Down Expand Up @@ -192,6 +191,10 @@ namespace pricing {
ACTION editdoc(uint64_t doc_id, const std::string& group, const std::string& key, const Content::FlexValue &value);

ACTION remdoc(uint64_t doc_id);

ACTION createcalen();

ACTION initcalendar(uint64_t calendar_id, uint64_t next_period);

#ifdef DEVELOP_BUILD_HELPERS

Expand Down Expand Up @@ -529,7 +532,7 @@ namespace pricing {

DocumentGraph m_documentGraph = DocumentGraph(get_self());

void genPeriods(uint64_t daoID, int64_t period_count/*, int64_t period_duration_sec*/);
void genPeriods(uint64_t daoId, uint64_t calendarId, int64_t period_count/*, int64_t period_duration_sec*/);

asset getProRatedAsset(ContentWrapper *assignment, const symbol &symbol,
const string &key, const float &proration);
Expand Down
151 changes: 77 additions & 74 deletions src/dao.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1679,13 +1679,75 @@ void dao::genperiods(uint64_t dao_id, int64_t period_count/*, int64_t period_dur
verifyDaoType(dao_id);
checkAdminsAuth(dao_id);

// DAO's using shared periods doesn't have END edge, so it would fail if trying to add more periods
auto calendarEdge = getGraph().getEdgesFrom(dao_id, common::CALENDAR);

EOS_CHECK(
calendarEdge.size() == 1,
to_str("DAO should have 1 calendar but found: ", calendarEdge.size())
);

auto calendarId = calendarEdge[0].getToNode();

//Only the owner of the calendar can update it
EOS_CHECK(
!getGraph().getEdgesFrom(dao_id, common::END).empty(),
Edge::exists(get_self(), dao_id, calendarId, common::OWNS),
"This DAO is not allowed to call this action"
)

genPeriods(dao_id, period_count);
genPeriods(dao_id, calendarId, period_count);
}

ACTION dao::createcalen()
{
eosio::require_auth(get_self());
Document calendarDoc(get_self(), get_self(), {
ContentGroup {
Content(CONTENT_GROUP_LABEL, DETAILS),
},
ContentGroup {
Content(CONTENT_GROUP_LABEL, SYSTEM),
Content(TYPE, common::CALENDAR),
}
});
}

ACTION dao::initcalendar(uint64_t calendar_id, uint64_t next_period)
{
eosio::require_auth(get_self());

auto calendar = TypedDocument::withType(*this, calendar_id, common::CALENDAR);

auto nextPeriod = std::make_optional<Period>(this, next_period);

if (getGraph().getEdgesFrom(calendar_id, common::START).empty()) {
Edge(get_self(), get_self(), calendar_id, next_period, common::START);
}

const size_t MAX_ITS_PER_ACTION = 40;

size_t i = 0;

auto lastID = nextPeriod->getID();

while (nextPeriod && i++ < MAX_ITS_PER_ACTION) {
Edge(get_self(), get_self(), calendar_id, nextPeriod->getID(), common::PERIOD);
Edge(get_self(), get_self(), nextPeriod->getID(), calendar_id, common::CALENDAR);

lastID = nextPeriod->getID();
nextPeriod = nextPeriod->nextOpt();
}

if (nextPeriod) {
eosio::action(
eosio::permission_level(get_self(), eosio::name("active")),
get_self(),
eosio::name("initcalendar"),
std::make_tuple(calendar_id, nextPeriod->getID())
).send();
}
else {
Edge(get_self(), get_self(), calendar_id, lastID, common::END);
}
}

static void initCoreMembers(dao& dao, uint64_t daoID, eosio::name onboarder, ContentWrapper config)
Expand Down Expand Up @@ -1823,12 +1885,13 @@ void dao::createdao(ContentGroups& config)
EOS_CHECK(
calendar == common::CALENDAR_WEEK ||
calendar == common::CALENDAR_LUNAR,
to_str("Unkonw calendar type: ", calendar)
to_str("Unkonw calendar type: ", std::string(calendar))
);

uint64_t startPeriodId = Edge::get(get_self(), getRootID(), name(calendar)).getToNode();
uint64_t calendarId = Edge::get(get_self(), getRootID(), name(calendar)).getToNode();

Edge(get_self(), get_self(), daoDoc.getID(), startPeriodId, common::START);
Edge(get_self(), get_self(), daoDoc.getID(), calendarId, common::CALENDAR);
Edge(get_self(), get_self(), calendarId, daoDoc.getID(), common::DAO);

#ifdef USE_TREASURY
// Create Treasury
Expand All @@ -1851,15 +1914,6 @@ void dao::createdao(ContentGroups& config)
)
).send();

eosio::action(
eosio::permission_level{ get_self(), name("active") },
get_self(),
name("initperiods"),
std::make_tuple(
daoDoc.getID(), startPeriodId
)
).send();

auto onboarder = getSettingsDocument(daoDoc.getID())->getOrFail<name>(common::ONBOARDER_ACCOUNT);

//Init core members should happen after scheduling setupdefs action
Expand Down Expand Up @@ -2790,23 +2844,21 @@ void dao::checkAdminsAuth(uint64_t dao_id)
);
}

void dao::genPeriods(uint64_t dao_id, int64_t period_count/*, int64_t period_duration_sec*/)
void dao::genPeriods(uint64_t daoId, uint64_t calendarId, int64_t period_count/*, int64_t period_duration_sec*/)
{
//Max number of periods that should be created in one call
const int64_t MAX_PERIODS_PER_CALL = 10;

//Get last period
//Document daoDoc(get_self(), dao_id);
//Document daoDoc(get_self(), dao_id);

auto settings = getSettingsDocument(dao_id);
auto settings = getSettingsDocument(daoId);

int64_t periodDurationSecs = settings->getOrFail<int64_t>(common::PERIOD_DURATION);

name daoName = settings->getOrFail<eosio::name>(DAO_NAME);

auto lastEdge = Edge::get(get_self(), dao_id, common::END);

auto updateDaos = getGraph().getEdgesFrom(lastEdge.getToNode(), common::DAO);
auto lastEdge = Edge::get(get_self(), calendarId, common::END);

lastEdge.erase();

Expand All @@ -2826,34 +2878,22 @@ void dao::genPeriods(uint64_t dao_id, int64_t period_count/*, int64_t period_dur
);

Edge(get_self(), get_self(), lastPeriodID, nextPeriod.getID(), common::NEXT);

for (auto& updateDao : updateDaos) {
Edge(get_self(), get_self(), updateDao.getToNode(), nextPeriod.getID(), common::PERIOD);
}

Edge(get_self(), get_self(), nextPeriod.getID(), dao_id, common::DAO);
Edge(get_self(), get_self(), calendarId, nextPeriod.getID(), common::PERIOD);
Edge(get_self(), get_self(), nextPeriod.getID(), calendarId, common::CALENDAR);

lastPeriodStartSecs = nextPeriodStart.sec_since_epoch();
lastPeriodID = nextPeriod.getID();
}

Edge(get_self(), get_self(), dao_id, lastPeriodID, common::END);

for (auto& updateDao : updateDaos) {
if (updateDao.getToNode() != dao_id) {
Edge(get_self(), get_self(), lastPeriodID, updateDao.getToNode(), common::DAO);
updateDao.erase();
}
}
Edge(get_self(), get_self(), calendarId, lastPeriodID, common::END);

//Check if there are more periods to created

if (period_count > MAX_PERIODS_PER_CALL) {
eosio::action(
eosio::permission_level(get_self(), eosio::name("active")),
get_self(),
eosio::name("genperiods"),
std::make_tuple(dao_id,
std::make_tuple(daoId,
period_count - MAX_PERIODS_PER_CALL)
).send();
}
Expand Down Expand Up @@ -2881,43 +2921,6 @@ void dao::createVoiceToken(const eosio::name& daoName,
).send();
}

void dao::initperiods(uint64_t dao_id, int64_t next_period)
{
verifyDaoType(dao_id);

checkAdminsAuth(dao_id);

auto period = std::make_optional<Period>(this, next_period);

const size_t MAX_PERIODS_PER_CALL = 15;

int it = 0;

while (period && it++ < MAX_PERIODS_PER_CALL) {
Edge(get_self(), get_self(), dao_id, period->getID(), common::PERIOD);

auto prev = std::move(period);

//If next period is empty, then we reached the end of the period list
if (!(period = prev->next())) {
//Only the last period will create a reference to the DAO
Edge(get_self(), get_self(), prev->getID(), dao_id, common::DAO);
}
}

//We didn't finish
if (period) {
eosio::action(
eosio::permission_level{ get_self(), name("active") },
get_self(),
name("initperiods"),
std::make_tuple(
dao_id, period->getID()
)
).send();
}
}

void dao::createToken(const std::string& contractType, name issuer, const asset& token)
{
auto dhoSettings = getSettingsDocument();
Expand Down

0 comments on commit 127c779

Please sign in to comment.