Skip to content

use EmbarkJS to initialize ens contracts and set ens contract only wh… #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 22, 2018
Merged

use EmbarkJS to initialize ens contracts and set ens contract only wh… #570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba9990
use EmbarkJS to initialize ens contracts and set ens contract only wh…
iurimatias Jun 22, 2018
5a429d0
make linter happy
iurimatias Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/modules/ens/embarkjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import namehash from 'eth-ens-namehash';

/*global web3*/
/*global web3, EmbarkJS*/
let __embarkENS = {};

// registry interface for later
Expand Down Expand Up @@ -258,7 +258,9 @@ __embarkENS.setProvider = function () {
this.ens = null;
web3.eth.net.getId().then(id => {
if (registryAddresses[id] !== undefined) {
self.ens = new web3.eth.Contract(self.registryInterface, registryAddresses[id]);
EmbarkJS.onReady(() => {
self.ens = new EmbarkJS.Contract({abi: self.registryInterface, address: registryAddresses[id]});
});
}
// todo: deploy at this point
}).catch(e => {
Expand All @@ -278,7 +280,7 @@ __embarkENS.resolve = function(name) {
let node = namehash.hash(name);

return self.ens.methods.resolver(node).call().then((resolverAddress) => {
let resolverContract = new web3.eth.Contract(self.resolverInterface, resolverAddress);
let resolverContract = new EmbarkJS.Contract({abi: self.resolverInterface, address: resolverAddress});
return resolverContract.methods.addr(node).call();
}).then((addr) => {
return addr;
Expand All @@ -295,7 +297,7 @@ __embarkENS.lookup = function(address) {
let node = namehash.hash(address.toLowerCase() + ".addr.reverse");

return self.ens.methods.resolver(node).call().then((resolverAddress) => {
let resolverContract = new web3.eth.Contract(self.resolverInterface, resolverAddress);
let resolverContract = new EmbarkJS.Contract({abi: self.resolverInterface, address: resolverAddress});
return resolverContract.methods.name(node).call();
}).then((name) => {
if (name === "" || name === undefined) throw Error("ENS name not found");
Expand Down