Skip to content

Commit

Permalink
remove authorized transfer due to possible missuse of delegation sign…
Browse files Browse the repository at this point in the history 
…ature
  • Loading branch information
@marc0olo
marc0olo committed Jul 13, 2023
1 parent 913424c commit 66a9ed3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 131 deletions.
30 changes: 0 additions & 30 deletions development/smart-contracts/contracts/AENSWrapping.aes
View file
Expand Up @@ -398,31 +398,6 @@ main contract AENSWrapping : IAEX141, IAENSWrapping =
require_can_receive_name(nft_id_new, target_owner)
List.foreach(Map.to_list(nft_metadata_map), (val) => __transfer_single_common(nft_id_old, nft_id_new, Pair.fst(val), new_expiration_height))

/// @notice transfers a single AENS name to another NFT by requiring explicit authorization of the recipient via delegation signature. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param name the AENS name to transfer
/// @param delegation_sig the delegation signature for the name provided by the owner of nft_id_new
stateful entrypoint transfer_single_authorized(nft_id_old: int, nft_id_new: int, name: string, delegation_sig: signature) =
require_authorized(nft_id_old)
require_not_expired(nft_id_old)
let target_owner = require_exists(nft_id_new)
let new_expiration_height = require_not_expired(nft_id_new)
require_name_limit_not_exceeded(get_wrap_count(nft_id_new), 1)
__transfer_single_authorized(nft_id_old, nft_id_new, name, new_expiration_height, target_owner, delegation_sig)

/// @notice transfers multiple AENS names to another NFT by requiring explicit authorization of the recipient via delegation signatures. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param names_delegation_sigs a map (key = AENS name, value = delegation signature)
stateful entrypoint transfer_multiple_authorized(nft_id_old: int, nft_id_new: int, names_delegation_sigs: map(string, signature)) =
let current_owner = require_authorized(nft_id_old)
let target_owner = require_exists(nft_id_new)
require_not_expired(nft_id_old)
let new_expiration_height = require_not_expired(nft_id_new)
require_name_limit_not_exceeded(get_wrap_count(nft_id_new), Map.size(names_delegation_sigs))
List.foreach(Map.to_list(names_delegation_sigs), (val) => __transfer_single_authorized(nft_id_old, nft_id_new, Pair.fst(val), new_expiration_height, target_owner, Pair.snd(val)))

/// @notice transfers the AENS name back to the owner or to another defined recipient, updates metadata
/// @param nft_id the id of the NFT that currently wraps the AENS name
/// @param name the AENS name to transfer
Expand Down Expand Up @@ -627,11 +602,6 @@ main contract AENSWrapping : IAEX141, IAENSWrapping =
AENS.update(Contract.address, name, Some(FixedTTL(new_expiration_height)), None, None)
Chain.event(NameExtend(name, nft_id, new_expiration_height, Call.caller))

stateful function __transfer_single_authorized(nft_id_old: int, nft_id_new: int, name: string, new_expiration_height: int, owner_target_nft: address, delegation_sig: signature) =
AENS.transfer(Contract.address, owner_target_nft, name)
AENS.transfer(owner_target_nft, Contract.address, name, signature = delegation_sig)
__transfer_single_common(nft_id_old, nft_id_new, name, new_expiration_height)

stateful function __transfer_single_common(nft_id_old: int, nft_id_new: int, name: string, new_expiration_height: int) =
require_name_wrapped(nft_id_old, name)
// update state of old nft
Expand Down
13 changes: 0 additions & 13 deletions development/smart-contracts/contracts/interfaces/IAENSWrapping.aes
View file
Expand Up @@ -144,19 +144,6 @@ contract interface IAENSWrapping =
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
stateful entrypoint transfer_all : (int, int) => unit

/// @notice transfers a single AENS name to another NFT by requiring explicit authorization of the recipient via delegation signature. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param name the AENS name to transfer
/// @param delegation_sig the delegation signature for the name provided by the owner of nft_id_new
stateful entrypoint transfer_single_authorized : (int, int, string, signature) => unit

