embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #544 from embark-framework/provider-package 

use new npm package instead of fork
This commit is contained in:
Iuri Matias 2018-06-18 11:36:24 -04:00 committed by GitHub
parent f9e62b9f49 a988962aed
commit e615354fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 174 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/contracts/provider.js
View File

@ -1,6 +1,6 @@
const ProviderEngine = require('web3-provider-engine'); const ProviderEngine = require('embark-web3-provider-engine');
const RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); const RpcSubprovider = require('embark-web3-provider-engine/subproviders/rpc');
const WsSubprovider = require('web3-provider-engine/subproviders/websocket'); const WsSubprovider = require('embark-web3-provider-engine/subproviders/websocket');
const async = require('async'); const async = require('async');
const AccountParser = require('./accountParser'); const AccountParser = require('./accountParser');
const fundAccount = require('./fundAccount'); const fundAccount = require('./fundAccount');

338
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -78,7 +78,7 @@
"uuid": "^3.2.1", "uuid": "^3.2.1",
"viz.js": "^1.8.1", "viz.js": "^1.8.1",
"web3": "1.0.0-beta.34", "web3": "1.0.0-beta.34",
"web3-provider-engine": "git://github.com/jrainville/provider-engine.git#origin-fix", "embark-web3-provider-engine": "14.0.6",
"webpack": "^3.10.0", "webpack": "^3.10.0",
"window-size": "^1.1.0" "window-size": "^1.1.0"
}, },