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

Merge pull request #27 from embark-framework/feat/eip1102 

feat: allow end user to enable ethereum manually
This commit is contained in:
Iuri Matias 2018-12-07 09:30:27 -05:00 committed by GitHub
parent aacb23f3e9 031863ff88
commit 24609ccbb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/blockchain.js
View File

@ -1,6 +1,7 @@
import {reduce} from './async'
let Blockchain = {};
let contracts = [];
function isNewWeb3_1() {
return (typeof(web3.version) === "string");
@ -32,7 +33,9 @@ Blockchain.connect = function(connectionList, opts, doneCb) {
const connectWeb3 = async (next) => {
if (window.ethereum) {
try {
await ethereum.enable();
if (Blockchain.autoEnable) {
await ethereum.enable();
}
web3.setProvider(ethereum);
return checkConnect(next);
} catch (error) {
@ -88,6 +91,19 @@ Blockchain.connect = function(connectionList, opts, doneCb) {
})
};
Blockchain.enableEthereum = function() {
if (window.ethereum) {
return ethereum.enable().then((accounts) => {
web3.setProvider(ethereum);
web3.eth.defaultAccount = accounts[0];
contracts.forEach(contract => {
contract.options.from = web3.eth.defaultAccount;
})
return accounts;
});
}
};
Blockchain.execWhenReady = function(cb) {
if (this.done) {
return cb(this.err);
@ -125,8 +141,12 @@ let Contract = function (options) {
if (Contract.isNewWeb3(this.web3)) {
ContractClass = new this.web3.eth.Contract(this.abi, this.address);
contracts.push(ContractClass);
ContractClass.options.data = this.code;
ContractClass.options.from = this.from || this.web3.eth.defaultAccount;
const from = this.from || this.web3.eth.defaultAccount
if (from) {
ContractClass.options.from = from
}
ContractClass.abi = ContractClass.options.abi;
ContractClass.address = this.address;
ContractClass.gas = this.gas;
@ -137,7 +157,9 @@ let Contract = function (options) {
if(!ContractClass.currentProvider){
ContractClass.setProvider(web3.currentProvider);
}
ContractClass.options.from = web3.eth.defaultAccount;
if (web3.eth.defaultAccount) {
ContractClass.options.from = web3.eth.defaultAccount;
}
});
ContractClass._jsonInterface.forEach((abi) => {

3
src/index.js
View File

@ -7,6 +7,9 @@ import Utils from './utils';
var EmbarkJS = {
onReady: function (cb) {
Blockchain.execWhenReady(cb);
},
enableEthereum: function () {
return Blockchain.enableEthereum();
}
};