/// @notice transfers multiple AENS names to another NFT by requiring explicit authorization of the recipient via delegation signatures. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param names_delegation_sigs a map (key = AENS name, value = delegation signature)
stateful entrypoint transfer_multiple_authorized : (int, int, map(string, signature)) => unit

/// @notice transfers the AENS name back to the owner or to another defined recipient, updates metadata
/// @param nft_id the id of the NFT that currently wraps the AENS name
/// @param name the AENS name to transfer
Expand Down
45 changes: 16 additions & 29 deletions development/smart-contracts/contracts/test/AENSWrappingCustomTTL.aes
View file
Expand Up @@ -42,6 +42,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
, token_to_config: map(int, config)
, account_to_config: map(address, config)
, account_to_reward_pool: map(address, int)
, name_limit: int
, max_name_ttl: Chain.ttl
, balances: map(address, int)
, approvals: map(int, address)
Expand Down Expand Up @@ -73,7 +74,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
| Reward(int, address, int)

stateful entrypoint init(ttl: int) =
{ owner = Contract.creator,
{ owner = Contract.creator, // TODO owner related actions (e.g. update max_name_ttl, name_limit or migration related actions)
meta_info = { name = "Wrapped AENS", symbol = "WAENS", base_url = None, metadata_type = MAP },
token_to_owner = {},
owner_to_tokens = {},
Expand All @@ -82,6 +83,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
token_to_config = {},
account_to_config = {},
account_to_reward_pool = {},
name_limit = 100,
max_name_ttl = RelativeTTL(ttl),
balances = {},
approvals = {},
Expand Down Expand Up @@ -237,6 +239,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
/// @param names_delegation_sigs a map (key = AENS name, value = delegation signature)
/// @return the NFT id
stateful entrypoint wrap_and_mint(names_delegation_sigs: map(string, signature)) : int =
require_name_limit_not_exceeded(0, Map.size(names_delegation_sigs))
let token_id = __mint(Call.caller, None)
let names_delegation_sigs_list: list(string * signature) = Map.to_list(names_delegation_sigs)
let name_expiration_height = to_fixed_ttl(state.max_name_ttl)
Expand All @@ -251,6 +254,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
stateful entrypoint wrap_single(nft_id: int, name: string, delegation_sig: signature) =
require_authorized(nft_id)
let expiration_height = require_not_expired(nft_id)
require_name_limit_not_exceeded(get_wrap_count(nft_id), 1)
__claim_and_assign((name, delegation_sig), nft_id, expiration_height)

/// @notice wraps multiple AENS names into an existing NFT, adds NFT metadata, updates expiry of names to match expiry of already wrapped names
Expand All @@ -259,6 +263,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
stateful entrypoint wrap_multiple(nft_id: int, names_delegation_sigs: map(string, signature)) =
require_authorized(nft_id)
let expiration_height = require_not_expired(nft_id)
require_name_limit_not_exceeded(get_wrap_count(nft_id), Map.size(names_delegation_sigs))
let names_delegation_sigs_list: list(string * signature) = Map.to_list(names_delegation_sigs)
List.foreach(names_delegation_sigs_list, (val) => __claim_and_assign(val, nft_id, expiration_height))

Expand Down Expand Up @@ -360,6 +365,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
let target_owner = require_exists(nft_id_new)
require_not_expired(nft_id_old)
let new_expiration_height = require_not_expired(nft_id_new)
require_name_limit_not_exceeded(get_wrap_count(nft_id_new), 1)
if(current_owner != target_owner)
require_can_receive_name(nft_id_new, target_owner)
__transfer_single_common(nft_id_old, nft_id_new, name, new_expiration_height)
Expand All @@ -373,6 +379,7 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
let target_owner = require_exists(nft_id_new)
require_not_expired(nft_id_old)
let new_expiration_height = require_not_expired(nft_id_new)
require_name_limit_not_exceeded(get_wrap_count(nft_id_new), Set.size(names))
if(current_owner != target_owner)
require_can_receive_name(nft_id_new, target_owner)
List.foreach(Set.to_list(names), (n) => __transfer_single_common(nft_id_old, nft_id_new, n, new_expiration_height))
Expand All @@ -386,33 +393,11 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
require_not_expired(nft_id_old)
let new_expiration_height = require_not_expired(nft_id_new)
let nft_metadata_map = require_names_wrapped(nft_id_old)
require_name_limit_not_exceeded(get_wrap_count(nft_id_new), Map.size(nft_metadata_map))
if(current_owner != target_owner)
require_can_receive_name(nft_id_new, target_owner)
List.foreach(Map.to_list(nft_metadata_map), (val) => __transfer_single_common(nft_id_old, nft_id_new, Pair.fst(val), new_expiration_height))

/// @notice transfers a single AENS name to another NFT by requiring explicit authorization of the recipient via delegation signature. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param name the AENS name to transfer
/// @param delegation_sig the delegation signature for the name provided by the owner of nft_id_new
stateful entrypoint transfer_single_authorized(nft_id_old: int, nft_id_new: int, name: string, delegation_sig: signature) =
require_authorized(nft_id_old)
require_not_expired(nft_id_old)
let target_owner = require_exists(nft_id_new)
let new_expiration_height = require_not_expired(nft_id_new)
__transfer_single_authorized(nft_id_old, nft_id_new, name, new_expiration_height, target_owner, delegation_sig)

/// @notice transfers multiple AENS names to another NFT by requiring explicit authorization of the recipient via delegation signatures. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param names_delegation_sigs a map (key = AENS name, value = delegation signature)
stateful entrypoint transfer_multiple_authorized(nft_id_old: int, nft_id_new: int, names_delegation_sigs: map(string, signature)) =
let current_owner = require_authorized(nft_id_old)
let target_owner = require_exists(nft_id_new)
require_not_expired(nft_id_old)
let new_expiration_height = require_not_expired(nft_id_new)
List.foreach(Map.to_list(names_delegation_sigs), (val) => __transfer_single_authorized(nft_id_old, nft_id_new, Pair.fst(val), new_expiration_height, target_owner, Pair.snd(val)))

/// @notice transfers the AENS name back to the owner or to another defined recipient, updates metadata
/// @param nft_id the id of the NFT that currently wraps the AENS name
/// @param name the AENS name to transfer
Expand Down Expand Up @@ -558,6 +543,9 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =

// internal helper functions

function require_name_limit_not_exceeded(current_wrap_count: int, to_wrap: int) =
require(current_wrap_count + to_wrap =< state.name_limit, "NAME_LIMIT_EXCEEDED")

function require_burnable_if_expired_or_empty(nft_id: int, owner: address) =
switch(get_nft_config(nft_id, owner))
None => () // allow burning if no config is set
Expand Down Expand Up @@ -614,11 +602,6 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
AENS.update(Contract.address, name, Some(FixedTTL(new_expiration_height)), None, None)
Chain.event(NameExtend(name, nft_id, new_expiration_height, Call.caller))

stateful function __transfer_single_authorized(nft_id_old: int, nft_id_new: int, name: string, new_expiration_height: int, owner_target_nft: address, delegation_sig: signature) =
AENS.transfer(Contract.address, owner_target_nft, name)
AENS.transfer(owner_target_nft, Contract.address, name, signature = delegation_sig)
__transfer_single_common(nft_id_old, nft_id_new, name, new_expiration_height)

stateful function __transfer_single_common(nft_id_old: int, nft_id_new: int, name: string, new_expiration_height: int) =
require_name_wrapped(nft_id_old, name)
// update state of old nft
Expand Down Expand Up @@ -693,6 +676,10 @@ main contract AENSWrappingCustomTTL : IAEX141, IAENSWrapping =
, metadata = Map.delete(token_id, state.metadata) })
Chain.event(Burn(owner, token_id))

