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

merge multisig to release branch #87

Merged
merged 8 commits into from
Aug 21, 2019
Merged

merge multisig to release branch #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a629da2
Merge pull request #78 from boscore/release/3.0.x
Thaipanda May 7, 2019
0d810de
Merge pull request #79 from boscore/release/3.0.x
Thaipanda May 7, 2019
3076f32
update eosio.msig contract.
maodaishan May 9, 2019
5c336e2
added rc
kesar Jun 14, 2019
5e53f1c
Merge pull request #84 from boscore/feature/system_rc
Jun 14, 2019
61db28e
Update eosio.token.cpp
vlbos Jul 23, 2019
11ce1f3
Merge pull request #86 from boscore/token_blacklist_self
Thaipanda Jul 23, 2019
8842c16
Merge pull request #80 from maodaishan/feature_multisig_oppose
Thaipanda Aug 21, 2019
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
21 changes: 21 additions & 0 deletions contracts/eosio.msig/include/eosio.msig/eosio.msig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ namespace eosio {
void exec( name proposer, name proposal_name, name executer );
[[eosio::action]]
void invalidate( name account );
[[eosio::action]]
void oppose( name proposer, name proposal_name, permission_level level,
const eosio::binary_extension<eosio::checksum256>& proposal_hash );
[[eosio::action]]
void unoppose( name proposer, name proposal_name, permission_level level );
[[eosio::action]]
void abstain( name proposer, name proposal_name, permission_level level,
const eosio::binary_extension<eosio::checksum256>& proposal_hash );
[[eosio::action]]
void unabstain( name proposer, name proposal_name, permission_level level );

using propose_action = eosio::action_wrapper<"propose"_n, &multisig::propose>;
using approve_action = eosio::action_wrapper<"approve"_n, &multisig::approve>;
Expand Down Expand Up @@ -67,6 +77,17 @@ namespace eosio {
};
typedef eosio::multi_index< "approvals2"_n, approvals_info > approvals;

//one can only approval, or oppose, or abstain.
//if he/she wants to change opinion of oppose, needs to unoppose first.
//oppose/abstain won't be counted in when trying exec. only approvals are counted.
struct [[eosio::table]] opposes_info {
name proposal_name;
std::vector<permission_level> opposed_approvals;
std::vector<permission_level> abstained_approvals;
uint64_t primary_key() const { return proposal_name.value; }
};
typedef eosio::multi_index< "opposes"_n, opposes_info > opposes;

struct [[eosio::table]] invalidation {
name account;
time_point last_invalidation_time;
Expand Down
151 changes: 150 additions & 1 deletion contracts/eosio.msig/src/eosio.msig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ void multisig::approve( name proposer, name proposal_name, permission_level leve
assert_sha256( prop.packed_transaction.data(), prop.packed_transaction.size(), *proposal_hash );
}

//check whether opposed or abstained to this proposal.
opposes oppotable(_self, proposer.value );
auto oppos_it = oppotable.find(proposal_name.value );
if(oppos_it != oppotable.end() ){
auto check_itr = std::find( oppos_it->opposed_approvals.begin(), oppos_it->opposed_approvals.end(), level );
check( check_itr == oppos_it->opposed_approvals.end(), "you already opposed this proposal" );
check_itr = std::find( oppos_it->abstained_approvals.begin(), oppos_it->abstained_approvals.end(), level );
check( check_itr == oppos_it->abstained_approvals.end(), "you already abstained this proposal" );
}

approvals apptable( _self, proposer.value );
auto apps_it = apptable.find( proposal_name.value );
if ( apps_it != apptable.end() ) {
Expand Down Expand Up @@ -139,6 +149,138 @@ void multisig::cancel( name proposer, name proposal_name, name canceler ) {
check( apps_it != old_apptable.end(), "proposal not found" );
old_apptable.erase(apps_it);
}

//remove from oppose table
opposes oppotable(_self, proposer.value );
auto oppo_it = oppotable.find( proposal_name.value );
if( oppo_it != oppotable.end() ){
oppotable.erase(oppo_it);
}
}

void multisig::oppose( name proposer, name proposal_name, permission_level level,
const eosio::binary_extension<eosio::checksum256>& proposal_hash ){
require_auth( level );
if( proposal_hash ) {
proposals proptable( _self, proposer.value );
auto& prop = proptable.get( proposal_name.value, "proposal not found" );
assert_sha256( prop.packed_transaction.data(), prop.packed_transaction.size(), *proposal_hash );
}

//check whether level is in requested approvals or already approved to it
approvals apptable( _self, proposer.value );
auto app_it = apptable.find(proposal_name.value );
if( app_it != apptable.end() ){
auto requested_it = std::find_if( app_it->requested_approvals.begin(), app_it->requested_approvals.end(), [&](const approval& a) { return a.level == level; } );
bool requested = (requested_it != app_it->requested_approvals.end());
auto approved_it = std::find_if( app_it->provided_approvals.begin(), app_it->provided_approvals.end(), [&](const approval &a){ return a.level == level;} );
bool approved = (approved_it != app_it->provided_approvals.end());
check( requested && !approved , "provided permission not requested, or you have approved to this proposal" );
}else{
old_approvals old_apptable( _self, proposer.value );
auto old_app_it = old_apptable.find( proposal_name.value );
if( old_app_it != old_apptable.end() ){
auto requested_it = std::find( old_app_it->requested_approvals.begin(), old_app_it->requested_approvals.end(), level );
bool requested = (requested_it != old_app_it->requested_approvals.end());
auto approved_it = std::find( old_app_it->provided_approvals.begin(), old_app_it->provided_approvals.end(), level );
bool approved = (approved_it != old_app_it->provided_approvals.end());
check( requested && !approved , "provided permission not requested, or you have approved to this proposal" );
}
}

//check whether abstained/opposed to this proposal
//update opposed
opposes oppotable( _self, proposer.value );
auto oppo_it = oppotable.find( proposal_name.value );
if ( oppo_it != oppotable.end() ) {
auto abs_check_it = std::find( oppo_it->abstained_approvals.begin(), oppo_it->abstained_approvals.end(), level );
check( abs_check_it == oppo_it->abstained_approvals.end(), "you have abstained to this proposal" );
auto oppo_check_it = std::find( oppo_it->opposed_approvals.begin(), oppo_it->opposed_approvals.end(), level);
check( oppo_check_it == oppo_it->opposed_approvals.end(), "you have opposed to this proposal" );
oppotable.modify( oppo_it, proposer, [&]( auto& o ) {
o.opposed_approvals.push_back( level );
});
}else{
oppotable.emplace( proposer, [&]( auto& o ) {
o.proposal_name = proposal_name;
o.opposed_approvals.push_back( level );
});
}
}

void multisig::unoppose( name proposer, name proposal_name, permission_level level ){
require_auth( level );

opposes oppotable( _self, proposer.value );
auto& oppo_it = oppotable.get( proposal_name.value, "can't find this proposal in opposes table" );
auto itr = std::find( oppo_it.opposed_approvals.begin(), oppo_it.opposed_approvals.end(), level );
check( itr != oppo_it.opposed_approvals.end(), "no oppose found" );
oppotable.modify( oppo_it, proposer, [&]( auto& o ) {
o.opposed_approvals.erase( itr );
});
}

void multisig::abstain( name proposer, name proposal_name, permission_level level,
const eosio::binary_extension<eosio::checksum256>& proposal_hash ){
require_auth( level );

if( proposal_hash ) {
proposals proptable( _self, proposer.value );
auto& prop = proptable.get( proposal_name.value, "proposal not found" );
assert_sha256( prop.packed_transaction.data(), prop.packed_transaction.size(), *proposal_hash );
}

//check whether level is in requested approvals or already approved to it
approvals apptable( _self, proposer.value );
auto app_it = apptable.find(proposal_name.value );
if( app_it != apptable.end() ){
auto requested_it = std::find_if( app_it->requested_approvals.begin(), app_it->requested_approvals.end(), [&](const approval& a) { return a.level == level; } );
bool requested = (requested_it != app_it->requested_approvals.end());
auto approved_it = std::find_if( app_it->provided_approvals.begin(), app_it->provided_approvals.end(), [&](const approval &a){ return a.level == level;} );
bool approved = (approved_it != app_it->provided_approvals.end());
check( requested && !approved , "provided permission not requested, or you have approved to this proposal" );
}else{
old_approvals old_apptable( _self, proposer.value );
auto old_app_it = old_apptable.find( proposal_name.value );
if( old_app_it != old_apptable.end() ){
auto requested_it = std::find( old_app_it->requested_approvals.begin(), old_app_it->requested_approvals.end(), level );
bool requested = (requested_it != old_app_it->requested_approvals.end());
auto approved_it = std::find( old_app_it->provided_approvals.begin(), old_app_it->provided_approvals.end(), level );
bool approved = (approved_it != old_app_it->provided_approvals.end());
check( requested && !approved , "provided permission not requested, or you have approved to this proposal" );
}
}

//check whether abstained/opposed to this proposal
//update abstained
opposes oppotable( _self, proposer.value );
auto abs_it = oppotable.find( proposal_name.value );
if ( abs_it != oppotable.end() ) {
auto abs_check_it = std::find( abs_it->abstained_approvals.begin(), abs_it->abstained_approvals.end(), level );
check( abs_check_it == abs_it->abstained_approvals.end(), "you have abstained to this proposal" );
auto oppo_check_it = std::find( abs_it->opposed_approvals.begin(), abs_it->opposed_approvals.end(), level);
check( oppo_check_it == abs_it->opposed_approvals.end(), "you have opposed to this proposal" );
oppotable.modify( abs_it, proposer, [&]( auto& a ) {
a.abstained_approvals.push_back( level );
});
}else{
oppotable.emplace( proposer, [&]( auto& a ) {
a.proposal_name = proposal_name;
a.abstained_approvals.push_back( level );
});
}
}

void multisig::unabstain( name proposer, name proposal_name, permission_level level ){
require_auth( level );

opposes oppotable( _self, proposer.value );
auto& abs_it = oppotable.get( proposal_name.value, "can't find this proposal in opposes table" );
auto itr = std::find( abs_it.abstained_approvals.begin(), abs_it.abstained_approvals.end(), level );
check( itr != abs_it.abstained_approvals.end(), "no abstain found" );
oppotable.modify( abs_it, proposer, [&]( auto& a ) {
a.abstained_approvals.erase( itr );
});
}

void multisig::exec( name proposer, name proposal_name, name executer ) {
Expand Down Expand Up @@ -186,6 +328,13 @@ void multisig::exec( name proposer, name proposal_name, name executer ) {
prop.packed_transaction.data(), prop.packed_transaction.size() );

proptable.erase(prop);

//clear opposes
opposes oppotable(_self, proposer.value);
auto oppos_it = oppotable.find( proposal_name.value );
if( oppos_it != oppotable.end() ){
oppotable.erase( oppos_it );
}
}

void multisig::invalidate( name account ) {
Expand All @@ -206,4 +355,4 @@ void multisig::invalidate( name account ) {

} /// namespace eosio

EOSIO_DISPATCH( eosio::multisig, (propose)(approve)(unapprove)(cancel)(exec)(invalidate) )
EOSIO_DISPATCH( eosio::multisig, (propose)(approve)(unapprove)(cancel)(oppose)(unoppose)(abstain)(unabstain)(exec)(invalidate) )
Loading