wip fixes

This commit is contained in:
Jonathan Rainville 2018-06-29 17:09:19 -04:00 committed by Pascal Precht
parent bb9c1e2314
commit da82c2eba2
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
3 changed files with 34 additions and 3 deletions

View File

@ -1,6 +1,12 @@
const ProviderEngine = require('embark-web3-provider-engine'); const ProviderEngine = require('embark-web3-provider-engine');
const RpcSubprovider = require('embark-web3-provider-engine/subproviders/rpc'); const RpcSubprovider = require('embark-web3-provider-engine/subproviders/rpc');
const WsSubprovider = require('embark-web3-provider-engine/subproviders/websocket'); const WsSubprovider = require('embark-web3-provider-engine/subproviders/websocket');
const CacheSubprovider = require('embark-web3-provider-engine/subproviders/cache.js');
const FixtureSubprovider = require('embark-web3-provider-engine/subproviders/fixture.js');
const FilterSubprovider = require('embark-web3-provider-engine/subproviders/filters.js');
const VmSubprovider = require('embark-web3-provider-engine/subproviders/vm.js');
const NonceSubprovider = require('embark-web3-provider-engine/subproviders/nonce-tracker.js');
const SubscriptionSubprovider = require('embark-web3-provider-engine/subproviders/subscriptions');
const async = require('async'); const async = require('async');
const AccountParser = require('./accountParser'); const AccountParser = require('./accountParser');
const fundAccount = require('./fundAccount'); const fundAccount = require('./fundAccount');
@ -23,12 +29,20 @@ class Provider {
startWeb3Provider(callback) { startWeb3Provider(callback) {
const self = this; const self = this;
// cache layer
// self.addProvider(new CacheSubprovider())
// self.addProvider(new NonceSubprovider())
if (this.type === 'rpc') { if (this.type === 'rpc') {
self.engine.addProvider(new RpcSubprovider({ self.engine.addProvider(new RpcSubprovider({
rpcUrl: self.web3Endpoint rpcUrl: self.web3Endpoint
})); }));
} else if (this.type === 'ws') { } else if (this.type === 'ws') {
self.engine.addProvider(new WsSubprovider({ //self.engine.addProvider(new WsSubprovider({
console.log('USing ws');
self.addProvider(new SubscriptionSubprovider());
self.addProvider(new WsSubprovider({
rpcUrl: self.web3Endpoint, rpcUrl: self.web3Endpoint,
origin: this.blockchainConfig.wsOrigins.split(',')[0] origin: this.blockchainConfig.wsOrigins.split(',')[0]
})); }));
@ -37,6 +51,7 @@ class Provider {
} }
// network connectivity error // network connectivity error
self.engine.on('error', (err) => { self.engine.on('error', (err) => {
// report connectivity errors // report connectivity errors
@ -44,7 +59,18 @@ class Provider {
}); });
self.engine.start(); self.engine.start();
self.web3.setProvider(self); //self.on('error', (err) => {
// console.log('ERR', JSON.stringify(err));
// // report connectivity errors as trace due to polling
// self.logger.trace('web3 provider error: ', err);
// self.logger.trace('stopping web3 provider due to error');
// // prevent continuous polling errors
// self.stop();
//});
//self.web3.setProvider(self);
//self.start();
self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, self.logger); self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, self.logger);
self.addresses = []; self.addresses = [];

View File

@ -1,4 +1,4 @@
{
"default": { "default": {
"enabled": true, "enabled": true,
"rpcHost": "localhost", "rpcHost": "localhost",

View File

@ -4,6 +4,11 @@ let accounts;
const Utils = require('embarkjs').Utils; const Utils = require('embarkjs').Utils;
config({ config({
deployment: {
type: 'ws',
host: 'localhost',
port: '8546'
},
contracts: { contracts: {
"SimpleStorage": { "SimpleStorage": {
args: [100], args: [100],