function get_wrap_count(token_id: int) =
let Some(MetadataMap(nft_metadata_map)) = Map.lookup(token_id, state.metadata)
Map.size(nft_metadata_map)

function get_possible_reward(owner: address, owner_cfg : config, expiration_height: int) : int =
let delta = expiration_height - Chain.block_height
if(delta > owner_cfg.reward_block_window)
Expand Down
46 changes: 0 additions & 46 deletions development/smart-contracts/test/aensWrappingTest.js
View file
Expand Up @@ -543,52 +543,6 @@ describe('AENSWrapping', () => {
expectNameAttributesProtocol(aensNames, { owner: contractAccountAddress, ttl: expirationHeightNftTwo });
});

it('transfer_single_authorized', async () => {
// prepare: wrap names
await contract.wrap_and_mint(namesDelegationSigs);

// prepare: mint an empty NFT on other account
const otherAccount = utils.getDefaultAccounts()[1];
await contract.mint(otherAccount.address, undefined, undefined, { onAccount: otherAccount });

// create delegation signature for recipient of name
const delegationSig = await aeSdk.createDelegationSignature(contractId, [aensNames[0]], { onAccount: otherAccount });

// transfer a single name to another NFT
const transferSingleAuthorizedTx = await contract.transfer_single_authorized(1, 2, aensNames[0], delegationSig);
console.log(`Gas used (transfer_single_authorized): ${transferSingleAuthorizedTx.result.gasUsed}`);

// check NameTransfer event
assert.equal(transferSingleAuthorizedTx.decodedEvents[0].name, 'NameTransfer');
assert.equal(transferSingleAuthorizedTx.decodedEvents[0].args[0], aensNames[0]);
assert.equal(transferSingleAuthorizedTx.decodedEvents[0].args[1], 1);
assert.equal(transferSingleAuthorizedTx.decodedEvents[0].args[2], 2);
});

