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

Dev feature 7 - Deprecating Backed Assets #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev feature 7 - Deprecating Backed Assets #9

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54070ff
dev-feature-7
on-a-t-break Sep 6, 2024
f2aadea
dev-feature-7
on-a-t-break Sep 20, 2024
487e8d4
Fixes; re-added logbackasset to maintain backwards ABI compatibility
on-a-t-break Oct 14, 2024
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
13 changes: 0 additions & 13 deletions include/atomicassets.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,6 @@ CONTRACT atomicassets : public contract {
ATTRIBUTE_MAP new_data
);

ACTION logbackasset(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it probably makes sense to keep this in just so the new abi can still be used to deserialize old log actions

name asset_owner,
uint64_t asset_id,
asset backed_token
);

ACTION logburnasset(
name asset_owner,
uint64_t asset_id,
Expand Down Expand Up @@ -379,13 +373,6 @@ CONTRACT atomicassets : public contract {
name scope_payer
);

void internal_back_asset(
name ram_payer,
name asset_owner,
uint64_t asset_id,
asset back_quantity
);

void internal_decrease_balance(
name owner,
asset quantity
Expand Down
88 changes: 4 additions & 84 deletions src/atomicassets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,17 +602,8 @@ ACTION atomicassets::mintasset(
)
).send();

//Calls the internal_back_asset function which handles asset backing.
//It will throw if authorized_minter does not have a sufficient balance to pay for the backed tokens
//Token validity must not be cross-checked with config.supported_tokens because it's implicitly checked
//when decreasing minter's balance (only supported tokens can be deposited)
set <symbol> used_symbols = {};
for (asset &token : tokens_to_back) {
check(used_symbols.find(token.symbol) == used_symbols.end(),
"Symbols in the tokens_to_back must be unique");
used_symbols.emplace(token.symbol);
internal_back_asset(authorized_minter, new_asset_owner, asset_id, token);
}
check(tokens_to_back.size() == 0,
"Native backing has been deprecated on the AtomicAssets Contract");
}


Expand Down Expand Up @@ -770,9 +761,8 @@ ACTION atomicassets::backasset(
uint64_t asset_id,
asset token_to_back
) {
require_auth(payer);

internal_back_asset(payer, asset_owner, asset_id, token_to_back);
check(false,
"Native backing has been deprecated on the AtomicAssets Contract");
}


Expand Down Expand Up @@ -1188,22 +1178,6 @@ ACTION atomicassets::logsetdata(
}


ACTION atomicassets::logbackasset(
name asset_owner,
uint64_t asset_id,
asset backed_token
) {
require_auth(get_self());

require_recipient(asset_owner);

assets_t owner_assets = get_assets(asset_owner);
auto asset_itr = owner_assets.find(asset_id);

notify_collection_accounts(asset_itr->collection_name);
}


ACTION atomicassets::logburnasset(
name asset_owner,
uint64_t asset_id,
Expand Down Expand Up @@ -1323,60 +1297,6 @@ void atomicassets::internal_transfer(
}
}


/**
* The specified asset is backed by the specified quantitiy.
* This is done in an internal function because it is needed both in the mintasset and the backasset action
*/
void atomicassets::internal_back_asset(
name payer,
name asset_owner,
uint64_t asset_id,
asset token_to_back
) {
check(token_to_back.amount > 0, "token_to_back must be positive");

//The internal_decrease_balance function will throw if payer does not have a sufficient balance
internal_decrease_balance(payer, token_to_back);

assets_t owner_assets = get_assets(asset_owner);
auto asset_itr = owner_assets.require_find(asset_id,
"The specified owner does not own the asset with the specified ID");

if (asset_itr->template_id != -1) {
templates_t collection_templates = get_templates(asset_itr->collection_name);

auto template_itr = collection_templates.find(asset_itr->template_id);
check(template_itr->burnable, "The asset is not burnable. Only burnable assets can be backed.");
}

vector <asset> backed_tokens = asset_itr->backed_tokens;
bool found_backed_token = false;
for (asset &token : backed_tokens) {
if (token.symbol == token_to_back.symbol) {
found_backed_token = true;
token.amount += token_to_back.amount;
break;
}
}
if (!found_backed_token) {
backed_tokens.push_back(token_to_back);
}

owner_assets.modify(asset_itr, payer, [&](auto &_asset) {
_asset.ram_payer = payer;
_asset.backed_tokens = backed_tokens;
});

action(
permission_level{get_self(), name("active")},
get_self(),
name("logbackasset"),
make_tuple(asset_owner, asset_id, token_to_back)
).send();
}


/**
* Decreases the balance of a specified account by a specified quantity
* If the specified account does not have at least as much tokens in the balance as should be removed
Expand Down