status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-09 05:47:07 +00:00
Code Issues Projects Releases Wiki Activity

linting fixes and import fixes and some cleanup of the logic

Browse Source 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
This commit is contained in:
VoR0220 2018-05-23 12:13:06 -05:00
parent ea17e235f3
commit bf40bdb93b
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/modules/ens/embarkjs.js
View File

@ -1,5 +1,4 @@
const namehash = require('eth-ens-namehash'); const namehash = require('eth-ens-namehash');
const Web3 = require('web3');
/*global web3*/ /*global web3*/
let __embarkENS = {}; let __embarkENS = {};
@ -253,15 +252,6 @@ var registryAddresses = {
__embarkENS.setProvider = function (options) { __embarkENS.setProvider = function (options) {
const self = this; const self = this;
let provider;
if (options === undefined) {
provider = "localhost:8546";
} else {
provider = options.server + ':' + options.port;
}
// TODO: take into account type
let web3 = new Web3(new Web3.providers.WebsocketProvider("ws://" + provider));
self.web3 = web3;
// get network id and then assign ENS contract based on that // get network id and then assign ENS contract based on that
self.ens = web3.eth.net.getId().then(id => { self.ens = web3.eth.net.getId().then(id => {
if (registryAddresses[id] !== undefined) { if (registryAddresses[id] !== undefined) {
@ -274,14 +264,16 @@ __embarkENS.setProvider = function (options) {
__embarkENS.resolve = function(name) { __embarkENS.resolve = function(name) {
const self = this; const self = this;
const web3 = this.web3;
if (this.ens === undefined) if (self.ens === undefined)
return undefined; return undefined;
let node = namehash(name)
this.ens.methods.resolver(node).call().then((resolverAddress) => { let node = namehash(name);
self.ens.methods.resolver(node).call().then((resolverAddress) => {
let resolverContract = new web3.eth.Contract(resolverInterface, resolverAddress); let resolverContract = new web3.eth.Contract(resolverInterface, resolverAddress);
return resolverContract.methods.addr(node).call() return resolverContract.methods.addr(node).call();
}).then((addr) => { }).then((addr) => {
return addr return addr;
}).catch(err => err); }).catch(err => err);
}; };

3
lib/modules/ens/index.js
View File

@ -6,6 +6,7 @@ class ENS {
this.logger = embark.logger; this.logger = embark.logger;
this.events = embark.events; this.events = embark.events;
this.web3 = options.web3; this.web3 = options.web3;
this.namesConfig = options.namesConfig;
this.embark = embark; this.embark = embark;
this.addENSToEmbarkJS(); this.addENSToEmbarkJS();
@ -23,7 +24,7 @@ class ENS {
return; return;
} }
self.events.request("version:get:eth-ens-namehash", function(namehashVersion) { self.events.request("version:get:eth-ens-namehash", function(EnsNamehashVersion) {
let currentEnsNamehashVersion = require('../../../package.json').dependencies["eth-ens-namehash"]; let currentEnsNamehashVersion = require('../../../package.json').dependencies["eth-ens-namehash"];
if (EnsNamehashVersion !== currentEnsNamehashVersion) { if (EnsNamehashVersion !== currentEnsNamehashVersion) {
self.events.request("version:getPackageLocation", "eth-ens-namehash", EnsNamehashVersion, function(err, location) { self.events.request("version:getPackageLocation", "eth-ens-namehash", EnsNamehashVersion, function(err, location) {