Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add createdAt to the members query on eden-micro-chain #577

Merged
merged 3 commits into from
Oct 14, 2021
Merged

Add createdAt to the members query on eden-micro-chain #577

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32a0446
Add member createdAt
sparkplug0025 Oct 13, 2021
2e6c878
Add membersByCreatedAt query
sparkplug0025 Oct 14, 2021
4fe3125
Fix query ranges
sparkplug0025 Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 53 additions & 1 deletion contracts/eden/src/eden-micro-chain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ constexpr eosio::name pool_account(eosio::name pool)
constexpr eosio::name master_pool = pool_account("master"_n);
eosio::name distribution_fund;

const eosio::name account_min = eosio::name{0};
const eosio::name account_max = eosio::name{~uint64_t(0)};
const eosio::block_timestamp block_timestamp_min = eosio::block_timestamp{0};
const eosio::block_timestamp block_timestamp_max = eosio::block_timestamp{~uint32_t(0)};

// TODO: switch to uint64_t (js BigInt) after we upgrade to nodejs >= 15
extern "C" void __wasm_call_ctors();
[[clang::export_name("initialize")]] void initialize(uint32_t eden_account_low,
Expand Down Expand Up @@ -89,6 +94,7 @@ struct by_pk;
struct by_invitee;
struct by_group;
struct by_round;
struct by_createdAt;

template <typename T, typename... Indexes>
using mic = boost::
Expand Down Expand Up @@ -119,6 +125,11 @@ using ordered_by_round = boost::multi_index::ordered_unique< //
boost::multi_index::tag<by_round>,
boost::multi_index::key<&T::by_round>>;

template <typename T>
using ordered_by_createdAt = boost::multi_index::ordered_unique< //
boost::multi_index::tag<by_createdAt>,
boost::multi_index::key<&T::by_createdAt>>;

uint64_t available_pk(const auto& table, const auto& first)
{
auto& idx = table.template get<by_pk>();
Expand Down Expand Up @@ -294,6 +305,8 @@ using induction_index = mic<induction_object,
ordered_by_pk<induction_object>,
ordered_by_invitee<induction_object>>;

using MemberCreatedAtKey = std::pair<eosio::block_timestamp, eosio::name>;

struct member
{
eosio::name account;
Expand All @@ -302,6 +315,7 @@ struct member
eden::new_member_profile profile;
std::string inductionVideo;
bool participating = false;
eosio::block_timestamp createdAt;
};

struct member_object : public chainbase::object<member_table, member_object>
Expand All @@ -312,8 +326,14 @@ struct member_object : public chainbase::object<member_table, member_object>
member member;

eosio::name by_pk() const { return member.account; }
MemberCreatedAtKey by_createdAt() const {
return {member.createdAt, member.account};
}
};
using member_index = mic<member_object, ordered_by_id<member_object>, ordered_by_pk<member_object>>;
using member_index = mic<member_object,
ordered_by_id<member_object>,
ordered_by_pk<member_object>,
ordered_by_createdAt<member_object>>;

struct election_object : public chainbase::object<election_table, election_object>
{
Expand Down Expand Up @@ -637,6 +657,7 @@ struct Member
const eden::new_member_profile* profile() const { return member ? &member->profile : nullptr; }
const std::string* inductionVideo() const { return member ? &member->inductionVideo : nullptr; }
bool participating() const { return member && member->participating; }
eosio::block_timestamp createdAt() const { return member->createdAt; }

MemberElectionConnection elections(std::optional<eosio::block_timestamp> gt,
std::optional<eosio::block_timestamp> ge,
Expand Down Expand Up @@ -664,6 +685,7 @@ EOSIO_REFLECT2(
profile,
inductionVideo,
participating,
createdAt,
method(elections, "gt", "ge", "lt", "le", "first", "last", "before", "after"),
method(distributionFunds, "gt", "ge", "lt", "le", "first", "last", "before", "after"))

Expand Down Expand Up @@ -1256,6 +1278,7 @@ void inductdonate(const action_context& context,
obj.member.inductionWitnesses = induction.induction.witnesses;
obj.member.profile = induction.induction.profile;
obj.member.inductionVideo = induction.induction.video;
obj.member.createdAt = eosio::block_timestamp(context.block.timestamp);
});
transfer_funds(context.block.timestamp, payer, master_pool, quantity,
history_desc::inductdonate);
Expand Down Expand Up @@ -1773,6 +1796,34 @@ struct Query
[](auto& members, auto key) { return members.upper_bound(key); });
}

MemberConnection membersByCreatedAt(std::optional<eosio::block_timestamp> gt,
std::optional<eosio::block_timestamp> ge,
std::optional<eosio::block_timestamp> lt,
std::optional<eosio::block_timestamp> le,
std::optional<uint32_t> first,
std::optional<uint32_t> last,
std::optional<std::string> before,
std::optional<std::string> after) const
{
return clchain::make_connection<MemberConnection, MemberCreatedAtKey>(
gt ? std::optional{MemberCreatedAtKey{*gt, account_min}} //
sparkplug0025 marked this conversation as resolved.
Show resolved Hide resolved
: std::nullopt, //
ge ? std::optional{MemberCreatedAtKey{*ge, account_min}} //
: std::optional{MemberCreatedAtKey{block_timestamp_min, account_min}}, //
sparkplug0025 marked this conversation as resolved.
Show resolved Hide resolved
lt ? std::optional{MemberCreatedAtKey{*lt, account_max}} //
sparkplug0025 marked this conversation as resolved.
Show resolved Hide resolved
: std::nullopt, //
le ? std::optional{MemberCreatedAtKey{*le, account_max}} //
: std::optional{MemberCreatedAtKey{block_timestamp_max, account_max}}, //
sparkplug0025 marked this conversation as resolved.
Show resolved Hide resolved
first, last, before, after, //
db.members.get<by_createdAt>(), //
[](auto& obj) { return obj.by_createdAt(); }, //
[](auto& obj) {
return Member{obj.member.account, &obj.member};
},
[](auto& members, auto key) { return members.lower_bound(key); },
[](auto& members, auto key) { return members.upper_bound(key); });
}

ElectionConnection elections(std::optional<eosio::block_timestamp> gt,
std::optional<eosio::block_timestamp> ge,
std::optional<eosio::block_timestamp> lt,
Expand Down Expand Up @@ -1816,6 +1867,7 @@ EOSIO_REFLECT2(Query,
distributionFund,
method(balances, "gt", "ge", "lt", "le", "first", "last", "before", "after"),
method(members, "gt", "ge", "lt", "le", "first", "last", "before", "after"),
method(membersByCreatedAt, "gt", "ge", "lt", "le", "first", "last", "before", "after"),
method(elections, "gt", "ge", "lt", "le", "first", "last", "before", "after"),
method(distributions, "gt", "ge", "lt", "le", "first", "last", "before", "after"))

Expand Down