From ef69fedb8ba8fa05d164424b68577df2aa9d0ad5 Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Wed, 3 Apr 2019 10:16:44 +0200
Subject: [PATCH] Use namehash from ethers.utils

no need for the additional dependency
---
 lib/contracts/kernel.js | 2 +-
 package.json            | 1 -
 scripts/deploy-kit.js   | 8 +++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/contracts/kernel.js b/lib/contracts/kernel.js
index 84ac26f..a5cb473 100644
--- a/lib/contracts/kernel.js
+++ b/lib/contracts/kernel.js
@@ -1,4 +1,4 @@
-const namehash = require('eth-ens-namehash').hash;
+const namehash = require('ethers').utils.namehash;
 const Base = require('./base');
 
 const KERNEL_APP_ADDR_NAMESPACE = '0xd6f028ca0e8edb4a8c9757ca4fdccab25fa1e0317da1188108f7d2dee14902fb';
diff --git a/package.json b/package.json
index d453548..46411cc 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "solc": "^0.4.25"
   },
   "dependencies": {
-    "eth-ens-namehash": "^2.0.8",
     "ethers": "^4.0.27",
     "ipfs-api": "^19.0.0",
     "rsvp": "^4.8.2"
diff --git a/scripts/deploy-kit.js b/scripts/deploy-kit.js
index fb8d0ce..03588c3 100644
--- a/scripts/deploy-kit.js
+++ b/scripts/deploy-kit.js
@@ -3,7 +3,7 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const namehash = require('eth-ens-namehash').hash
+const namehash = require('ethers').utils.namehash;
 
 const fileInject = require('./helpers/file_inject.js')
 const getNetworkId = require('./helpers/networkid.js')
@@ -28,11 +28,17 @@ module.exports = async function(callback) {
   console.log(`Using ENS at: ${ensAddr}`);
 
   let daoFactory
+  try {
   if (daoFactoryAddress) {
     daoFactory = DAOFactory.at(daoFactoryAddress)
   } else {
     daoFactory = (await deployDAOFactory(null, { artifacts, verbose: false })).daoFactory
   }
+  } catch(e) {
+    console.log(e);
+    callback(e);
+    return;
+  }
   console.log(`Using DAOFactory at: ${daoFactory.address}`)
 
   const apps = fs.readdirSync('./apps')