From d451cb96771c17fe209000ac24b7bf6ccb7525bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Wed, 19 Sep 2018 19:01:43 +0200 Subject: [PATCH 1/5] Update to aragonOS 4, solidity 0.4.24 Moved from solhint to solium, upgraded truffle and solcover too. --- .solhintignore | 3 -- .soliumignore | 6 +++ .soliumrc.json | 37 +++++++++++++++++++ contracts/DeedHolder.sol | 12 +++--- contracts/DelegatingDeedHolder.sol | 4 +- contracts/FIFSBurnableRegistrar.sol | 4 +- contracts/FIFSResolvingRegistrar.sol | 6 +-- contracts/IFIFSResolvingRegistrar.sol | 2 +- .../interface/ApproveAndCallReceiver.sol | 2 +- {test => contracts/test}/ens/ENS.sol | 0 .../test}/ens/FIFSRegistrar.sol | 0 .../test}/ens/PublicResolver.sol | 0 {test => contracts/test}/ens/Registrar.sol | 0 .../mocks/MockAcceptingTransferRegistrar.sol | 2 +- .../test}/mocks/MockApproveAndCallERC20.sol | 4 +- .../test}/mocks/MockResolver.sol | 2 +- package.json | 13 +++---- 17 files changed, 68 insertions(+), 29 deletions(-) delete mode 100644 .solhintignore create mode 100644 .soliumignore create mode 100644 .soliumrc.json rename {test => contracts/test}/ens/ENS.sol (100%) rename {test => contracts/test}/ens/FIFSRegistrar.sol (100%) rename {test => contracts/test}/ens/PublicResolver.sol (100%) rename {test => contracts/test}/ens/Registrar.sol (100%) rename {test => contracts/test}/mocks/MockAcceptingTransferRegistrar.sol (91%) rename {test => contracts/test}/mocks/MockApproveAndCallERC20.sol (94%) rename {test => contracts/test}/mocks/MockResolver.sol (92%) diff --git a/.solhintignore b/.solhintignore deleted file mode 100644 index b37677f..0000000 --- a/.solhintignore +++ /dev/null @@ -1,3 +0,0 @@ -contracts/ens -contracts/misc -contracts/zeppelin diff --git a/.soliumignore b/.soliumignore new file mode 100644 index 0000000..58770e5 --- /dev/null +++ b/.soliumignore @@ -0,0 +1,6 @@ +node_modules +contracts/ens +contracts/interface +contracts/misc +contracts/test +contracts/zeppelin \ No newline at end of file diff --git a/.soliumrc.json b/.soliumrc.json new file mode 100644 index 0000000..068dc07 --- /dev/null +++ b/.soliumrc.json @@ -0,0 +1,37 @@ +{ + "extends": "solium:all", + "plugins": ["security"], + "rules": { + "security/no-low-level-calls": "off", + "security/no-inline-assembly": "off", + "error-reason": "off", + "imports-on-top": "error", + "variable-declarations": "error", + "array-declarations": "error", + "operator-whitespace": "error", + "conditionals-whitespace": "error", + "comma-whitespace": "error", + "semicolon-whitespace": "error", + "function-whitespace": "error", + "lbrace": "error", + "mixedcase": "error", + "camelcase": "error", + "uppercase": "error", + "no-empty-blocks": "error", + "no-unused-vars": "error", + "quotes": "error", + "blank-lines": "error", + "indentation": "error", + "arg-overflow": ["error", 8], + "whitespace": "error", + "deprecated-suicide": "error", + "pragma-on-top": "error", + "function-order": "error", + "emit": "error", + "no-constant": "error", + "value-in-payable": "error", + "max-len": "error", + "visibility-first": "error", + "linebreak-style": "error" + } +} diff --git a/contracts/DeedHolder.sol b/contracts/DeedHolder.sol index 9e24002..726cfcd 100644 --- a/contracts/DeedHolder.sol +++ b/contracts/DeedHolder.sol @@ -1,8 +1,8 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; contract IENS { - function owner(bytes32 _node) public constant returns (address); + function owner(bytes32 _node) public view returns (address); function setOwner(bytes32 _node, address _owner) public; } @@ -16,7 +16,7 @@ contract IDeed { contract IHashRegistrarSimplified { enum Mode { Open, Auction, Owned, Forbidden, Reveal, NotYetAvailable } - function entries(bytes32 _hash) public constant returns (Mode, address, uint, uint, uint); + function entries(bytes32 _hash) public view returns (Mode, address, uint, uint, uint); function transfer(bytes32 _hash, address _newOwner) public; } @@ -54,7 +54,7 @@ contract DeedHolder { _; } - function DeedHolder(address _ens, bytes32 _registrarNode) public { + constructor(address _ens, bytes32 _registrarNode) public { ens = IENS(_ens); registrarNode = _registrarNode; registrar = IHashRegistrarSimplified(ens.owner(registrarNode)); @@ -76,7 +76,7 @@ contract DeedHolder { * @param _node The node hash of the deed to check. * @return The address owning the deed. */ - function owner(bytes32 _node) public constant returns(address) { + function owner(bytes32 _node) public view returns(address) { if (owners[_node] != 0) { return owners[_node]; } @@ -97,6 +97,6 @@ contract DeedHolder { */ function transfer(bytes32 _node, address _newOwner) public onlyDeedOwner(_node) { owners[_node] = _newOwner; - TransferDeed(_node, _newOwner); + emit TransferDeed(_node, _newOwner); } } diff --git a/contracts/DelegatingDeedHolder.sol b/contracts/DelegatingDeedHolder.sol index ab406b4..c0a0ced 100644 --- a/contracts/DelegatingDeedHolder.sol +++ b/contracts/DelegatingDeedHolder.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "./DeedHolder.sol"; @@ -15,7 +15,7 @@ import "./DeedHolder.sol"; * DeedHolder also transfers control of the ENS node. */ contract DelegatingDeedHolder is DeedHolder { - function DelegatingDeedHolder(address _ens, bytes32 _registrarNode) + constructor(address _ens, bytes32 _registrarNode) public DeedHolder(_ens, _registrarNode) // solhint-disable-next-line no-empty-blocks diff --git a/contracts/FIFSBurnableRegistrar.sol b/contracts/FIFSBurnableRegistrar.sol index 9875f8c..f0bf85e 100644 --- a/contracts/FIFSBurnableRegistrar.sol +++ b/contracts/FIFSBurnableRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "./interface/ApproveAndCallReceiver.sol"; import "./zeppelin/ERC20.sol"; @@ -26,7 +26,7 @@ contract FIFSBurnableRegistrar is Ownable, ApproveAndCallReceiver, FIFSResolving * @param _burningToken The token to be burned for claiming addresses. * @param _startingCost The initial cost of claiming an address. */ - function FIFSBurnableRegistrar( + constructor( AbstractENS _ensAddr, IPublicResolver _resolver, bytes32 _node, diff --git a/contracts/FIFSResolvingRegistrar.sol b/contracts/FIFSResolvingRegistrar.sol index 1575613..1fb7804 100644 --- a/contracts/FIFSResolvingRegistrar.sol +++ b/contracts/FIFSResolvingRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; import "./ens/IPublicResolver.sol"; @@ -26,7 +26,7 @@ contract FIFSResolvingRegistrar is IFIFSResolvingRegistrar { * @param _defaultResolver The address of the default resolver to use for subdomains. * @param _node The node that this registrar administers. */ - function FIFSResolvingRegistrar(AbstractENS _ensAddr, IPublicResolver _defaultResolver, bytes32 _node) + constructor(AbstractENS _ensAddr, IPublicResolver _defaultResolver, bytes32 _node) public { ens = _ensAddr; @@ -65,6 +65,6 @@ contract FIFSResolvingRegistrar is IFIFSResolvingRegistrar { // Give ownership to the claimer ens.setOwner(node, _owner); - ClaimSubdomain(_subnode, _owner, address(_resolver)); + emit ClaimSubdomain(_subnode, _owner, address(_resolver)); } } diff --git a/contracts/IFIFSResolvingRegistrar.sol b/contracts/IFIFSResolvingRegistrar.sol index d9dfce1..ba8dca4 100644 --- a/contracts/IFIFSResolvingRegistrar.sol +++ b/contracts/IFIFSResolvingRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "./ens/IPublicResolver.sol"; diff --git a/contracts/interface/ApproveAndCallReceiver.sol b/contracts/interface/ApproveAndCallReceiver.sol index da8a8a9..e3b80e2 100644 --- a/contracts/interface/ApproveAndCallReceiver.sol +++ b/contracts/interface/ApproveAndCallReceiver.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; /* Copyright 2017, Jordi Baylina (Giveth) diff --git a/test/ens/ENS.sol b/contracts/test/ens/ENS.sol similarity index 100% rename from test/ens/ENS.sol rename to contracts/test/ens/ENS.sol diff --git a/test/ens/FIFSRegistrar.sol b/contracts/test/ens/FIFSRegistrar.sol similarity index 100% rename from test/ens/FIFSRegistrar.sol rename to contracts/test/ens/FIFSRegistrar.sol diff --git a/test/ens/PublicResolver.sol b/contracts/test/ens/PublicResolver.sol similarity index 100% rename from test/ens/PublicResolver.sol rename to contracts/test/ens/PublicResolver.sol diff --git a/test/ens/Registrar.sol b/contracts/test/ens/Registrar.sol similarity index 100% rename from test/ens/Registrar.sol rename to contracts/test/ens/Registrar.sol diff --git a/test/mocks/MockAcceptingTransferRegistrar.sol b/contracts/test/mocks/MockAcceptingTransferRegistrar.sol similarity index 91% rename from test/mocks/MockAcceptingTransferRegistrar.sol rename to contracts/test/mocks/MockAcceptingTransferRegistrar.sol index 3d110b7..e9d92b1 100644 --- a/test/mocks/MockAcceptingTransferRegistrar.sol +++ b/contracts/test/mocks/MockAcceptingTransferRegistrar.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "../ens/Registrar.sol"; diff --git a/test/mocks/MockApproveAndCallERC20.sol b/contracts/test/mocks/MockApproveAndCallERC20.sol similarity index 94% rename from test/mocks/MockApproveAndCallERC20.sol rename to contracts/test/mocks/MockApproveAndCallERC20.sol index e2e815e..96a2a3b 100644 --- a/test/mocks/MockApproveAndCallERC20.sol +++ b/contracts/test/mocks/MockApproveAndCallERC20.sol @@ -1,6 +1,6 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; -import "../../contracts/interface/ApproveAndCallReceiver.sol"; +import "../../interface/ApproveAndCallReceiver.sol"; contract MockApproveAndCallERC20 { diff --git a/test/mocks/MockResolver.sol b/contracts/test/mocks/MockResolver.sol similarity index 92% rename from test/mocks/MockResolver.sol rename to contracts/test/mocks/MockResolver.sol index aebc4b5..58ddecc 100644 --- a/test/mocks/MockResolver.sol +++ b/contracts/test/mocks/MockResolver.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.18; +pragma solidity 0.4.24; import "@aragon/os/contracts/lib/ens/AbstractENS.sol"; diff --git a/package.json b/package.json index 3ee0fc9..0abc56b 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "@aragon/id", - "version": "1.2.4", + "version": "1.2.5", "description": "", "scripts": { "compile": "truffle compile", "coverage": "cross-env SOLIDITY_COVERAGE=true ./test.sh", "develop": "truffle develop", - "lint": "solhint 'contracts/**/*.sol'", + "lint": "solium --dir contracts", "migrate": "truffle migrate", "test": "./test.sh", "deploy:devnet": "truffle compile --all; truffle exec --network devnet scripts/deploy-beta-aragonid.js" @@ -41,13 +41,12 @@ "ethereumjs-testrpc": "^6.0.1", "homedir": "^0.6.0", "js-sha3": "^0.7.0", - "solhint": "^1.1.10", - "solidity-coverage": "0.4.3", - "solidity-coverage": "^0.4.0", - "truffle": "4.0.5", + "solium": "^1.1.8", + "solidity-coverage": "^0.5.8", + "truffle": "4.1.14", "truffle-hdwallet-provider": "0.0.3" }, "dependencies": { - "@aragon/os": "^3.1.4" + "@aragon/os": "4.0.0-beta.2" } } From fbf367a637c7c2094b1d335516422e5c57a04ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Fri, 21 Sep 2018 20:33:26 +0200 Subject: [PATCH 2/5] Update deploy script --- scripts/deploy-beta-aragonid.js | 46 +++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/scripts/deploy-beta-aragonid.js b/scripts/deploy-beta-aragonid.js index a8f8d6b..8a8fd70 100644 --- a/scripts/deploy-beta-aragonid.js +++ b/scripts/deploy-beta-aragonid.js @@ -1,29 +1,43 @@ const namehash = require('eth-ens-namehash').hash const keccak256 = require('js-sha3').keccak_256 -const FIFSResolvingRegistrar = artifacts.require('FIFSResolvingRegistrar') -const ENS = artifacts.require('AbstractENS') - -const owner = process.env.OWNER || '0x4cb3fd420555a09ba98845f0b816e45cfb230983' -const ens = process.env.ENS || '0xfbae32d1cde62858bc45f51efc8cc4fa1415447e' +const globalArtifacts = this.artifacts // Not injected unless called directly via truffle +const defaultOwner = process.env.OWNER || '0x4cb3fd420555a09ba98845f0b816e45cfb230983' +const defaultENSAddress = process.env.ENS || '0xfbae32d1cde62858bc45f51efc8cc4fa1415447e' const tld = namehash('eth') const label = '0x'+keccak256('aragonid') const node = namehash('aragonid.eth') -module.exports = async callback => { - const publicResolver = await ENS.at(ens).resolver(namehash('resolver.eth')) - console.log('deploying AragonID') - const aragonID = await FIFSResolvingRegistrar.new(ens, publicResolver, node) - - console.log('assigning ENS name to AragonID') - await ENS.at(ens).setSubnodeOwner(tld, label, aragonID.address) - - console.log('assigning owner name') +module.exports = async ( + truffleExecCallback, + { + artifacts = globalArtifacts, + ensAddress = defaultENSAddress, + owner = defaultOwner, + verbose = true + } = {} +) => { + const log = (...args) => { + if (verbose) { console.log(...args) } + } + + log(ensAddress, owner) + const FIFSResolvingRegistrar = artifacts.require('FIFSResolvingRegistrar') + const ENS = artifacts.require('AbstractENS') + + const publicResolver = await ENS.at(ensAddress).resolver(namehash('resolver.eth')) + log('deploying AragonID') + const aragonID = await FIFSResolvingRegistrar.new(ensAddress, publicResolver, node) + + log('assigning ENS name to AragonID') + await ENS.at(ensAddress).setSubnodeOwner(tld, label, aragonID.address) + + log('assigning owner name') await aragonID.register('0x'+keccak256('owner'), owner) - console.log('===========') - console.log('Deployed AragonID:', aragonID.address) + log('===========') + log('Deployed AragonID:', aragonID.address) } // Deployed AragonID: 0x3a06a6544e48708142508d9042f94ddda769d04f From e488484b3fac24377eed9b843d88fe328b99dcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Tue, 25 Sep 2018 16:53:43 +0200 Subject: [PATCH 3/5] Fix CI: coverage --- .solcover.js | 12 +++++++++--- .travis.yml | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.solcover.js b/.solcover.js index 3a87cb2..f6beefa 100644 --- a/.solcover.js +++ b/.solcover.js @@ -1,6 +1,6 @@ module.exports = { norpc: true, - testCommand: 'node --max-old-space-size=4096 ../node_modules/.bin/truffle test --network coverage', + copyPackages: ['@aragon/os'], skipFiles: [ 'IFIFSResolvingRegistrar.sol', 'ens/IPublicResolver.sol', @@ -9,6 +9,12 @@ module.exports = { 'zeppelin/ERC20.sol', 'zeppelin/ERC20Basic.sol', 'zeppelin/Ownable.sol', - ], - copyNodeModules: true, + 'test/ens/ENS.sol', + 'test/ens/FIFSRegistrar.sol', + 'test/ens/PublicResolver.sol', + 'test/ens/Registrar.sol', + 'test/mocks/MockAcceptingTransferRegistrar.sol', + 'test/mocks/MockApproveAndCallERC20.sol', + 'test/mocks/MockResolver.sol', + ] } diff --git a/.travis.yml b/.travis.yml index 0e15eb5..8459b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,6 @@ env: - TASK=coverage before_script: - npm prune -script: "npm run $TASK" +script: "travis_wait 60 npm run $TASK" after_success: - cat coverage/lcov.info | ./node_modules/.bin/coveralls From 5ab5410d3d9533a4f5c793dd6fd2f45a623c2154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Tue, 25 Sep 2018 17:24:59 +0200 Subject: [PATCH 4/5] Fix CI: coverage Address PR #22 comments. --- .solcover.js | 8 +------- package.json | 2 +- scripts/deploy-beta-aragonid.js | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.solcover.js b/.solcover.js index f6beefa..7baa7a6 100644 --- a/.solcover.js +++ b/.solcover.js @@ -9,12 +9,6 @@ module.exports = { 'zeppelin/ERC20.sol', 'zeppelin/ERC20Basic.sol', 'zeppelin/Ownable.sol', - 'test/ens/ENS.sol', - 'test/ens/FIFSRegistrar.sol', - 'test/ens/PublicResolver.sol', - 'test/ens/Registrar.sol', - 'test/mocks/MockAcceptingTransferRegistrar.sol', - 'test/mocks/MockApproveAndCallERC20.sol', - 'test/mocks/MockResolver.sol', + 'test/', ] } diff --git a/package.json b/package.json index 0abc56b..7e570f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aragon/id", - "version": "1.2.5", + "version": "2.0.0", "description": "", "scripts": { "compile": "truffle compile", diff --git a/scripts/deploy-beta-aragonid.js b/scripts/deploy-beta-aragonid.js index 8a8fd70..ea750a9 100644 --- a/scripts/deploy-beta-aragonid.js +++ b/scripts/deploy-beta-aragonid.js @@ -22,7 +22,7 @@ module.exports = async ( if (verbose) { console.log(...args) } } - log(ensAddress, owner) + log(`Deploying AragonID with ENS: ${ensAddress} and owner: ${owner}`) const FIFSResolvingRegistrar = artifacts.require('FIFSResolvingRegistrar') const ENS = artifacts.require('AbstractENS') From 060725b0c4814009551dcf9c8e6a743b5a8b5537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Wed, 26 Sep 2018 16:42:36 +0200 Subject: [PATCH 5/5] Add AbstractENS interface and remove @aragon/os dependency Address PR #22 comments. --- .solcover.js | 7 ++----- contracts/FIFSResolvingRegistrar.sol | 2 +- contracts/ens/AbstractENS.sol | 24 ++++++++++++++++++++++++ contracts/test/ens/ENS.sol | 2 +- contracts/test/ens/FIFSRegistrar.sol | 2 +- contracts/test/ens/PublicResolver.sol | 2 +- contracts/test/ens/Registrar.sol | 2 +- contracts/test/mocks/MockResolver.sol | 2 +- package.json | 3 --- 9 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 contracts/ens/AbstractENS.sol 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" } }