Skip to content

Cancel deferred transaction if the minter of the instrument is not the owner/whitelisted account #23

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

Merged
surabhil merged 1 commit into from
Jan 22, 2019
Merged

Cancel deferred transaction if the minter of the instrument is not the owner/whitelisted account #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions contracts/ore.instrument/ore.instrument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,17 @@ void instrument::checkright(account_name minter, account_name issuer, string rig
if (!minter_owns_right)
{
auto position_in_whitelist = std::find(rightitr.issuer_whitelist.begin(), rightitr.issuer_whitelist.end(), minter);
eosio_assert(position_in_whitelist != rightitr.issuer_whitelist.end(), "minter neither owns the right nor whitelisted for the right");
if (position_in_whitelist == rightitr.issuer_whitelist.end())
{
if (deferred_transaction_id != 0)
{
cancel_deferred(deferred_transaction_id);
}
eosio_assert(false, "minter neither owns the right nor whitelisted for the right");
}
}

bool issuer_owns_right = rightitr.owner == issuer;

if (!issuer_owns_right)
{
auto issuer_in_whitelist = std::find(rightitr.issuer_whitelist.begin(), rightitr.issuer_whitelist.end(), issuer);
Expand All @@ -202,7 +208,7 @@ void instrument::checkright(account_name minter, account_name issuer, string rig
{
cancel_deferred(deferred_transaction_id);
}
eosio_assert(true, "instrument issuer neither holds the right nor whitelisted for the right");
eosio_assert(false, "instrument issuer neither holds the right nor whitelisted for the right");
}
}
}
Expand Down