Skip to content

feat!: remove custodial rental primitives (move/logmove/holders) from V2 #27

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
robrigo merged 1 commit into from
Jul 3, 2026
Merged

feat!: remove custodial rental primitives (move/logmove/holders) from V2 #27

Show file tree
Hide file tree
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
14 changes: 0 additions & 14 deletions include/atomicassets-interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,6 @@ namespace atomicassets {
typedef multi_index <name("assets"), assets_s> assets_t;


struct holders_s {
uint64_t asset_id;
name holder;
name owner;

uint64_t primary_key() const { return asset_id; };
uint64_t by_holder() const { return holder.value; };
};
typedef multi_index <name("holders"), holders_s,
indexed_by<name("holder"), const_mem_fun <holders_s, uint64_t, &holders_s::by_holder>>>
holders_t;


struct offers_s {
uint64_t offer_id;
name sender;
Expand Down Expand Up @@ -228,6 +215,5 @@ namespace atomicassets {
template_mutables_t get_template_mutables(name collection_name) {return template_mutables_t(ATOMICASSETS_ACCOUNT, collection_name.value);}

assets_t get_assets(name owner) {return assets_t(ATOMICASSETS_ACCOUNT, owner.value);}
holders_t get_holders() {return holders_t(ATOMICASSETS_ACCOUNT, ATOMICASSETS_ACCOUNT.value);}

};
31 changes: 0 additions & 31 deletions include/atomicassets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ CONTRACT atomicassets : public contract {
string memo
);

ACTION move(
name owner,
name from,
name to,
vector <uint64_t> asset_ids,
string memo
);

ACTION createcol(
name author,
name collection_name,
Expand Down Expand Up @@ -260,15 +252,6 @@ CONTRACT atomicassets : public contract {
string memo
);

ACTION logmove(
name collection_name,
name owner,
name from,
name to,
vector <uint64_t> asset_ids,
string memo
);

ACTION lognewoffer(
uint64_t offer_id,
name sender,
Expand Down Expand Up @@ -438,19 +421,6 @@ CONTRACT atomicassets : public contract {
typedef multi_index <name("assets"), assets_s> assets_t;


TABLE holders_s {
uint64_t asset_id;
name holder;
name owner;

uint64_t primary_key() const { return asset_id; };
uint64_t by_holder() const { return holder.value; };
};
typedef multi_index <name("holders"), holders_s,
indexed_by<name("holder"), const_mem_fun <holders_s, uint64_t, &holders_s::by_holder>>>
holders_t;


TABLE offers_s {
uint64_t offer_id;
name sender;
Expand Down Expand Up @@ -518,7 +488,6 @@ CONTRACT atomicassets : public contract {
template_mutables_t get_template_mutables(name collection_name) {return template_mutables_t(get_self(), collection_name.value);}

assets_t get_assets(name owner) {return assets_t(get_self(), owner.value);}
holders_t get_holders() {return holders_t(get_self(), get_self().value);}

/*
**************************
Expand Down
139 changes: 0 additions & 139 deletions src/atomicassets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,109 +85,6 @@ ACTION atomicassets::transfer(
internal_transfer(from, to, asset_ids, memo, from);
}

/**
* Moves one or more assets to another account
* @required_auth of the true owner of the asset
* Cannot have notifications for the from & to, exploitable
*/
ACTION atomicassets::move(
name owner,
name from,
name to,
vector <uint64_t> asset_ids,
string memo
) {
require_auth(owner);
require_recipient(owner);

check(is_account(from), "from account does not exist");
check(is_account(to), "to account does not exist");

check(from != to, "from & to fields cannot be the same");

check(asset_ids.size() != 0, "asset_ids needs to contain at least one id");
check(memo.length() <= 256, "A move memo can only be 256 characters max");

vector <uint64_t> asset_ids_copy = asset_ids;
std::sort(asset_ids_copy.begin(), asset_ids_copy.end());
check(std::adjacent_find(asset_ids_copy.begin(), asset_ids_copy.end()) == asset_ids_copy.end(),
"Can't move the same asset multiple times");

assets_t owner_assets = get_assets(owner);
holders_t holders = get_holders();

map <name, vector <uint64_t>> collection_to_assets_moved = {};

for (uint64_t & asset_id : asset_ids) {
auto asset_itr = owner_assets.find(asset_id);
if (asset_itr == owner_assets.end()){
check(false,
("Owner doesn't own at least one of the provided assets (ID: " + to_string(asset_id) + ")").c_str());
}


//Existence doesn't have to be checked because this always has to exist
if (asset_itr->template_id >= 0) {
templates_t collection_templates = get_templates(asset_itr->collection_name);

auto template_itr = collection_templates.find(asset_itr->template_id);
if (!template_itr->transferable){
check(false,
("At least one asset isn't transferable (ID: " + to_string(asset_id) + ")").c_str());
}
}

auto holders_itr = holders.find(asset_id);
if (holders_itr == holders.end()){
if (from != owner){
check(false,
("Only the owner can move this asset (ID: " + to_string(asset_id) + ")").c_str());
}

// Emplaces new holder
holders.emplace(owner, [&](auto &_holders_row){
_holders_row.asset_id = asset_id;
_holders_row.holder = to;
_holders_row.owner = owner;
});
}

if (holders_itr != holders.end()){
if (holders_itr->holder != from){
check(false,
("At least one asset invalidates the 'from:holder' constraint (ID: " + to_string(asset_id) + ")").c_str());
}

// Deletes row if returning to owner
if (to == owner){
holders.erase(holders_itr);
} else { // Modifies row to move holdership to the new "to" wallet
holders.modify(holders_itr, owner, [&](auto &_holders_row){
_holders_row.holder = to;
});
}
}

//This is needed for sending notifications later
if (collection_to_assets_moved.find(asset_itr->collection_name) !=
collection_to_assets_moved.end()) {
collection_to_assets_moved[asset_itr->collection_name].push_back(asset_id);
} else {
collection_to_assets_moved[asset_itr->collection_name] = {asset_id};
}
}

// Sending notifications
for (const auto&[collection, assets_moved] : collection_to_assets_moved) {
action(
permission_level{get_self(), name("active")},
get_self(),
name("logmove"),
make_tuple(collection, owner, from, to, assets_moved, memo)
).send();
}
}

/**
* Creates a new collection
*/
Expand Down Expand Up @@ -1213,14 +1110,6 @@ ACTION atomicassets::burnasset(
check(template_itr->burnable, "The asset is not burnable");
};

holders_t holders = get_holders();

// Checks to see if the asset has been rented out & erases the "holdership"
auto holders_itr = holders.find(asset_id);
if (holders_itr != holders.end()){
holders.erase(holders_itr);
}

if (asset_itr->backed_tokens.size() != 0) {
auto balances = get_balances();
auto balance_itr = balances.find(asset_owner.value);
Expand Down Expand Up @@ -1565,20 +1454,6 @@ ACTION atomicassets::logtransfer(
notify_collection_accounts(collection_name);
}

ACTION atomicassets::logmove(
name collection_name,
name owner,
name from,
name to,
vector <uint64_t> asset_ids,
string memo
) {
require_auth(get_self());

notify_collection_accounts(collection_name);
}


ACTION atomicassets::lognewoffer(
uint64_t offer_id,
name sender,
Expand Down Expand Up @@ -1809,7 +1684,6 @@ void atomicassets::internal_transfer(

assets_t from_assets = get_assets(from);
assets_t to_assets = get_assets(to);
holders_t holders = get_holders();

map <name, vector <uint64_t>> collection_to_assets_transferred = {};

Expand All @@ -1831,19 +1705,6 @@ void atomicassets::internal_transfer(
}
}

auto holders_itr = holders.find(asset_id);
if (holders_itr != holders.end()){

// Deletes row if transfering to holder
if (to == holders_itr->holder){
holders.erase(holders_itr);
} else { // Modifies row to move ownership to the new "to" wallet
holders.modify(holders_itr, from, [&](auto &_holders_row){
_holders_row.owner = to;
});
}
}

//This is needed for sending notifications later
if (collection_to_assets_transferred.find(asset_itr->collection_name) !=
collection_to_assets_transferred.end()) {
Expand Down
Loading
Loading