diff --git a/.solcover.js b/.solcover.js index 7baa7a6..93bbdb9 100644 --- a/.solcover.js +++ b/.solcover.js @@ -1,14 +1,11 @@ module.exports = { norpc: true, - copyPackages: ['@aragon/os'], skipFiles: [ 'IFIFSResolvingRegistrar.sol', - 'ens/IPublicResolver.sol', + 'ens/', 'interface/ApproveAndCallReceiver.sol', 'misc/Migrations.sol', - 'zeppelin/ERC20.sol', - 'zeppelin/ERC20Basic.sol', - 'zeppelin/Ownable.sol', + 'zeppelin/', 'test/', ] } diff --git a/contracts/FIFSResolvingRegistrar.sol b/contracts/FIFSResolvingRegistrar.sol index 1fb7804..2fc5604 100644 --- a/contracts/FIFSResolvingRegistrar.sol +++ b/contracts/FIFSResolvingRegistrar.sol @@ -1,6 +1,6 @@ pragma solidity 0.4.24; -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "./ens/AbstractENS.sol"; import "./ens/IPublicResolver.sol"; import "./IFIFSResolvingRegistrar.sol"; diff --git a/contracts/ens/AbstractENS.sol b/contracts/ens/AbstractENS.sol new file mode 100644 index 0000000..497343b --- /dev/null +++ b/contracts/ens/AbstractENS.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.4.15; + + +interface AbstractENS { + function owner(bytes32 _node) public constant returns (address); + function resolver(bytes32 _node) public constant returns (address); + function ttl(bytes32 _node) public constant returns (uint64); + function setOwner(bytes32 _node, address _owner) public; + function setSubnodeOwner(bytes32 _node, bytes32 label, address _owner) public; + function setResolver(bytes32 _node, address _resolver) public; + function setTTL(bytes32 _node, uint64 _ttl) public; + + // Logged when the owner of a node assigns a new owner to a subnode. + event NewOwner(bytes32 indexed _node, bytes32 indexed _label, address _owner); + + // Logged when the owner of a node transfers ownership to a new account. + event Transfer(bytes32 indexed _node, address _owner); + + // Logged when the resolver for a node changes. + event NewResolver(bytes32 indexed _node, address _resolver); + + // Logged when the TTL of a node changes + event NewTTL(bytes32 indexed _node, uint64 _ttl); +} diff --git a/contracts/test/ens/ENS.sol b/contracts/test/ens/ENS.sol index c519b38..6923f18 100644 --- a/contracts/test/ens/ENS.sol +++ b/contracts/test/ens/ENS.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.0; -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "../../ens/AbstractENS.sol"; /** diff --git a/contracts/test/ens/FIFSRegistrar.sol b/contracts/test/ens/FIFSRegistrar.sol index ad1cfeb..f8bf50b 100644 --- a/contracts/test/ens/FIFSRegistrar.sol +++ b/contracts/test/ens/FIFSRegistrar.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.0; -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "../../ens/AbstractENS.sol"; /** * A registrar that allocates subdomains to the first person to claim them. diff --git a/contracts/test/ens/PublicResolver.sol b/contracts/test/ens/PublicResolver.sol index 4586c76..181af4e 100644 --- a/contracts/test/ens/PublicResolver.sol +++ b/contracts/test/ens/PublicResolver.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.0; -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "../../ens/AbstractENS.sol"; /** * A simple resolver anyone can use; only allows the owner of a node to set its diff --git a/contracts/test/ens/Registrar.sol b/contracts/test/ens/Registrar.sol index b982396..6e7997a 100644 --- a/contracts/test/ens/Registrar.sol +++ b/contracts/test/ens/Registrar.sol @@ -14,7 +14,7 @@ The plan is to test the basic features and then move to a new contract in at mos */ -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "../../ens/AbstractENS.sol"; /** diff --git a/contracts/test/mocks/MockResolver.sol b/contracts/test/mocks/MockResolver.sol index 58ddecc..988d453 100644 --- a/contracts/test/mocks/MockResolver.sol +++ b/contracts/test/mocks/MockResolver.sol @@ -1,6 +1,6 @@ pragma solidity 0.4.24; -import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; +import "../../ens/AbstractENS.sol"; contract MockResolver { diff --git a/package.json b/package.json index 7e570f3..eca97d3 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,5 @@ "solidity-coverage": "^0.5.8", "truffle": "4.1.14", "truffle-hdwallet-provider": "0.0.3" - }, - "dependencies": { - "@aragon/os": "4.0.0-beta.2" } }