Skip to content

Commit

Permalink
Merge pull request #26 from eosnetworkfoundation/fix/setcontracts
Browse files Browse the repository at this point in the history 
Fix setcontracts
  • Loading branch information
@DenisCarriere
DenisCarriere authored Oct 20, 2022
2 parents 6a37d26 + 83dd828 commit 477dc15
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 19 deletions.
41 changes: 28 additions & 13 deletions contracts/eosio.yield/eosio.yield.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ void yield::regprotocol( const name protocol, const name category, const map<nam

const auto config = get_config();
auto insert = [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
row.protocol = protocol;
row.category = category;
row.tvl.symbol = EOS;
Expand All @@ -45,6 +44,9 @@ void yield::regprotocol( const name protocol, const name category, const map<nam
if ( is_exists ) _protocols.modify( itr, protocol, insert );
else _protocols.emplace( protocol, insert );

// if denied revert back to pending
if ( itr->status == "denied"_n ) set_status(protocol, "pending"_n);

// logging
yield::createlog_action createlog( get_self(), { get_self(), "active"_n });
yield::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
Expand All @@ -65,11 +67,13 @@ void yield::setmetadata( const name protocol, const map<name, string> metadata )
const auto config = get_config();
const name ram_payer = has_auth( config.admin_contract ) ? config.admin_contract : protocol;
_protocols.modify( itr, ram_payer, [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
row.metadata = metadata;
row.updated_at = current_time_point();
});

// if denied revert back to pending
if ( itr.status == "denied"_n ) set_status(protocol, "pending"_n);

// logging
yield::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
metadatalog.send( protocol, itr.status, itr.category, metadata );
Expand All @@ -88,12 +92,14 @@ void yield::setmetakey( const name protocol, const name key, const optional<stri

const name ram_payer = is_admin ? config.admin_contract : protocol;
_protocols.modify( itr, ram_payer, [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
if ( value ) row.metadata[key] = *value;
else row.metadata.erase(key);
row.updated_at = current_time_point();
});

// if denied revert back to pending
if ( itr.status == "denied"_n ) set_status(protocol, "pending"_n);

// logging
yield::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
metadatalog.send( protocol, itr.status, itr.category, itr.metadata );
Expand Down Expand Up @@ -142,8 +148,8 @@ void yield::set_status( const name protocol, const name status )
auto & itr = _protocols.get(protocol.value, "yield::set_status: [protocol] does not exists");
check( PROTOCOL_STATUS_TYPES.find( status ) != PROTOCOL_STATUS_TYPES.end(), "yield::set_status: [status] is invalid");

if ( itr.status == status ) return; // no status change
_protocols.modify( itr, same_payer, [&]( auto& row ) {
check( row.status != status, "yield::set_status: [status] not modified");
row.status = status;
});

Expand All @@ -159,11 +165,13 @@ void yield::set_category( const name protocol, const name category )
auto & itr = _protocols.get(protocol.value, "yield::set_category: [protocol] does not exists");

_protocols.modify( itr, same_payer, [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
check( row.category != category, "yield::set_category: [category] not modified");
row.category = category;
});

// if denied revert back to pending
if ( itr.status == "denied"_n ) set_status(protocol, "pending"_n);

// logging
yield::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
metadatalog.send( protocol, itr.status, category, itr.metadata );
Expand Down Expand Up @@ -330,27 +338,32 @@ void yield::report( const name protocol, const time_point_sec period, const uint
void yield::setcontracts( const name protocol, const set<name> contracts )
{
const auto config = get_config();
const bool is_admin = has_auth( config.admin_contract );
if ( !is_admin ) require_auth( protocol );

// override permission is required to allow certain protocols with nulled permission to be added to Yield+
const bool is_override = has_auth( get_self() );
if ( !is_override ) require_auth( protocol );

yield::protocols_table _protocols( get_self(), get_self().value );
auto & itr = _protocols.get(protocol.value, "yield::setcontracts: [protocol] does not exists");

// require authority of all EOS contracts linked to protocol
for ( const name contract : contracts ) {
check( is_account( contract ), "yield::setcontracts: [contract=" + contract.to_string() + "] account does not exists");
if ( !is_admin ) require_auth( contract );

// override permission does not need to validate contract permission
if ( !is_override ) require_auth( contract );
}

// modify contracts
const set<name> before_contracts = itr.contracts;
const name ram_payer = is_admin ? config.admin_contract : protocol;
const name ram_payer = is_override ? config.admin_contract : protocol;
_protocols.modify( itr, ram_payer, [&]( auto& row ) {
check( row.contracts != contracts, "yield::setcontracts: [contracts] was not modified");
row.contracts = contracts;
if ( contracts.size() > 1 ) row.status = "pending"_n; // must be re-approved if contracts changed
row.updated_at = current_time_point();
check( row.contracts != before_contracts, "yield::setcontracts: [contracts] was not modified");
});

// protocol must be re-approved if `setcontracts` action is called
set_status( protocol, "pending"_n );
remove_active_protocol( protocol );

// logging
Expand All @@ -377,13 +390,15 @@ void yield::setevm( const name protocol, const set<string> evm )
// modify contracts
const set<string> before_evm = itr.evm;
_protocols.modify( itr, protocol, [&]( auto& row ) {
row.status = "pending"_n; // must be re-approved if contracts changed
row.evm = evm;
row.contracts.insert(protocol); // always include EOS protocol account
row.updated_at = current_time_point();
check( row.evm != before_evm, "yield::setevm: [evm] was not modified");
});

// must be re-approved if contracts changed
set_status(protocol, "pending"_n);

// logging
yield::contractslog_action contractslog( get_self(), { get_self(), "active"_n });
contractslog.send( protocol, itr.status, itr.contracts, itr.evm );
Expand Down
4 changes: 2 additions & 2 deletions contracts/eosio.yield/eosio.yield.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ describe('eosio.yield', () => {
const protocol = getProtocol("myprotocol");
expect(protocol.contracts).toEqual(eos_contracts);

const action = contracts.yield.eosio.actions.setcontracts([ "not.exists", eos_contracts ]).send("admin.yield");
const action = contracts.yield.eosio.actions.setcontracts([ "not.exists", eos_contracts ]).send();
await expectToThrow(action, "does not exists");
});

Expand All @@ -164,7 +164,7 @@ describe('eosio.yield', () => {
});

it("setcontracts - protocol not included by default", async () => {
await contracts.yield.eosio.actions.setcontracts([ "myprotocol", ["vault"] ]).send("admin.yield");
await contracts.yield.eosio.actions.setcontracts([ "myprotocol", ["vault"] ]).send();
const protocol = getProtocol("myprotocol");
expect(protocol.contracts).toEqual(["vault"]);
});
Expand Down
15 changes: 11 additions & 4 deletions contracts/oracle.yield/oracle.yield.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ void oracle::regoracle( const name oracle, const map<name, string> metadata )
const auto config = get_config();

auto insert = [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
row.oracle = oracle;
row.metadata = metadata;
row.balance.contract = config.reward_per_update.contract;
Expand All @@ -36,12 +35,16 @@ void oracle::regoracle( const name oracle, const map<name, string> metadata )
row.updated_at = current_time_point();
};


// modify or create
auto itr = _oracles.find( oracle.value );
const bool is_exists = itr != _oracles.end();
if ( is_exists ) _oracles.modify( itr, oracle, insert );
else _oracles.emplace( oracle, insert );

// if denied revert back to pending
if ( itr->status == "denied"_n ) set_status(oracle, "pending"_n);

// logging
oracle::createlog_action createlog( get_self(), { get_self(), "active"_n });
oracle::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
Expand Down Expand Up @@ -94,11 +97,13 @@ void oracle::setmetadata( const name oracle, const map<name, string> metadata )

const name ram_payer = is_admin ? config.admin_contract : oracle;
_oracles.modify( itr, ram_payer, [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
row.metadata = metadata;
row.updated_at = current_time_point();
});

// if denied revert back to pending
if ( itr.status == "denied"_n ) set_status(oracle, "pending"_n);

// logging
oracle::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
metadatalog.send( oracle, itr.status, "oracle"_n, metadata );
Expand All @@ -117,12 +122,14 @@ void oracle::setmetakey( const name oracle, const name key, const optional<strin

const name ram_payer = is_admin ? config.admin_contract : oracle;
_oracles.modify( itr, ram_payer, [&]( auto& row ) {
if ( row.status == "denied"_n ) row.status = "pending"_n; // if denied revert back to pending
if ( value ) row.metadata[key] = *value;
else row.metadata.erase(key);
row.updated_at = current_time_point();
});

// if denied revert back to pending
if ( itr.status == "denied"_n ) set_status(oracle, "pending"_n);

// logging
oracle::metadatalog_action metadatalog( get_self(), { get_self(), "active"_n });
metadatalog.send( oracle, itr.status, "oracle"_n, itr.metadata );
Expand Down Expand Up @@ -171,8 +178,8 @@ void oracle::set_status( const name oracle, const name status )
auto & itr = _oracles.get(oracle.value, "oracle::set_status: [oracle] does not exists");
check( ORACLE_STATUS_TYPES.find( status ) != ORACLE_STATUS_TYPES.end(), "oracle::set_status: [status] is invalid");

if ( itr.status == status ) return; // no status change
_oracles.modify( itr, same_payer, [&]( auto& row ) {
check( row.status != status, "oracle::set_status: [status] not modified");
row.status = status;
});

Expand Down

0 comments on commit 477dc15

Please sign in to comment.