embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-02-21 09:58:30 +00:00
Code Issues Projects Releases Wiki Activity

fix ens setProvider

Browse Source
This commit is contained in:
Iuri Matias 2019-08-23 13:33:05 -04:00
parent 76277ace2b
commit a4cb8615ce
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/embark-ens/src/index.js
View File

@ -76,17 +76,15 @@ class ENS {
this.initated = false; this.initated = false;
this.events.request("namesystem:node:register", "ens", (readyCb) => { this.events.request("namesystem:node:register", "ens", (readyCb) => {
this.events.setCommandHandler("ens:resolve", this.ensResolve.bind(this)); readyCb();
this.events.setCommandHandler("ens:isENSName", (name, cb) => {
setImmediate(cb, this.isENSName(name));
});
this.embark.events.setCommandHandler("module:namesystem:reset", (cb) => {
this.reset();
this.init(cb);
});
this.init(readyCb);
}); });
this.events.setCommandHandler("ens:resolve", this.ensResolve.bind(this));
this.events.setCommandHandler("ens:isENSName", (name, cb) => {
setImmediate(cb, this.isENSName(name));
});
this.init(() => {});
} }
get web3() { get web3() {
@ -120,12 +118,12 @@ class ENS {
this.enabled = true; this.enabled = true;
this.doSetENSProvider = this.config.namesystemConfig.provider === 'ens'; this.doSetENSProvider = this.config.namesystemConfig.provider === 'ens';
this.registerEmbarkJSNaming();
this.registerEvents(); this.registerEvents();
this.registerConsoleCommands(); this.registerConsoleCommands();
this.events.request2("runcode:whitelist", 'eth-ens-namehash'); this.events.request2("runcode:whitelist", 'eth-ens-namehash');
this.events.request2("runcode:whitelist", 'embarkjs'); this.events.request2("runcode:whitelist", 'embarkjs');
this.events.request2("runcode:whitelist", 'embarkjs-ens'); this.events.request2("runcode:whitelist", 'embarkjs-ens');
await this.registerEmbarkJSNaming();
this.initated = true; this.initated = true;
cb(); cb();
} }
@ -456,7 +454,7 @@ class ENS {
} }
async connectEmbarkJSProvider(config) { async connectEmbarkJSProvider(config) {
let providerCode = `\nEmbarkJS.Names.setProviders(${JSON.stringify(config)});`; let providerCode = `\nEmbarkJS.Names.setProvider('ens', ${JSON.stringify(config)});`;
await this.events.request2('runcode:eval', providerCode); await this.events.request2('runcode:eval', providerCode);
} }

1
packages/embark-swarm/src/index.js
View File

@ -187,6 +187,7 @@ class Swarm {
} }
async connectEmbarkJSProvider() { async connectEmbarkJSProvider() {
// TODO: should initialize its own object web3 instead of relying on a global one
let providerCode = `\nEmbarkJS.Storage.setProviders(${JSON.stringify(this.embark.config.storageConfig.dappConnection || [])}, {web3});`; let providerCode = `\nEmbarkJS.Storage.setProviders(${JSON.stringify(this.embark.config.storageConfig.dappConnection || [])}, {web3});`;
await this.events.request2('runcode:eval', providerCode); await this.events.request2('runcode:eval', providerCode);
} }

2
packages/embark/src/lib/modules/blockchain/index.js
View File

@ -24,10 +24,8 @@ class Blockchain {
// const clientName = this.blockchainConfig.client; // const clientName = this.blockchainConfig.client;
const client = this.blockchainNodes[clientName]; const client = this.blockchainNodes[clientName];
if (!client) return cb("client " + clientName + " not found"); if (!client) return cb("client " + clientName + " not found");
console.log('starting', clientName, 'blockchain client');
let onStart = () => { let onStart = () => {
console.log("blockchain onStart being called");
this.events.emit("blockchain:started", clientName); this.events.emit("blockchain:started", clientName);
cb(); cb();
} }