Skip to content

Commit 40e5a5d

Browse files
committed
Fix AragonRegistrar
1 parent c078540 commit 40e5a5d

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed
Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
pragma solidity ^0.4.18;
2-
1+
pragma solidity 0.4.24;
32

43
import '../Registrar.sol';
54
import '@aragon/os/contracts/apps/AragonApp.sol';
@@ -14,35 +13,35 @@ import '@aragon/os/contracts/factory/ENSFactory.sol';
1413
import '@aragon/os/contracts/factory/APMRegistryFactory.sol';
1514

1615
contract AragonRegistrar is AragonApp, Registrar {
17-
// bytes32 constant public CREATE_NAME_ROLE = keccak256("CREATE_NAME_ROLE");
18-
// bytes32 constant public DELETE_NAME_ROLE = keccak256("DELETE_NAME_ROLE");
19-
// bytes32 constant public POINT_ROOTNODE_ROLE = keccak256("POINT_ROOTNODE_ROLE");
20-
bytes32 constant public CREATE_NAME_ROLE = 0xf86bc2abe0919ab91ef714b2bec7c148d94f61fdb069b91a6cfe9ecdee1799ba;
21-
bytes32 constant public DELETE_NAME_ROLE = 0x03d74c8724218ad4a99859bcb2d846d39999449fd18013dd8d69096627e68622;
22-
bytes32 constant public POINT_ROOTNODE_ROLE = 0x9ecd0e7bddb2e241c41b595a436c4ea4fd33c9fa0caa8056acf084fc3aa3bfbe;
23-
24-
function ens() public view returns(AbstractENS) {
25-
return AbstractENS(registry);
26-
}
16+
// bytes32 public constant CREATE_NAME_ROLE = keccak256("CREATE_NAME_ROLE");
17+
// bytes32 public constant DELETE_NAME_ROLE = keccak256("DELETE_NAME_ROLE");
18+
// bytes32 public constant POINT_ROOTNODE_ROLE = keccak256("POINT_ROOTNODE_ROLE");
19+
bytes32 public constant CREATE_NAME_ROLE = 0xf86bc2abe0919ab91ef714b2bec7c148d94f61fdb069b91a6cfe9ecdee1799ba;
20+
bytes32 public constant DELETE_NAME_ROLE = 0x03d74c8724218ad4a99859bcb2d846d39999449fd18013dd8d69096627e68622;
21+
bytes32 public constant POINT_ROOTNODE_ROLE = 0x9ecd0e7bddb2e241c41b595a436c4ea4fd33c9fa0caa8056acf084fc3aa3bfbe;
2722

2823
function initialize(ERC137Registry _registry, bytes32 _rootNode) public onlyInit {
2924
initialized();
3025
Registrar.initialize(_registry, _rootNode);
3126
}
3227

28+
function ens() public view returns(ERC137Registry) {
29+
return registry;
30+
}
31+
3332
function createName(bytes32 _label, address _owner) public auth(CREATE_NAME_ROLE) returns (bytes32) {
34-
super.createName(_label, _owner);
33+
return super.createName(_label, _owner);
3534
}
3635

3736
function createNameAndPoint(bytes32 _label, address _target) public auth(CREATE_NAME_ROLE) returns (bytes32) {
38-
super.createNameAndPoint(_label, _target);
37+
return super.createNameAndPoint(_label, _target);
3938
}
4039

4140
function pointRootNode(address _target) public auth(POINT_ROOTNODE_ROLE) {
4241
super.pointRootNode(_target);
4342
}
4443

45-
function deleteName(bytes32 _label) public auth(DELETE_NAME_ROLE) {
44+
function deleteName(bytes32 _label) public auth(DELETE_NAME_ROLE) {
4645
super.deleteName(_label);
4746
}
4847
}

package_manager/contracts/PR/zeppelin/ZeppelinRegistrar.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ contract ZeppelinRegistrar is Ownable, Registrar {
1212
}
1313

1414
function createName(bytes32 _label, address _owner) public onlyOwner returns (bytes32) {
15-
super.createName(_label, _owner);
15+
return super.createName(_label, _owner);
1616
}
1717

1818
function createNameAndPoint(bytes32 _label, address _target) public onlyOwner returns (bytes32) {
19-
super.createNameAndPoint(_label, _target);
19+
return super.createNameAndPoint(_label, _target);
2020
}
2121

2222
function pointRootNode(address _target) public onlyOwner {

package_manager/test/contracts/PR/aragon/AragonRegistrar.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import { hash as namehash } from 'eth-ens-namehash'
22
import assertRevert from '../../../helpers/assertRevert'
33

44
const keccak256 = require('js-sha3').keccak_256
5+
56
const AragonRegistrar = artifacts.require('AragonRegistrar')
6-
// const AragonRegistrar = artifacts.require('ENSSubdomainRegistrar')
77

88
const ENS = artifacts.require('ENS')
99
const ENSFactory = artifacts.require('ENSFactory')
10-
const PublicResolver = artifacts.require('PublicResolver')
1110
const Kernel = artifacts.require('Kernel')
1211
const ACL = artifacts.require('ACL')
1312
const APMRegistry = artifacts.require('APMRegistry')

0 commit comments

Comments
 (0)