diff --git a/README.md b/README.md index f301fdda..558ab6f9 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ import { ENS, ENSRegistry, FIFSRegistrar, - HashRegistrar, Migrations, Registrar, ReverseRegistrar, @@ -38,14 +37,6 @@ Implementation of the ENS Registry, the central contract used to look up resolve Implementation of a simple first-in-first-served registrar, which issues (sub-)domains to the first account to request them. -## HashRegistrar.sol - -Implementation of a registrar based on second-price blind auctions and funds held on deposit, with a renewal process that weights renewal costs according to the change in mean price of registering a domain. Largely untested! - -## HashRegistrarSimplified.sol - -Simplified version of the above, with no support for renewals. This is the current proposal for interim registrar of the ENS system until a permanent registrar is decided on. - # ENS Registry interface The ENS registry is a single central contract that provides a mapping from domain names to owners and resolvers, as described in [EIP 137](https://github.com/ethereum/EIPs/issues/137). @@ -109,8 +100,4 @@ Deploy `ENS` and `FIFSRegistrar` to the private network, the deployment process $ truffle migrate --network dev.fifs -alternatively, deploy the `HashRegistrar`: - - $ truffle migrate --network dev.auction - Check the truffle [documentation](http://truffleframework.com/docs/) for more information. diff --git a/index.js b/index.js index 8eb25074..5cca7d53 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,6 @@ const DeedImplementation = require('./build/contracts/DeedImplementation.json') const ENS = require('./build/contracts/ENS.json') const ENSRegistry = require('./build/contracts/ENSRegistry.json') const FIFSRegistrar = require('./build/contracts/FIFSRegistrar.json') -const HashRegistrar = require('./build/contracts/HashRegistrar.json') const Migrations = require('./build/contracts/Migrations.json') const Registrar = require('./build/contracts/Registrar.json') const Resolver = require('./build/contracts/NameResolver.json') @@ -16,7 +15,6 @@ module.exports = { ENS, ENSRegistry, FIFSRegistrar, - HashRegistrar, Migrations, Registrar, Resolver, diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js index 12a73559..c250d466 100644 --- a/migrations/2_deploy_contracts.js +++ b/migrations/2_deploy_contracts.js @@ -5,7 +5,6 @@ const FIFSRegistrar = artifacts.require('./FIFSRegistrar.sol'); // the compiled contract JSON file name. So even though `Registrar.sol` is // not existed, it's valid to put it here. // TODO: align the contract name with the source code file name. -const Registrar = artifacts.require('./HashRegistrar.sol'); const web3 = new (require('web3'))(); const namehash = require('eth-ens-namehash'); @@ -42,28 +41,6 @@ function deployFIFSRegistrar(deployer, tld) { }); } -/** - * Deploy the ENS and HashRegistrar(Simplified) - * - * @param {Object} deployer truffle deployer helper - * @param {string} tld tld which the Hash registrar takes charge of - */ -function deployAuctionRegistrar(deployer, tld) { - var rootNode = getRootNodeFromTLD(tld); - - // Deploy the ENS first - deployer.deploy(ENS) - .then(() => { - // Deploy the HashRegistrar and bind it with ENS - // The last argument `0` specifies the auction start date to `now` - return deployer.deploy(Registrar, ENS.address, rootNode.namehash, 0); - }) - .then(function() { - // Transfer the owner of the `rootNode` to the HashRegistrar - return ENS.at(ENS.address).then((c) => c.setSubnodeOwner('0x0', rootNode.sha3, Registrar.address)); - }); -} - module.exports = function(deployer, network) { var tld = 'eth';