From 9984ca66ba25537ebe0edc21949d08b09cd0b3bc Mon Sep 17 00:00:00 2001 From: Michael Bumann 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-lock.json | 5 ++++- package.json | 1 - scripts/deploy-kit.js | 2 +- 4 files changed, 6 insertions(+), 4 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-lock.json b/package-lock.json index 0ad2561..a7a6d24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2888,6 +2888,7 @@ "version": "2.0.8", "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz", "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=", + "dev": true, "requires": { "idna-uts46-hx": "^2.3.1", "js-sha3": "^0.5.7" @@ -10174,6 +10175,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz", "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==", + "dev": true, "requires": { "punycode": "2.1.0" } @@ -13078,7 +13080,8 @@ "punycode": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=", + "dev": true }, "qs": { "version": "6.7.0", 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..6a1f0e0 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')