Skip to content

Commit

Permalink
v1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ansigroup committed Apr 3, 2020
1 parent fd4893a commit 14e908c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
Binary file modified build/SimpleAssets/SimpleAssets.wasm
Binary file not shown.
14 changes: 0 additions & 14 deletions include/SimpleAssets.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -605,20 +605,6 @@ CONTRACT SimpleAssets : public contract{
const uint8_t FEE_PRECISION = 2;
const uint16_t FEE_PRECISION_AMOUNT = 100;

/*
* List of authors that need double signatute owner and wet.wax@nftops
*/

const std::vector<name> waxauthors{ "vgo.wax"_n, "irl.wax"_n, "wax"_n };

/*
* Check wax authors double signature owner and wet.wax@nftops
*
* @param author name of asset to check for second signature.
* @return no return value.
*/

void checkwaxauthor( name author );
/*
* Get new asset id.
*
Expand Down
13 changes: 0 additions & 13 deletions src/SimpleAssets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,6 @@ void SimpleAssets::check_empty_vector( vector<uint64_t>& vector_ids, string vect
check( !(vector_ids.size() == 0), "Please add values to parameter: " + move(vector_name) );
}

void SimpleAssets::checkwaxauthor( name author ) {

for ( auto i = 0; i < waxauthors.size(); ++i ) {
if ( author == waxauthors[i] ) {
internal_use_do_not_use::require_auth2( "wet.wax"_n.value, "nftops"_n.value );
}
}
}

ACTION SimpleAssets::transfer( name from, name to, vector<uint64_t>& assetids, string memo ) {

check( from != to, "cannot transfer to yourself" );
Expand Down Expand Up @@ -236,8 +227,6 @@ ACTION SimpleAssets::transfer( name from, name to, vector<uint64_t>& assetids, s
check( from.value == itr->owner.value, "Asset id: " + to_string(assetids[i]) + " is not yours to transfer. Owner: " + itr->owner.to_string() );
check( offert.find( assetids[i] ) == offert.end(), "Asset id: " + to_string(assetids[i]) + " offered for a claim and cannot be transferred. Cancel offer?" );

checkwaxauthor( itr->author );

assets_t.emplace( rampayer, [&]( auto& s ) {
s.id = itr->id;
s.owner = to;
Expand Down Expand Up @@ -292,7 +281,6 @@ ACTION SimpleAssets::offer( name owner, name newowner, vector<uint64_t>& assetid
for ( auto i = 0; i < assetids.size(); ++i ) {
const auto itr = assets_f.find ( assetids[i] );
check( itr != assets_f.end(), "Asset id: " + to_string( assetids[i] ) + " was not found." );
checkwaxauthor( itr->author );
check( offert.find ( assetids[i] ) == offert.end(), "Asset id: " + to_string(assetids[i]) + " is already offered for claim." );
check( delegatet.find( assetids[i] ) == delegatet.end(), "Asset id: " + to_string(assetids[i]) + " is delegated and cannot be offered." );

Expand Down Expand Up @@ -341,7 +329,6 @@ ACTION SimpleAssets::burn( name owner, vector<uint64_t>& assetids, string memo )
check( offert.find( assetids[i] ) == offert.end(), "Asset id: " + to_string(assetids[i]) + " has an open offer and cannot be burned." );
check( delegatet.find( assetids[i] ) == delegatet.end(), "Asset id: " + to_string(assetids[i]) + " is delegated and cannot be burned." );

checkwaxauthor( itr->author );
//Events
uniqauthor[itr->author].push_back( assetids[i] );
assets_f.erase(itr);
Expand Down

0 comments on commit 14e908c

Please sign in to comment.