lint embarkjs

This commit is contained in:
Jonathan Rainville 2018-06-15 10:04:36 -04:00
parent 6991215b40
commit cb8e0e9d3e

View File

@ -1,5 +1,5 @@
var EmbarkJS = { var EmbarkJS = {
onReady: function(cb) { onReady: function (cb) {
if (typeof (__embarkContext) === 'undefined') { if (typeof (__embarkContext) === 'undefined') {
return cb(); return cb();
} }
@ -7,7 +7,7 @@ var EmbarkJS = {
} }
}; };
EmbarkJS.isNewWeb3 = function(web3Obj) { EmbarkJS.isNewWeb3 = function (web3Obj) {
var _web3 = web3Obj || (new Web3()); var _web3 = web3Obj || (new Web3());
if (typeof(_web3.version) === "string") { if (typeof(_web3.version) === "string") {
return true; return true;
@ -15,220 +15,221 @@ EmbarkJS.isNewWeb3 = function(web3Obj) {
return parseInt(_web3.version.api.split('.')[0], 10) >= 1; return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
}; };
EmbarkJS.Contract = function(options) { EmbarkJS.Contract = function (options) {
var self = this; var self = this;
var i, abiElement; var i, abiElement;
var ContractClass; var ContractClass;
this.abi = options.abi; this.abi = options.abi;
this.address = options.address; this.address = options.address;
this.gas = options.gas; this.gas = options.gas;
this.code = '0x' + options.code; this.code = '0x' + options.code;
//this.web3 = options.web3 || web3; //this.web3 = options.web3 || web3;
this.web3 = options.web3; this.web3 = options.web3;
if (!this.web3 && typeof (web3) !== 'undefined') { if (!this.web3 && typeof (web3) !== 'undefined') {
this.web3 = web3; this.web3 = web3;
} else if (!this.web3) { } else if (!this.web3) {
this.web3 = window.web3; this.web3 = window.web3;
} }
if (EmbarkJS.isNewWeb3(this.web3)) { if (EmbarkJS.isNewWeb3(this.web3)) {
ContractClass = new this.web3.eth.Contract(this.abi, this.address); ContractClass = new this.web3.eth.Contract(this.abi, this.address);
ContractClass.setProvider(this.web3.currentProvider); ContractClass.setProvider(this.web3.currentProvider);
ContractClass.options.data = this.code; ContractClass.options.data = this.code;
ContractClass.options.from = this.from; ContractClass.options.from = this.from;
ContractClass.abi = ContractClass.options.abi; ContractClass.abi = ContractClass.options.abi;
ContractClass.address = this.address; ContractClass.address = this.address;
ContractClass.gas = this.gas; ContractClass.gas = this.gas;
let originalMethods = Object.keys(ContractClass); let originalMethods = Object.keys(ContractClass);
ContractClass._jsonInterface.forEach((abi) => { ContractClass._jsonInterface.forEach((abi) => {
if (originalMethods.indexOf(abi.name) >= 0) { if (originalMethods.indexOf(abi.name) >= 0) {
console.log(abi.name + " is a reserved word and cannot be used as a contract method, property or event"); console.log(abi.name + " is a reserved word and cannot be used as a contract method, property or event");
return; return;
}
if (!abi.inputs) {
return;
}
let numExpectedInputs = abi.inputs.length;
if (abi.type === 'function' && abi.constant) {
ContractClass[abi.name] = function() {
let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
if (typeof (arguments[numExpectedInputs]) === 'function') {
cb = arguments[numExpectedInputs];
} else if (typeof (arguments[numExpectedInputs]) === 'object') {
options = arguments[numExpectedInputs];
cb = arguments[numExpectedInputs + 1];
}
let ref = ContractClass.methods[abi.name];
let call = ref.apply(ref, ...arguments).call;
return call.apply(call, []);
};
} else if (abi.type === 'function') {
ContractClass[abi.name] = function() {
let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
if (typeof (arguments[numExpectedInputs]) === 'function') {
cb = arguments[numExpectedInputs];
} else if (typeof (arguments[numExpectedInputs]) === 'object') {
options = arguments[numExpectedInputs];
cb = arguments[numExpectedInputs + 1];
}
let ref = ContractClass.methods[abi.name];
let send = ref.apply(ref, args).send;
return send.apply(send, [options, cb]);
};
} else if (abi.type === 'event') {
ContractClass[abi.name] = function(options, cb) {
let ref = ContractClass.events[abi.name];
return ref.apply(ref, [options, cb]);
}
}
});
return ContractClass;
} else {
ContractClass = this.web3.eth.contract(this.abi);
this.eventList = [];
if (this.abi) {
for (i = 0; i < this.abi.length; i++) {
abiElement = this.abi[i];
if (abiElement.type === 'event') {
this.eventList.push(abiElement.name);
}
}
} }
var messageEvents = function() { if (!abi.inputs) {
this.cb = function() {}; return;
}
let numExpectedInputs = abi.inputs.length;
if (abi.type === 'function' && abi.constant) {
ContractClass[abi.name] = function () {
let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
if (typeof (arguments[numExpectedInputs]) === 'function') {
cb = arguments[numExpectedInputs];
} else if (typeof (arguments[numExpectedInputs]) === 'object') {
options = arguments[numExpectedInputs];
cb = arguments[numExpectedInputs + 1];
}
let ref = ContractClass.methods[abi.name];
let call = ref.apply(ref, ...arguments).call;
return call.apply(call, []);
};
} else if (abi.type === 'function') {
ContractClass[abi.name] = function () {
let options = {}, cb = null, args = Array.from(arguments || []).slice(0, numExpectedInputs);
if (typeof (arguments[numExpectedInputs]) === 'function') {
cb = arguments[numExpectedInputs];
} else if (typeof (arguments[numExpectedInputs]) === 'object') {
options = arguments[numExpectedInputs];
cb = arguments[numExpectedInputs + 1];
}
let ref = ContractClass.methods[abi.name];
let send = ref.apply(ref, args).send;
return send.apply(send, [options, cb]);
};
} else if (abi.type === 'event') {
ContractClass[abi.name] = function (options, cb) {
let ref = ContractClass.events[abi.name];
return ref.apply(ref, [options, cb]);
};
}
});
return ContractClass;
} else {
ContractClass = this.web3.eth.contract(this.abi);
this.eventList = [];
if (this.abi) {
for (i = 0; i < this.abi.length; i++) {
abiElement = this.abi[i];
if (abiElement.type === 'event') {
this.eventList.push(abiElement.name);
}
}
}
var messageEvents = function () {
this.cb = function () {
}; };
};
messageEvents.prototype.then = function(cb) { messageEvents.prototype.then = function (cb) {
this.cb = cb; this.cb = cb;
}; };
messageEvents.prototype.error = function(err) { messageEvents.prototype.error = function (err) {
return err; return err;
}; };
this._originalContractObject = ContractClass.at(this.address); this._originalContractObject = ContractClass.at(this.address);
this._methods = Object.getOwnPropertyNames(this._originalContractObject).filter(function(p) { this._methods = Object.getOwnPropertyNames(this._originalContractObject).filter(function (p) {
// TODO: check for forbidden properties // TODO: check for forbidden properties
if (self.eventList.indexOf(p) >= 0) { if (self.eventList.indexOf(p) >= 0) {
self[p] = function() { self[p] = function () {
var promise = new messageEvents(); var promise = new messageEvents();
var args = Array.prototype.slice.call(arguments); var args = Array.prototype.slice.call(arguments);
args.push(function(err, result) { args.push(function (err, result) {
if (err) {
promise.error(err);
} else {
promise.cb(result);
}
});
self._originalContractObject[p].apply(self._originalContractObject[p], args);
return promise;
};
return true;
} else if (typeof self._originalContractObject[p] === 'function') {
self[p] = function (_args) {
var args = Array.prototype.slice.call(arguments);
var fn = self._originalContractObject[p];
var props = self.abi.find((x) => x.name == p);
var promise = new Promise(function (resolve, reject) {
args.push(function (err, transaction) {
promise.tx = transaction;
if (err) { if (err) {
promise.error(err); return reject(err);
}
var getConfirmation = function () {
self.web3.eth.getTransactionReceipt(transaction, function (err, receipt) {
if (err) {
return reject(err);
}
if (receipt !== null) {
return resolve(receipt);
}
setTimeout(getConfirmation, 1000);
});
};
if (typeof transaction !== "string" || props.constant) {
resolve(transaction);
} else { } else {
promise.cb(result); getConfirmation();
} }
}); });
self._originalContractObject[p].apply(self._originalContractObject[p], args); fn.apply(fn, args);
return promise; });
};
return true;
} else if (typeof self._originalContractObject[p] === 'function') {
self[p] = function(_args) {
var args = Array.prototype.slice.call(arguments);
var fn = self._originalContractObject[p];
var props = self.abi.find((x) => x.name == p);
var promise = new Promise(function(resolve, reject) { return promise;
args.push(function(err, transaction) { };
promise.tx = transaction; return true;
if (err) { }
return reject(err); return false;
} });
}
var getConfirmation = function() {
self.web3.eth.getTransactionReceipt(transaction, function(err, receipt) {
if (err) {
return reject(err);
}
if (receipt !== null) {
return resolve(receipt);
}
setTimeout(getConfirmation, 1000);
});
};
if (typeof(transaction) !== "string" || props.constant) {
resolve(transaction);
} else {
getConfirmation();
}
});
fn.apply(fn, args);
});
return promise;
};
return true;
}
return false;
});
}
}; };
EmbarkJS.Contract.prototype.deploy = function(args, _options) { EmbarkJS.Contract.prototype.deploy = function (args, _options) {
var self = this; var self = this;
var contractParams; var contractParams;
var options = _options || {}; var options = _options || {};
contractParams = args || []; contractParams = args || [];
contractParams.push({ contractParams.push({
from: this.web3.eth.accounts[0], from: this.web3.eth.accounts[0],
data: this.code, data: this.code,
gas: options.gas || 800000 gas: options.gas || 800000
});
var contractObject = this.web3.eth.contract(this.abi);
var promise = new Promise(function (resolve, reject) {
contractParams.push(function (err, transaction) {
if (err) {
reject(err);
} else if (transaction.address !== undefined) {
resolve(new EmbarkJS.Contract({
abi: self.abi,
code: self.code,
address: transaction.address
}));
}
}); });
var contractObject = this.web3.eth.contract(this.abi); // returns promise
// deploys contract
var promise = new Promise(function(resolve, reject) { // wraps it around EmbarkJS.Contract
contractParams.push(function(err, transaction) { contractObject["new"].apply(contractObject, contractParams);
if (err) { });
reject(err);
} else if (transaction.address !== undefined) {
resolve(new EmbarkJS.Contract({
abi: self.abi,
code: self.code,
address: transaction.address
}));
}
});
// returns promise
// deploys contract
// wraps it around EmbarkJS.Contract
contractObject["new"].apply(contractObject, contractParams);
});
return promise; return promise;
}; };
EmbarkJS.Contract.prototype.new = EmbarkJS.Contract.prototype.deploy; EmbarkJS.Contract.prototype.new = EmbarkJS.Contract.prototype.deploy;
EmbarkJS.Contract.prototype.at = function(address) { EmbarkJS.Contract.prototype.at = function (address) {
return new EmbarkJS.Contract({ abi: this.abi, code: this.code, address: address }); return new EmbarkJS.Contract({abi: this.abi, code: this.code, address: address});
}; };
EmbarkJS.Contract.prototype.send = function(value, unit, _options) { EmbarkJS.Contract.prototype.send = function (value, unit, _options) {
var options, wei; var options, wei;
if (typeof unit === 'object') { if (typeof unit === 'object') {
options = unit; options = unit;
@ -248,39 +249,39 @@ EmbarkJS.Storage = {};
EmbarkJS.Storage.Providers = {}; EmbarkJS.Storage.Providers = {};
EmbarkJS.Storage.saveText = function(text) { EmbarkJS.Storage.saveText = function (text) {
if (!this.currentStorage) { if (!this.currentStorage) {
throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")'); throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
} }
return this.currentStorage.saveText(text); return this.currentStorage.saveText(text);
}; };
EmbarkJS.Storage.get = function(hash) { EmbarkJS.Storage.get = function (hash) {
if (!this.currentStorage) { if (!this.currentStorage) {
throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")'); throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
} }
return this.currentStorage.get(hash); return this.currentStorage.get(hash);
}; };
EmbarkJS.Storage.uploadFile = function(inputSelector) { EmbarkJS.Storage.uploadFile = function (inputSelector) {
if (!this.currentStorage) { if (!this.currentStorage) {
throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")'); throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
} }
return this.currentStorage.uploadFile(inputSelector); return this.currentStorage.uploadFile(inputSelector);
}; };
EmbarkJS.Storage.getUrl = function(hash) { EmbarkJS.Storage.getUrl = function (hash) {
if (!this.currentStorage) { if (!this.currentStorage) {
throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")'); throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
} }
return this.currentStorage.getUrl(hash); return this.currentStorage.getUrl(hash);
}; };
EmbarkJS.Storage.registerProvider = function(providerName, obj) { EmbarkJS.Storage.registerProvider = function (providerName, obj) {
EmbarkJS.Storage.Providers[providerName] = obj; EmbarkJS.Storage.Providers[providerName] = obj;
}; };
EmbarkJS.Storage.setProvider = function(provider, options) { EmbarkJS.Storage.setProvider = function (provider, options) {
let providerObj = this.Providers[provider]; let providerObj = this.Providers[provider];
if (!providerObj) { if (!providerObj) {
@ -292,7 +293,7 @@ EmbarkJS.Storage.setProvider = function(provider, options) {
return providerObj.setProvider(options); return providerObj.setProvider(options);
}; };
EmbarkJS.Storage.isAvailable = function(){ EmbarkJS.Storage.isAvailable = function () {
if (!this.currentStorage) { if (!this.currentStorage) {
throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")'); throw new Error('Storage provider not set; e.g EmbarkJS.Storage.setProvider("ipfs")');
} }
@ -303,11 +304,11 @@ EmbarkJS.Messages = {};
EmbarkJS.Messages.Providers = {}; EmbarkJS.Messages.Providers = {};
EmbarkJS.Messages.registerProvider = function(providerName, obj) { EmbarkJS.Messages.registerProvider = function (providerName, obj) {
EmbarkJS.Messages.Providers[providerName] = obj; EmbarkJS.Messages.Providers[providerName] = obj;
}; };
EmbarkJS.Messages.setProvider = function(provider, options) { EmbarkJS.Messages.setProvider = function (provider, options) {
let providerObj = this.Providers[provider]; let providerObj = this.Providers[provider];
if (!providerObj) { if (!providerObj) {
@ -319,18 +320,18 @@ EmbarkJS.Messages.setProvider = function(provider, options) {
return providerObj.setProvider(options); return providerObj.setProvider(options);
}; };
EmbarkJS.Messages.isAvailable = function(){ EmbarkJS.Messages.isAvailable = function () {
return this.currentMessages.isAvailable(); return this.currentMessages.isAvailable();
}; };
EmbarkJS.Messages.sendMessage = function(options) { EmbarkJS.Messages.sendMessage = function (options) {
if (!this.currentMessages) { if (!this.currentMessages) {
throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")'); throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")');
} }
return this.currentMessages.sendMessage(options); return this.currentMessages.sendMessage(options);
}; };
EmbarkJS.Messages.listenTo = function(options, callback) { EmbarkJS.Messages.listenTo = function (options, callback) {
if (!this.currentMessages) { if (!this.currentMessages) {
throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")'); throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")');
} }
@ -341,11 +342,11 @@ EmbarkJS.Names = {};
EmbarkJS.Names.Providers = {}; EmbarkJS.Names.Providers = {};
EmbarkJS.Names.registerProvider = function(providerName, obj) { EmbarkJS.Names.registerProvider = function (providerName, obj) {
EmbarkJS.Names.Providers[providerName] = obj; EmbarkJS.Names.Providers[providerName] = obj;
} };
EmbarkJS.Names.setProvider = function(provider, options) { EmbarkJS.Names.setProvider = function (provider, options) {
let providerObj = this.Providers[provider]; let providerObj = this.Providers[provider];
if (!providerObj) { if (!providerObj) {
@ -358,20 +359,20 @@ EmbarkJS.Names.setProvider = function(provider, options) {
}; };
// resolve resolves a name into an identifier of some kind // resolve resolves a name into an identifier of some kind
EmbarkJS.Names.resolve = function(name) { EmbarkJS.Names.resolve = function (name) {
if (!this.currentNameSystems) { if (!this.currentNameSystems) {
throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")'); throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")');
} }
return this.currentNameSystems.resolve(name); return this.currentNameSystems.resolve(name);
} };
// the reverse of resolve, resolves using an identifier to get to a name // the reverse of resolve, resolves using an identifier to get to a name
EmbarkJS.Names.lookup = function(identifier) { EmbarkJS.Names.lookup = function (identifier) {
if (!this.currentNameSystems) { if (!this.currentNameSystems) {
throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")'); throw new Error('Name system provider not set; e.g EmbarkJS.Names.setProvider("ens")');
} }
return this.currentNameSystems.lookup(identifier); return this.currentNameSystems.lookup(identifier);
} };
// To Implement // To Implement
@ -383,11 +384,11 @@ EmbarkJS.Names.register = function(name, options) {
*/ */
EmbarkJS.Utils = { EmbarkJS.Utils = {
fromAscii: function(str) { fromAscii: function (str) {
var _web3 = new Web3(); var _web3 = new Web3();
return _web3.utils ? _web3.utils.fromAscii(str) : _web3.fromAscii(str); return _web3.utils ? _web3.utils.fromAscii(str) : _web3.fromAscii(str);
}, },
toAscii: function(str) { toAscii: function (str) {
var _web3 = new Web3(); var _web3 = new Web3();
return _web3.utils.toAscii(str); return _web3.utils.toAscii(str);
} }