embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-11 14:24:24 +00:00
Code Issues Projects Releases Wiki Activity

fix(blockchain): fix metamask using the old web3

Browse Source
This commit is contained in:
Jonathan Rainville 2019-01-07 12:10:22 -05:00
parent 919d271996
commit 749c32cf07
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/modules/blockchain_connector/embarkjs.js
View File

@ -3,8 +3,14 @@
const __embarkWeb3 = {};
__embarkWeb3.init = function(_config) {
this.web3 = global.web3 || new Web3();
global.web3 = global.web3 || this.web3;
// Check if the global web3 object uses the old web3 (0.x)
if (global.web3 && typeof global.web3.version !== 'string') {
// If so, use a new instance using 1.0, but use its provider
this.web3 = new Web3(global.web3.currentProvider);
} else {
this.web3 = global.web3 || new Web3();
}
global.web3 = this.web3;
};
__embarkWeb3.getInstance = function () {