status-im
/
ens-usernames
mirror of https://github.com/status-im/ens-usernames.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

require caller to know new registry address

This commit is contained in:
Ricardo Guilherme Schmidt 2018-10-03 11:45:20 -03:00 committed by Barry G
parent 95f3e53081
commit c4686a9c39
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/registry/UsernameRegistrar.sol
View File

@ -275,13 +275,14 @@ contract UsernameRegistrar is Controlled, ApproveAndCallFallBack {
* @param _label Username hash. * @param _label Username hash.
**/ **/
function moveAccount( function moveAccount(
bytes32 _label bytes32 _label,
UsernameRegistrar _newRegistry
) )
external external
{ {
require(state == RegistrarState.Moved, "Wrong contract state"); require(state == RegistrarState.Moved, "Wrong contract state");
require(msg.sender == accounts[_label].owner, "Callable only by account owner."); require(msg.sender == accounts[_label].owner, "Callable only by account owner.");
UsernameRegistrar _newRegistry = UsernameRegistrar(ensRegistry.owner(ensNode)); require(ensRegistry.owner(ensNode) == address(_newRegistry), "Wrong update");
Account memory account = accounts[_label]; Account memory account = accounts[_label];
delete accounts[_label]; delete accounts[_label];

4
test/usernameregistrar.spec.js
View File

@ -964,7 +964,7 @@ contract('UsernameRegistrar', function () {
}); });
}); });
describe('moveAccount(label)', function() { describe('moveAccount(label,address)', function() {
it('should move username to new registry by account owner', async () => { it('should move username to new registry by account owner', async () => {
const registrant = accountsArr[5]; const registrant = accountsArr[5];
const username = 'erin'; const username = 'erin';
@ -978,7 +978,7 @@ contract('UsernameRegistrar', function () {
const creationTime = await UsernameRegistrar.methods.getCreationTime(label).call(); const creationTime = await UsernameRegistrar.methods.getCreationTime(label).call();
assert.notEqual(creationTime, 0); assert.notEqual(creationTime, 0);
assert.equal(await UpdatedUsernameRegistrar.methods.getCreationTime(label).call(), 0); assert.equal(await UpdatedUsernameRegistrar.methods.getCreationTime(label).call(), 0);
const result = await UsernameRegistrar.methods.moveAccount(label).send({from: registrant}); const result = await UsernameRegistrar.methods.moveAccount(label, UpdatedUsernameRegistrar.address).send({from: registrant});
assert.equal(await UsernameRegistrar.methods.getCreationTime(label).call(), 0); assert.equal(await UsernameRegistrar.methods.getCreationTime(label).call(), 0);
assert.equal(await UpdatedUsernameRegistrar.methods.getCreationTime(label).call(), creationTime); assert.equal(await UpdatedUsernameRegistrar.methods.getCreationTime(label).call(), creationTime);
assert.equal(await TestToken.methods.balanceOf(UsernameRegistrar.address).call(), (+initialRegistryBalance)-(+accountBalance)) assert.equal(await TestToken.methods.balanceOf(UsernameRegistrar.address).call(), (+initialRegistryBalance)-(+accountBalance))