embarklabs/EmbarkJS
2
0
Fork 0
mirror of https://github.com/embarklabs/EmbarkJS.git synced 2025-02-19 23:58:16 +00:00
Code Issues Projects Releases Wiki Activity

Update EIP 1102 according to new specs

Browse Source
This commit is contained in:
Anthony Laibe 2018-10-31 10:41:01 +01:00
parent 735251bbaf
commit 0bfcf4e310
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/blockchain.js
View File

@ -29,32 +29,18 @@ Blockchain.connect = function(connectionList, opts, doneCb) {
});
}
const connectWeb3 = (next) => {
let exited = false;
if (web3.givenProvider) {
web3.setProvider(web3.givenProvider);
return checkConnect(next);
}
window.addEventListener('message', ({ data } = msg) => {
if (data && data.type === 'ETHEREUM_PROVIDER_SUCCESS') {
if(exited) {
return console.warn("%cNote: The application might be in a corrupted state, please reload the page", "font-size: 2em");
}
exited = true;
const connectWeb3 = async (next) => {
if (ethereum) {
try {
await ethereum.enable();
web3.setProvider(ethereum);
checkConnect(next);
return checkConnect(next);
} catch (error) {
return next(null, false);
}
});
window.postMessage({ type: 'ETHEREUM_PROVIDER_REQUEST' }, '*');
}
setTimeout(() => {
if (exited) {
return;
}
exited = true;
next(null, false);
}, 20000);
return next(null, false);
}
const connectWebsocket = (value, next) => {