it('transfer_multiple_authorized', async () => {
// prepare: wrap names
await contract.wrap_and_mint(namesDelegationSigs);

// prepare: mint an empty NFT on other account
const otherAccount = utils.getDefaultAccounts()[1];
await contract.mint(otherAccount.address, undefined, undefined, { onAccount: otherAccount });

// create delegation signatures for recipient
const namesDelegationSigsRecipient = await getDelegationSignatures(aensNames, contractId, otherAccount);

// transfer multiple names to another NFT
const transferMultipleAuthorizedTx = await contract.transfer_multiple_authorized(1, 2, namesDelegationSigsRecipient);
console.log(`Gas used (transfer_multiple_authorized with ${aensNames.length} names): ${transferMultipleAuthorizedTx.result.gasUsed}`);

// check NameTransfer event
for(let i=0; i<aensNames.length; i++) {
assert.equal(transferMultipleAuthorizedTx.decodedEvents[i].name, 'NameTransfer');
assert.equal(transferMultipleAuthorizedTx.decodedEvents[i].args[0], aensNames[aensNames.length-(i+1)]);
assert.equal(transferMultipleAuthorizedTx.decodedEvents[i].args[1], 1);
assert.equal(transferMultipleAuthorizedTx.decodedEvents[i].args[2], 2);
}
});

it('transfer (NFT)', async () => {
// prepare: wrap names
await contract.wrap_and_mint(namesDelegationSigs);
Expand Down
13 changes: 0 additions & 13 deletions docs/contract-interface.md
View file
Expand Up @@ -190,19 +190,6 @@ contract interface IAENSWrapping : IAEX141 =
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
stateful entrypoint transfer_all : (int, int) => unit
/// @notice transfers a single AENS name to another NFT by requiring explicit authorization of the recipient via delegation signature. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param name the AENS name to transfer
/// @param delegation_sig the delegation signature for the name provided by the owner of nft_id_new
stateful entrypoint transfer_single_authorized : (int, int, string, signature) => unit
/// @notice transfers multiple AENS names to another NFT by requiring explicit authorization of the recipient via delegation signatures. can be used if can_receive_from_others is false
/// @param nft_id_old the id of the NFT that currently wraps the AENS name
/// @param nft_id_new the id of the NFT that will wrap the AENS name in the future
/// @param names_delegation_sigs a map (key = AENS name, value = delegation signature)
stateful entrypoint transfer_multiple_authorized : (int, int, map(string, signature)) => unit
/// @notice transfers the AENS name back to the owner or to another defined recipient, updates metadata
/// @param nft_id the id of the NFT that currently wraps the AENS name
/// @param name the AENS name to transfer
Expand Down

0 comments on commit 66a9ed3

Please sign in to comment.