Skip to content

G
Geth-Modification
Commit 4baa5ca9 authored by Jeffrey Wilcke's avatar Jeffrey Wilcke
Browse files
Options

Merge pull request #1137 from obscuren/web3_update 

cmd/geth: updated web3
parents 9f467c38 598e454d
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 1546 deletions
jsre/ethereum_js.go
View file @ 4baa5ca9
package jsre package jsre
const Ethereum_JS = `require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){ const Ethereum_JS = `
require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -17,7 +18,7 @@ const Ethereum_JS = `require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[ ...@@ -17,7 +18,7 @@ const Ethereum_JS = `require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file coder.js * @file coder.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -72,7 +73,7 @@ SolidityType.prototype.isType = function (name) { ...@@ -72,7 +73,7 @@ SolidityType.prototype.isType = function (name) {
* @method formatInput * @method formatInput
* @param {Object} param - plain object, or an array of objects * @param {Object} param - plain object, or an array of objects
* @param {Bool} arrayType - true if a param should be encoded as an array * @param {Bool} arrayType - true if a param should be encoded as an array
* @return {SolidityParam} encoded param wrapped in SolidityParam object * @return {SolidityParam} encoded param wrapped in SolidityParam object
*/ */
SolidityType.prototype.formatInput = function (param, arrayType) { SolidityType.prototype.formatInput = function (param, arrayType) {
if (utils.isArray(param) && arrayType) { // TODO: should fail if this two are not the same if (utils.isArray(param) && arrayType) { // TODO: should fail if this two are not the same
...@@ -82,7 +83,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) { ...@@ -82,7 +83,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) {
}).reduce(function (acc, current) { }).reduce(function (acc, current) {
return acc.combine(current); return acc.combine(current);
}, f.formatInputInt(param.length)).withOffset(32); }, f.formatInputInt(param.length)).withOffset(32);
} }
return this._inputFormatter(param); return this._inputFormatter(param);
}; };
...@@ -96,7 +97,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) { ...@@ -96,7 +97,7 @@ SolidityType.prototype.formatInput = function (param, arrayType) {
*/ */
SolidityType.prototype.formatOutput = function (param, arrayType) { SolidityType.prototype.formatOutput = function (param, arrayType) {
if (arrayType) { if (arrayType) {
// let's assume, that we solidity will never return long arrays :P // let's assume, that we solidity will never return long arrays :P
var result = []; var result = [];
var length = new BigNumber(param.dynamicPart().slice(0, 64), 16); var length = new BigNumber(param.dynamicPart().slice(0, 64), 16);
for (var i = 0; i < length * 64; i += 64) { for (var i = 0; i < length * 64; i += 64) {
...@@ -137,7 +138,7 @@ var SolidityCoder = function (types) { ...@@ -137,7 +138,7 @@ var SolidityCoder = function (types) {
* *
* @method _requireType * @method _requireType
* @param {String} type * @param {String} type
* @returns {SolidityType} * @returns {SolidityType}
* @throws {Error} throws if no matching type is found * @throws {Error} throws if no matching type is found
*/ */
SolidityCoder.prototype._requireType = function (type) { SolidityCoder.prototype._requireType = function (type) {
...@@ -284,7 +285,7 @@ var coder = new SolidityCoder([ ...@@ -284,7 +285,7 @@ var coder = new SolidityCoder([
module.exports = coder; module.exports = coder;
},{"../utils/utils":7,"./formatters":2,"./param":3,"bignumber.js":"bignumber.js"}],2:[function(require,module,exports){ },{"../utils/utils":6,"./formatters":2,"./param":3,"bignumber.js":"bignumber.js"}],2:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -301,7 +302,7 @@ module.exports = coder; ...@@ -301,7 +302,7 @@ module.exports = coder;
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file formatters.js * @file formatters.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -426,7 +427,7 @@ var formatOutputUInt = function (param) { ...@@ -426,7 +427,7 @@ var formatOutputUInt = function (param) {
* @returns {BigNumber} input bytes formatted to real * @returns {BigNumber} input bytes formatted to real
*/ */
var formatOutputReal = function (param) { var formatOutputReal = function (param) {
return formatOutputInt(param).dividedBy(new BigNumber(2).pow(128)); return formatOutputInt(param).dividedBy(new BigNumber(2).pow(128));
}; };
/** /**
...@@ -437,7 +438,7 @@ var formatOutputReal = function (param) { ...@@ -437,7 +438,7 @@ var formatOutputReal = function (param) {
* @returns {BigNumber} input bytes formatted to ureal * @returns {BigNumber} input bytes formatted to ureal
*/ */
var formatOutputUReal = function (param) { var formatOutputUReal = function (param) {
return formatOutputUInt(param).dividedBy(new BigNumber(2).pow(128)); return formatOutputUInt(param).dividedBy(new BigNumber(2).pow(128));
}; };
/** /**
...@@ -504,7 +505,7 @@ module.exports = { ...@@ -504,7 +505,7 @@ module.exports = {
}; };
},{"../utils/config":5,"../utils/utils":7,"./param":3,"bignumber.js":"bignumber.js"}],3:[function(require,module,exports){ },{"../utils/config":5,"../utils/utils":6,"./param":3,"bignumber.js":"bignumber.js"}],3:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -521,7 +522,7 @@ module.exports = { ...@@ -521,7 +522,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file param.js * @file param.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -540,7 +541,7 @@ var SolidityParam = function (value, offset) { ...@@ -540,7 +541,7 @@ var SolidityParam = function (value, offset) {
/** /**
* This method should be used to get length of params's dynamic part * This method should be used to get length of params's dynamic part
* *
* @method dynamicPartLength * @method dynamicPartLength
* @returns {Number} length of dynamic part (in bytes) * @returns {Number} length of dynamic part (in bytes)
*/ */
...@@ -568,7 +569,7 @@ SolidityParam.prototype.withOffset = function (offset) { ...@@ -568,7 +569,7 @@ SolidityParam.prototype.withOffset = function (offset) {
* @param {SolidityParam} result of combination * @param {SolidityParam} result of combination
*/ */
SolidityParam.prototype.combine = function (param) { SolidityParam.prototype.combine = function (param) {
return new SolidityParam(this.value + param.value); return new SolidityParam(this.value + param.value);
}; };
/** /**
...@@ -579,7 +580,7 @@ SolidityParam.prototype.combine = function (param) { ...@@ -579,7 +580,7 @@ SolidityParam.prototype.combine = function (param) {
* @returns {Boolean} * @returns {Boolean}
*/ */
SolidityParam.prototype.isDynamic = function () { SolidityParam.prototype.isDynamic = function () {
return this.value.length > 64; return this.value.length > 64 || this.offset !== undefined;
}; };
/** /**
...@@ -600,8 +601,8 @@ SolidityParam.prototype.offsetAsBytes = function () { ...@@ -600,8 +601,8 @@ SolidityParam.prototype.offsetAsBytes = function () {
*/ */
SolidityParam.prototype.staticPart = function () { SolidityParam.prototype.staticPart = function () {
if (!this.isDynamic()) { if (!this.isDynamic()) {
return this.value; return this.value;
} }
return this.offsetAsBytes(); return this.offsetAsBytes();
}; };
...@@ -633,7 +634,7 @@ SolidityParam.prototype.encode = function () { ...@@ -633,7 +634,7 @@ SolidityParam.prototype.encode = function () {
* @returns {String} * @returns {String}
*/ */
SolidityParam.encodeList = function (params) { SolidityParam.encodeList = function (params) {
// updating offsets // updating offsets
var totalOffset = params.length * 32; var totalOffset = params.length * 32;
var offsetParams = params.map(function (param) { var offsetParams = params.map(function (param) {
...@@ -663,7 +664,7 @@ SolidityParam.encodeList = function (params) { ...@@ -663,7 +664,7 @@ SolidityParam.encodeList = function (params) {
*/ */
SolidityParam.decodeParam = function (bytes, index) { SolidityParam.decodeParam = function (bytes, index) {
index = index || 0; index = index || 0;
return new SolidityParam(bytes.substr(index * 64, 64)); return new SolidityParam(bytes.substr(index * 64, 64));
}; };
/** /**
...@@ -695,7 +696,7 @@ SolidityParam.decodeBytes = function (bytes, index) { ...@@ -695,7 +696,7 @@ SolidityParam.decodeBytes = function (bytes, index) {
var offset = getOffset(bytes, index); var offset = getOffset(bytes, index);
// 2 * , cause we also parse length // 2 * , cause we also parse length
return new SolidityParam(bytes.substr(offset * 2, 2 * 64)); return new SolidityParam(bytes.substr(offset * 2, 2 * 64), 0);
}; };
/** /**
...@@ -710,13 +711,13 @@ SolidityParam.decodeArray = function (bytes, index) { ...@@ -710,13 +711,13 @@ SolidityParam.decodeArray = function (bytes, index) {
index = index || 0; index = index || 0;
var offset = getOffset(bytes, index); var offset = getOffset(bytes, index);
var length = parseInt('0x' + bytes.substr(offset * 2, 64)); var length = parseInt('0x' + bytes.substr(offset * 2, 64));
return new SolidityParam(bytes.substr(offset * 2, (length + 1) * 64)); return new SolidityParam(bytes.substr(offset * 2, (length + 1) * 64), 0);
}; };
module.exports = SolidityParam; module.exports = SolidityParam;
},{"../utils/utils":7}],4:[function(require,module,exports){ },{"../utils/utils":6}],4:[function(require,module,exports){
'use strict'; 'use strict';
// go env doesn't have and need XMLHttpRequest // go env doesn't have and need XMLHttpRequest
...@@ -752,13 +753,13 @@ if (typeof XMLHttpRequest === 'undefined') { ...@@ -752,13 +753,13 @@ if (typeof XMLHttpRequest === 'undefined') {
/** /**
* Utils * Utils
* *
* @module utils * @module utils
*/ */
/** /**
* Utility functions * Utility functions
* *
* @class [utils] config * @class [utils] config
* @constructor * @constructor
*/ */
...@@ -766,26 +767,26 @@ if (typeof XMLHttpRequest === 'undefined') { ...@@ -766,26 +767,26 @@ if (typeof XMLHttpRequest === 'undefined') {
/// required to define ETH_BIGNUMBER_ROUNDING_MODE /// required to define ETH_BIGNUMBER_ROUNDING_MODE
var BigNumber = require('bignumber.js'); var BigNumber = require('bignumber.js');
var ETH_UNITS = [ var ETH_UNITS = [
'wei', 'wei',
'Kwei', 'Kwei',
'Mwei', 'Mwei',
'Gwei', 'Gwei',
'szabo', 'szabo',
'finney', 'finney',
'ether', 'ether',
'grand', 'grand',
'Mether', 'Mether',
'Gether', 'Gether',
'Tether', 'Tether',
'Pether', 'Pether',
'Eether', 'Eether',
'Zether', 'Zether',
'Yether', 'Yether',
'Nether', 'Nether',
'Dether', 'Dether',
'Vether', 'Vether',
'Uether' 'Uether'
]; ];
module.exports = { module.exports = {
...@@ -816,39 +817,7 @@ module.exports = { ...@@ -816,39 +817,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file sha3.js
* @author Marek Kotewicz <marek@ethdev.com>
* @date 2015
*/
var sha3 = require('crypto-js/sha3');
module.exports = function (str) {
return sha3(str, {
outputLength: 256
}).toString();
};
},{"crypto-js/sha3":30}],7:[function(require,module,exports){
/*
This file is part of ethereum.js.
ethereum.js is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
ethereum.js is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file utils.js * @file utils.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -856,13 +825,13 @@ module.exports = function (str) { ...@@ -856,13 +825,13 @@ module.exports = function (str) {
/** /**
* Utils * Utils
* *
* @module utils * @module utils
*/ */
/** /**
* Utility functions * Utility functions
* *
* @class [utils] utils * @class [utils] utils
* @constructor * @constructor
*/ */
...@@ -901,7 +870,7 @@ var padLeft = function (string, chars, sign) { ...@@ -901,7 +870,7 @@ var padLeft = function (string, chars, sign) {
return new Array(chars - string.length + 1).join(sign ? sign : "0") + string; return new Array(chars - string.length + 1).join(sign ? sign : "0") + string;
}; };
/** /**
* Should be called to get sting from it's hex representation * Should be called to get sting from it's hex representation
* *
* @method toAscii * @method toAscii
...@@ -926,9 +895,9 @@ var toAscii = function(hex) { ...@@ -926,9 +895,9 @@ var toAscii = function(hex) {
return str; return str;
}; };
/** /**
* Shold be called to get hex representation (prefixed by 0x) of ascii string * Shold be called to get hex representation (prefixed by 0x) of ascii string
* *
* @method toHexNative * @method toHexNative
* @param {String} string * @param {String} string
...@@ -945,7 +914,7 @@ var toHexNative = function(str) { ...@@ -945,7 +914,7 @@ var toHexNative = function(str) {
}; };
/** /**
* Shold be called to get hex representation (prefixed by 0x) of ascii string * Shold be called to get hex representation (prefixed by 0x) of ascii string
* *
* @method fromAscii * @method fromAscii
* @param {String} string * @param {String} string
...@@ -978,13 +947,13 @@ var transformToFullName = function (json) { ...@@ -978,13 +947,13 @@ var transformToFullName = function (json) {
/** /**
* Should be called to get display name of contract function * Should be called to get display name of contract function
* *
* @method extractDisplayName * @method extractDisplayName
* @param {String} name of function/event * @param {String} name of function/event
* @returns {String} display name for function/event eg. multiply(uint256) -> multiply * @returns {String} display name for function/event eg. multiply(uint256) -> multiply
*/ */
var extractDisplayName = function (name) { var extractDisplayName = function (name) {
var length = name.indexOf('('); var length = name.indexOf('(');
return length !== -1 ? name.substr(0, length) : name; return length !== -1 ? name.substr(0, length) : name;
}; };
...@@ -1092,7 +1061,7 @@ var getValueOfUnit = function (unit) { ...@@ -1092,7 +1061,7 @@ var getValueOfUnit = function (unit) {
var fromWei = function(number, unit) { var fromWei = function(number, unit) {
var returnValue = toBigNumber(number).dividedBy(getValueOfUnit(unit)); var returnValue = toBigNumber(number).dividedBy(getValueOfUnit(unit));
return isBigNumber(number) ? returnValue : returnValue.toString(10); return isBigNumber(number) ? returnValue : returnValue.toString(10);
}; };
/** /**
...@@ -1118,7 +1087,7 @@ var fromWei = function(number, unit) { ...@@ -1118,7 +1087,7 @@ var fromWei = function(number, unit) {
var toWei = function(number, unit) { var toWei = function(number, unit) {
var returnValue = toBigNumber(number).times(getValueOfUnit(unit)); var returnValue = toBigNumber(number).times(getValueOfUnit(unit));
return isBigNumber(number) ? returnValue : returnValue.toString(10); return isBigNumber(number) ? returnValue : returnValue.toString(10);
}; };
/** /**
...@@ -1137,7 +1106,7 @@ var toBigNumber = function(number) { ...@@ -1137,7 +1106,7 @@ var toBigNumber = function(number) {
if (isString(number) && (number.indexOf('0x') === 0 || number.indexOf('-0x') === 0)) { if (isString(number) && (number.indexOf('0x') === 0 || number.indexOf('-0x') === 0)) {
return new BigNumber(number.replace('0x',''), 16); return new BigNumber(number.replace('0x',''), 16);
} }
return new BigNumber(number.toString(10), 10); return new BigNumber(number.toString(10), 10);
}; };
...@@ -1189,7 +1158,7 @@ var toAddress = function (address) { ...@@ -1189,7 +1158,7 @@ var toAddress = function (address) {
if (isStrictAddress(address)) { if (isStrictAddress(address)) {
return address; return address;
} }
if (/^[0-9a-f]{40}$/.test(address)) { if (/^[0-9a-f]{40}$/.test(address)) {
return '0x' + address; return '0x' + address;
} }
...@@ -1203,7 +1172,7 @@ var toAddress = function (address) { ...@@ -1203,7 +1172,7 @@ var toAddress = function (address) {
* *
* @method isBigNumber * @method isBigNumber
* @param {Object} * @param {Object}
* @return {Boolean} * @return {Boolean}
*/ */
var isBigNumber = function (object) { var isBigNumber = function (object) {
return object instanceof BigNumber || return object instanceof BigNumber ||
...@@ -1212,7 +1181,7 @@ var isBigNumber = function (object) { ...@@ -1212,7 +1181,7 @@ var isBigNumber = function (object) {
/** /**
* Returns true if object is string, otherwise false * Returns true if object is string, otherwise false
* *
* @method isString * @method isString
* @param {Object} * @param {Object}
* @return {Boolean} * @return {Boolean}
...@@ -1263,12 +1232,12 @@ var isBoolean = function (object) { ...@@ -1263,12 +1232,12 @@ var isBoolean = function (object) {
* @return {Boolean} * @return {Boolean}
*/ */
var isArray = function (object) { var isArray = function (object) {
return object instanceof Array; return object instanceof Array;
}; };
/** /**
* Returns true if given string is valid json object * Returns true if given string is valid json object
* *
* @method isJson * @method isJson
* @param {String} * @param {String}
* @return {Boolean} * @return {Boolean}
...@@ -1308,12 +1277,12 @@ module.exports = { ...@@ -1308,12 +1277,12 @@ module.exports = {
}; };
},{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],7:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.4.2" "version": "0.4.3"
} }
},{}],9:[function(require,module,exports){ },{}],8:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -1351,9 +1320,17 @@ var utils = require('./utils/utils'); ...@@ -1351,9 +1320,17 @@ var utils = require('./utils/utils');
var formatters = require('./web3/formatters'); var formatters = require('./web3/formatters');
var RequestManager = require('./web3/requestmanager'); var RequestManager = require('./web3/requestmanager');
var c = require('./utils/config'); var c = require('./utils/config');
var Method = require('./web3/method');
var Property = require('./web3/property'); var Property = require('./web3/property');
var Batch = require('./web3/batch'); var Batch = require('./web3/batch');
var sha3 = require('./utils/sha3');
var web3Methods = [
new Method({
name: 'sha3',
call: 'web3_sha3',
params: 1
})
];
var web3Properties = [ var web3Properties = [
new Property({ new Property({
...@@ -1438,7 +1415,6 @@ web3.toBigNumber = utils.toBigNumber; ...@@ -1438,7 +1415,6 @@ web3.toBigNumber = utils.toBigNumber;
web3.toWei = utils.toWei; web3.toWei = utils.toWei;
web3.fromWei = utils.fromWei; web3.fromWei = utils.fromWei;
web3.isAddress = utils.isAddress; web3.isAddress = utils.isAddress;
web3.sha3 = sha3;
web3.createBatch = function () { web3.createBatch = function () {
return new Batch(); return new Batch();
}; };
...@@ -1465,6 +1441,7 @@ Object.defineProperty(web3.eth, 'defaultAccount', { ...@@ -1465,6 +1441,7 @@ Object.defineProperty(web3.eth, 'defaultAccount', {
}); });
/// setups all api methods /// setups all api methods
setupMethods(web3, web3Methods);
setupProperties(web3, web3Properties); setupProperties(web3, web3Properties);
setupMethods(web3.net, net.methods); setupMethods(web3.net, net.methods);
setupProperties(web3.net, net.properties); setupProperties(web3.net, net.properties);
...@@ -1476,7 +1453,7 @@ setupMethods(web3.shh, shh.methods); ...@@ -1476,7 +1453,7 @@ setupMethods(web3.shh, shh.methods);
module.exports = web3; module.exports = web3;
},{"./utils/config":5,"./utils/sha3":6,"./utils/utils":7,"./version.json":8,"./web3/batch":10,"./web3/db":12,"./web3/eth":14,"./web3/filter":16,"./web3/formatters":17,"./web3/net":22,"./web3/property":23,"./web3/requestmanager":25,"./web3/shh":26,"./web3/watches":27}],10:[function(require,module,exports){ },{"./utils/config":5,"./utils/utils":6,"./version.json":7,"./web3/batch":9,"./web3/db":11,"./web3/eth":13,"./web3/filter":15,"./web3/formatters":16,"./web3/method":20,"./web3/net":21,"./web3/property":22,"./web3/requestmanager":24,"./web3/shh":25,"./web3/watches":26}],9:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -1493,7 +1470,7 @@ module.exports = web3; ...@@ -1493,7 +1470,7 @@ module.exports = web3;
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file batch.js * @file batch.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -1533,13 +1510,13 @@ Batch.prototype.execute = function () { ...@@ -1533,13 +1510,13 @@ Batch.prototype.execute = function () {
requests[index].callback(err, result); requests[index].callback(err, result);
} }
}); });
}); });
}; };
module.exports = Batch; module.exports = Batch;
},{"./requestmanager":25}],11:[function(require,module,exports){ },{"./requestmanager":24}],10:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -1556,13 +1533,13 @@ module.exports = Batch; ...@@ -1556,13 +1533,13 @@ module.exports = Batch;
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file contract.js * @file contract.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2014 * @date 2014
*/ */
var web3 = require('../web3'); var web3 = require('../web3');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var coder = require('../solidity/coder'); var coder = require('../solidity/coder');
var SolidityEvent = require('./event'); var SolidityEvent = require('./event');
...@@ -1644,7 +1621,7 @@ var ContractFactory = function (abi) { ...@@ -1644,7 +1621,7 @@ var ContractFactory = function (abi) {
/** /**
* Should be called to create new contract on a blockchain * Should be called to create new contract on a blockchain
* *
* @method new * @method new
* @param {Any} contract constructor param1 (optional) * @param {Any} contract constructor param1 (optional)
* @param {Any} contract constructor param2 (optional) * @param {Any} contract constructor param2 (optional)
...@@ -1677,14 +1654,14 @@ ContractFactory.prototype.new = function () { ...@@ -1677,14 +1654,14 @@ ContractFactory.prototype.new = function () {
var address = web3.eth.sendTransaction(options); var address = web3.eth.sendTransaction(options);
return this.at(address); return this.at(address);
} }
var self = this; var self = this;
web3.eth.sendTransaction(options, function (err, address) { web3.eth.sendTransaction(options, function (err, address) {
if (err) { if (err) {
callback(err); callback(err);
} }
self.at(address, callback); self.at(address, callback);
}); });
}; };
/** /**
...@@ -1698,10 +1675,10 @@ ContractFactory.prototype.new = function () { ...@@ -1698,10 +1675,10 @@ ContractFactory.prototype.new = function () {
*/ */
ContractFactory.prototype.at = function (address, callback) { ContractFactory.prototype.at = function (address, callback) {
// TODO: address is required // TODO: address is required
if (callback) { if (callback) {
callback(null, new Contract(this.abi, address)); callback(null, new Contract(this.abi, address));
} }
return new Contract(this.abi, address); return new Contract(this.abi, address);
}; };
...@@ -1721,7 +1698,7 @@ var Contract = function (abi, address) { ...@@ -1721,7 +1698,7 @@ var Contract = function (abi, address) {
module.exports = contract; module.exports = contract;
},{"../solidity/coder":1,"../utils/utils":7,"../web3":9,"./event":15,"./function":18}],12:[function(require,module,exports){ },{"../solidity/coder":1,"../utils/utils":6,"../web3":8,"./event":14,"./function":17}],11:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -1779,7 +1756,7 @@ module.exports = { ...@@ -1779,7 +1756,7 @@ module.exports = {
methods: methods methods: methods
}; };
},{"./method":21}],13:[function(require,module,exports){ },{"./method":20}],12:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -1796,7 +1773,7 @@ module.exports = { ...@@ -1796,7 +1773,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file errors.js * @file errors.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2015 * @date 2015
...@@ -1819,7 +1796,7 @@ module.exports = { ...@@ -1819,7 +1796,7 @@ module.exports = {
}; };
},{}],14:[function(require,module,exports){ },{}],13:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2096,7 +2073,7 @@ module.exports = { ...@@ -2096,7 +2073,7 @@ module.exports = {
}; };
},{"../utils/utils":7,"./formatters":17,"./method":21,"./property":23}],15:[function(require,module,exports){ },{"../utils/utils":6,"./formatters":16,"./method":20,"./property":22}],14:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2113,7 +2090,7 @@ module.exports = { ...@@ -2113,7 +2090,7 @@ module.exports = {
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file event.js * @file event.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @date 2014 * @date 2014
...@@ -2123,7 +2100,6 @@ var utils = require('../utils/utils'); ...@@ -2123,7 +2100,6 @@ var utils = require('../utils/utils');
var coder = require('../solidity/coder'); var coder = require('../solidity/coder');
var web3 = require('../web3'); var web3 = require('../web3');
var formatters = require('./formatters'); var formatters = require('./formatters');
var sha3 = require('../utils/sha3');
/** /**
* This prototype should be used to create event filters * This prototype should be used to create event filters
...@@ -2177,12 +2153,12 @@ SolidityEvent.prototype.typeName = function () { ...@@ -2177,12 +2153,12 @@ SolidityEvent.prototype.typeName = function () {
* @return {String} event signature * @return {String} event signature
*/ */
SolidityEvent.prototype.signature = function () { SolidityEvent.prototype.signature = function () {
return sha3(this._name); return web3.sha3(web3.fromAscii(this._name)).slice(2);
}; };
/** /**
* Should be used to encode indexed params and options to one final object * Should be used to encode indexed params and options to one final object
* *
* @method encode * @method encode
* @param {Object} indexed * @param {Object} indexed
* @param {Object} options * @param {Object} options
...@@ -2213,7 +2189,7 @@ SolidityEvent.prototype.encode = function (indexed, options) { ...@@ -2213,7 +2189,7 @@ SolidityEvent.prototype.encode = function (indexed, options) {
if (value === undefined || value === null) { if (value === undefined || value === null) {
return null; return null;
} }
if (utils.isArray(value)) { if (utils.isArray(value)) {
return value.map(function (v) { return value.map(function (v) {
return '0x' + coder.encodeParam(i.type, v); return '0x' + coder.encodeParam(i.type, v);
...@@ -2235,17 +2211,17 @@ SolidityEvent.prototype.encode = function (indexed, options) { ...@@ -2235,17 +2211,17 @@ SolidityEvent.prototype.encode = function (indexed, options) {
* @return {Object} result object with decoded indexed && not indexed params * @return {Object} result object with decoded indexed && not indexed params
*/ */
SolidityEvent.prototype.decode = function (data) { SolidityEvent.prototype.decode = function (data) {
data.data = data.data || ''; data.data = data.data || '';
data.topics = data.topics || []; data.topics = data.topics || [];
var argTopics = this._anonymous ? data.topics : data.topics.slice(1); var argTopics = this._anonymous ? data.topics : data.topics.slice(1);
var indexedData = argTopics.map(function (topics) { return topics.slice(2); }).join(""); var indexedData = argTopics.map(function (topics) { return topics.slice(2); }).join("");
var indexedParams = coder.decodeParams(this.types(true), indexedData); var indexedParams = coder.decodeParams(this.types(true), indexedData);
var notIndexedData = data.data.slice(2); var notIndexedData = data.data.slice(2);
var notIndexedParams = coder.decodeParams(this.types(false), notIndexedData); var notIndexedParams = coder.decodeParams(this.types(false), notIndexedData);
var result = formatters.outputLogFormatter(data); var result = formatters.outputLogFormatter(data);
result.event = this.displayName(); result.event = this.displayName();
result.address = data.address; result.address = data.address;
...@@ -2293,7 +2269,7 @@ SolidityEvent.prototype.attachToContract = function (contract) { ...@@ -2293,7 +2269,7 @@ SolidityEvent.prototype.attachToContract = function (contract) {
module.exports = SolidityEvent; module.exports = SolidityEvent;
},{"../solidity/coder":1,"../utils/sha3":6,"../utils/utils":7,"../web3":9,"./formatters":17}],16:[function(require,module,exports){ },{"../solidity/coder":1,"../utils/utils":6,"../web3":8,"./formatters":16}],15:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2350,7 +2326,7 @@ var getOptions = function (options) { ...@@ -2350,7 +2326,7 @@ var getOptions = function (options) {
if (utils.isString(options)) { if (utils.isString(options)) {
return options; return options;
} }
options = options || {}; options = options || {};
...@@ -2366,8 +2342,8 @@ var getOptions = function (options) { ...@@ -2366,8 +2342,8 @@ var getOptions = function (options) {
to: options.to, to: options.to,
address: options.address, address: options.address,
fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock), fromBlock: formatters.inputBlockNumberFormatter(options.fromBlock),
toBlock: formatters.inputBlockNumberFormatter(options.toBlock) toBlock: formatters.inputBlockNumberFormatter(options.toBlock)
}; };
}; };
var Filter = function (options, methods, formatter) { var Filter = function (options, methods, formatter) {
...@@ -2450,7 +2426,7 @@ Filter.prototype.get = function (callback) { ...@@ -2450,7 +2426,7 @@ Filter.prototype.get = function (callback) {
module.exports = Filter; module.exports = Filter;
},{"../utils/utils":7,"./formatters":17,"./requestmanager":25}],17:[function(require,module,exports){ },{"../utils/utils":6,"./formatters":16,"./requestmanager":24}],16:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2467,7 +2443,7 @@ module.exports = Filter; ...@@ -2467,7 +2443,7 @@ module.exports = Filter;
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file formatters.js * @file formatters.js
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
* @author Fabian Vogelsteller <fabian@ethdev.com> * @author Fabian Vogelsteller <fabian@ethdev.com>
...@@ -2531,12 +2507,12 @@ var inputTransactionFormatter = function (options){ ...@@ -2531,12 +2507,12 @@ var inputTransactionFormatter = function (options){
options[key] = utils.fromDecimal(options[key]); options[key] = utils.fromDecimal(options[key]);
}); });
return options; return options;
}; };
/** /**
* Formats the output of a transaction to its proper values * Formats the output of a transaction to its proper values
* *
* @method outputTransactionFormatter * @method outputTransactionFormatter
* @param {Object} transaction * @param {Object} transaction
* @returns {Object} transaction * @returns {Object} transaction
...@@ -2555,7 +2531,7 @@ var outputTransactionFormatter = function (tx){ ...@@ -2555,7 +2531,7 @@ var outputTransactionFormatter = function (tx){
* Formats the output of a block to its proper values * Formats the output of a block to its proper values
* *
* @method outputBlockFormatter * @method outputBlockFormatter
* @param {Object} block object * @param {Object} block object
* @returns {Object} block object * @returns {Object} block object
*/ */
var outputBlockFormatter = function(block) { var outputBlockFormatter = function(block) {
...@@ -2582,7 +2558,7 @@ var outputBlockFormatter = function(block) { ...@@ -2582,7 +2558,7 @@ var outputBlockFormatter = function(block) {
/** /**
* Formats the output of a log * Formats the output of a log
* *
* @method outputLogFormatter * @method outputLogFormatter
* @param {Object} log object * @param {Object} log object
* @returns {Object} log * @returns {Object} log
...@@ -2623,7 +2599,7 @@ var inputPostFormatter = function(post) { ...@@ -2623,7 +2599,7 @@ var inputPostFormatter = function(post) {
return utils.fromAscii(topic); return utils.fromAscii(topic);
}); });
return post; return post;
}; };
/** /**
...@@ -2670,7 +2646,7 @@ module.exports = { ...@@ -2670,7 +2646,7 @@ module.exports = {
}; };
},{"../utils/config":5,"../utils/utils":7}],18:[function(require,module,exports){ },{"../utils/config":5,"../utils/utils":6}],17:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2696,7 +2672,6 @@ module.exports = { ...@@ -2696,7 +2672,6 @@ module.exports = {
var web3 = require('../web3'); var web3 = require('../web3');
var coder = require('../solidity/coder'); var coder = require('../solidity/coder');
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var sha3 = require('../utils/sha3');
/** /**
* This prototype should be used to call/sendTransaction to solidity functions * This prototype should be used to call/sendTransaction to solidity functions
...@@ -2743,7 +2718,7 @@ SolidityFunction.prototype.toPayload = function (args) { ...@@ -2743,7 +2718,7 @@ SolidityFunction.prototype.toPayload = function (args) {
* @return {String} function signature * @return {String} function signature
*/ */
SolidityFunction.prototype.signature = function () { SolidityFunction.prototype.signature = function () {
return sha3(this._name).slice(0, 8); return web3.sha3(web3.fromAscii(this._name)).slice(2, 10);
}; };
...@@ -2775,8 +2750,8 @@ SolidityFunction.prototype.call = function () { ...@@ -2775,8 +2750,8 @@ SolidityFunction.prototype.call = function () {
if (!callback) { if (!callback) {
var output = web3.eth.call(payload); var output = web3.eth.call(payload);
return this.unpackOutput(output); return this.unpackOutput(output);
} }
var self = this; var self = this;
web3.eth.call(payload, function (error, output) { web3.eth.call(payload, function (error, output) {
callback(error, self.unpackOutput(output)); callback(error, self.unpackOutput(output));
...@@ -2833,10 +2808,10 @@ SolidityFunction.prototype.request = function () { ...@@ -2833,10 +2808,10 @@ SolidityFunction.prototype.request = function () {
var callback = this.extractCallback(args); var callback = this.extractCallback(args);
var payload = this.toPayload(args); var payload = this.toPayload(args);
var format = this.unpackOutput.bind(this); var format = this.unpackOutput.bind(this);
return { return {
callback: callback, callback: callback,
payload: payload, payload: payload,
format: format format: format
}; };
}; };
...@@ -2879,7 +2854,7 @@ SolidityFunction.prototype.attachToContract = function (contract) { ...@@ -2879,7 +2854,7 @@ SolidityFunction.prototype.attachToContract = function (contract) {
module.exports = SolidityFunction; module.exports = SolidityFunction;
},{"../solidity/coder":1,"../utils/sha3":6,"../utils/utils":7,"../web3":9}],19:[function(require,module,exports){ },{"../solidity/coder":1,"../utils/utils":6,"../web3":8}],18:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -2917,7 +2892,7 @@ HttpProvider.prototype.send = function (payload) { ...@@ -2917,7 +2892,7 @@ HttpProvider.prototype.send = function (payload) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open('POST', this.host, false); request.open('POST', this.host, false);
try { try {
request.send(JSON.stringify(payload)); request.send(JSON.stringify(payload));
} catch(error) { } catch(error) {
...@@ -2936,7 +2911,7 @@ HttpProvider.prototype.send = function (payload) { ...@@ -2936,7 +2911,7 @@ HttpProvider.prototype.send = function (payload) {
try { try {
result = JSON.parse(result); result = JSON.parse(result);
} catch(e) { } catch(e) {
throw errors.InvalidResponse(result); throw errors.InvalidResponse(result);
} }
return result; return result;
...@@ -2952,7 +2927,7 @@ HttpProvider.prototype.sendAsync = function (payload, callback) { ...@@ -2952,7 +2927,7 @@ HttpProvider.prototype.sendAsync = function (payload, callback) {
try { try {
result = JSON.parse(result); result = JSON.parse(result);
} catch(e) { } catch(e) {
error = errors.InvalidResponse(result); error = errors.InvalidResponse(result);
} }
callback(error, result); callback(error, result);
...@@ -2971,7 +2946,7 @@ HttpProvider.prototype.sendAsync = function (payload, callback) { ...@@ -2971,7 +2946,7 @@ HttpProvider.prototype.sendAsync = function (payload, callback) {
module.exports = HttpProvider; module.exports = HttpProvider;
},{"./errors":13,"xmlhttprequest":4}],20:[function(require,module,exports){ },{"./errors":12,"xmlhttprequest":4}],19:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3064,7 +3039,7 @@ Jsonrpc.prototype.toBatchPayload = function (messages) { ...@@ -3064,7 +3039,7 @@ Jsonrpc.prototype.toBatchPayload = function (messages) {
module.exports = Jsonrpc; module.exports = Jsonrpc;
},{}],21:[function(require,module,exports){ },{}],20:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3125,7 +3100,7 @@ Method.prototype.extractCallback = function (args) { ...@@ -3125,7 +3100,7 @@ Method.prototype.extractCallback = function (args) {
/** /**
* Should be called to check if the number of arguments is correct * Should be called to check if the number of arguments is correct
* *
* @method validateArgs * @method validateArgs
* @param {Array} arguments * @param {Array} arguments
* @throws {Error} if it is not * @throws {Error} if it is not
...@@ -3138,7 +3113,7 @@ Method.prototype.validateArgs = function (args) { ...@@ -3138,7 +3113,7 @@ Method.prototype.validateArgs = function (args) {
/** /**
* Should be called to format input args of method * Should be called to format input args of method
* *
* @method formatInput * @method formatInput
* @param {Array} * @param {Array}
* @return {Array} * @return {Array}
...@@ -3166,7 +3141,7 @@ Method.prototype.formatOutput = function (result) { ...@@ -3166,7 +3141,7 @@ Method.prototype.formatOutput = function (result) {
/** /**
* Should attach function to method * Should attach function to method
* *
* @method attachToObject * @method attachToObject
* @param {Object} * @param {Object}
* @param {Function} * @param {Function}
...@@ -3180,7 +3155,7 @@ Method.prototype.attachToObject = function (obj) { ...@@ -3180,7 +3155,7 @@ Method.prototype.attachToObject = function (obj) {
obj[name[0]] = obj[name[0]] || {}; obj[name[0]] = obj[name[0]] || {};
obj[name[0]][name[1]] = func; obj[name[0]][name[1]] = func;
} else { } else {
obj[name[0]] = func; obj[name[0]] = func;
} }
}; };
...@@ -3238,7 +3213,7 @@ Method.prototype.send = function () { ...@@ -3238,7 +3213,7 @@ Method.prototype.send = function () {
module.exports = Method; module.exports = Method;
},{"../utils/utils":7,"./errors":13,"./requestmanager":25}],22:[function(require,module,exports){ },{"../utils/utils":6,"./errors":12,"./requestmanager":24}],21:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3288,7 +3263,7 @@ module.exports = { ...@@ -3288,7 +3263,7 @@ module.exports = {
}; };
},{"../utils/utils":7,"./property":23}],23:[function(require,module,exports){ },{"../utils/utils":6,"./property":22}],22:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3324,7 +3299,7 @@ var Property = function (options) { ...@@ -3324,7 +3299,7 @@ var Property = function (options) {
/** /**
* Should be called to format input args of method * Should be called to format input args of method
* *
* @method formatInput * @method formatInput
* @param {Array} * @param {Array}
* @return {Array} * @return {Array}
...@@ -3346,7 +3321,7 @@ Property.prototype.formatOutput = function (result) { ...@@ -3346,7 +3321,7 @@ Property.prototype.formatOutput = function (result) {
/** /**
* Should attach function to method * Should attach function to method
* *
* @method attachToObject * @method attachToObject
* @param {Object} * @param {Object}
* @param {Function} * @param {Function}
...@@ -3363,7 +3338,7 @@ Property.prototype.attachToObject = function (obj) { ...@@ -3363,7 +3338,7 @@ Property.prototype.attachToObject = function (obj) {
obj = obj[names[0]]; obj = obj[names[0]];
name = names[1]; name = names[1];
} }
Object.defineProperty(obj, name, proto); Object.defineProperty(obj, name, proto);
var toAsyncName = function (prefix, name) { var toAsyncName = function (prefix, name) {
...@@ -3406,7 +3381,7 @@ Property.prototype.getAsync = function (callback) { ...@@ -3406,7 +3381,7 @@ Property.prototype.getAsync = function (callback) {
module.exports = Property; module.exports = Property;
},{"./requestmanager":25}],24:[function(require,module,exports){ },{"./requestmanager":24}],23:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3441,7 +3416,7 @@ QtSyncProvider.prototype.send = function (payload) { ...@@ -3441,7 +3416,7 @@ QtSyncProvider.prototype.send = function (payload) {
module.exports = QtSyncProvider; module.exports = QtSyncProvider;
},{}],25:[function(require,module,exports){ },{}],24:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3458,7 +3433,7 @@ module.exports = QtSyncProvider; ...@@ -3458,7 +3433,7 @@ module.exports = QtSyncProvider;
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with ethereum.js. If not, see <http://www.gnu.org/licenses/>. along with ethereum.js. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* @file requestmanager.js * @file requestmanager.js
* @author Jeffrey Wilcke <jeff@ethdev.com> * @author Jeffrey Wilcke <jeff@ethdev.com>
* @author Marek Kotewicz <marek@ethdev.com> * @author Marek Kotewicz <marek@ethdev.com>
...@@ -3540,7 +3515,7 @@ RequestManager.prototype.sendAsync = function (data, callback) { ...@@ -3540,7 +3515,7 @@ RequestManager.prototype.sendAsync = function (data, callback) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
if (!Jsonrpc.getInstance().isValidResponse(result)) { if (!Jsonrpc.getInstance().isValidResponse(result)) {
return callback(errors.InvalidResponse(result)); return callback(errors.InvalidResponse(result));
} }
...@@ -3573,7 +3548,7 @@ RequestManager.prototype.sendBatch = function (data, callback) { ...@@ -3573,7 +3548,7 @@ RequestManager.prototype.sendBatch = function (data, callback) {
} }
callback(err, results); callback(err, results);
}); });
}; };
/** /**
...@@ -3626,7 +3601,7 @@ RequestManager.prototype.stopPolling = function (pollId) { ...@@ -3626,7 +3601,7 @@ RequestManager.prototype.stopPolling = function (pollId) {
*/ */
RequestManager.prototype.reset = function () { RequestManager.prototype.reset = function () {
this.polls.forEach(function (poll) { this.polls.forEach(function (poll) {
poll.uninstall(poll.id); poll.uninstall(poll.id);
}); });
this.polls = []; this.polls = [];
...@@ -3664,7 +3639,7 @@ RequestManager.prototype.poll = function () { ...@@ -3664,7 +3639,7 @@ RequestManager.prototype.poll = function () {
if (error) { if (error) {
return; return;
} }
if (!utils.isArray(results)) { if (!utils.isArray(results)) {
throw errors.InvalidResponse(results); throw errors.InvalidResponse(results);
} }
...@@ -3689,7 +3664,7 @@ RequestManager.prototype.poll = function () { ...@@ -3689,7 +3664,7 @@ RequestManager.prototype.poll = function () {
module.exports = RequestManager; module.exports = RequestManager;
},{"../utils/config":5,"../utils/utils":7,"./errors":13,"./jsonrpc":20}],26:[function(require,module,exports){ },{"../utils/config":5,"../utils/utils":6,"./errors":12,"./jsonrpc":19}],25:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3716,8 +3691,8 @@ var Method = require('./method'); ...@@ -3716,8 +3691,8 @@ var Method = require('./method');
var formatters = require('./formatters'); var formatters = require('./formatters');
var post = new Method({ var post = new Method({
name: 'post', name: 'post',
call: 'shh_post', call: 'shh_post',
params: 1, params: 1,
inputFormatter: [formatters.inputPostFormatter] inputFormatter: [formatters.inputPostFormatter]
}); });
...@@ -3759,7 +3734,7 @@ module.exports = { ...@@ -3759,7 +3734,7 @@ module.exports = {
}; };
},{"./formatters":17,"./method":21}],27:[function(require,module,exports){ },{"./formatters":16,"./method":20}],26:[function(require,module,exports){
/* /*
This file is part of ethereum.js. This file is part of ethereum.js.
...@@ -3875,1384 +3850,9 @@ module.exports = { ...@@ -3875,1384 +3850,9 @@ module.exports = {
}; };
},{"./method":21}],28:[function(require,module,exports){ },{"./method":20}],27:[function(require,module,exports){
},{}],29:[function(require,module,exports){ },{}],"bignumber.js":[function(require,module,exports){
;(function (root, factory) {
if (typeof exports === "object") {
// CommonJS
module.exports = exports = factory();
}
else if (typeof define === "function" && define.amd) {
// AMD
define([], factory);
}
else {
// Global (browser)
root.CryptoJS = factory();
}
}(this, function () {
/**
* CryptoJS core components.
*/
var CryptoJS = CryptoJS || (function (Math, undefined) {
/**
* CryptoJS namespace.
*/
var C = {};
/**
* Library namespace.
*/
var C_lib = C.lib = {};
/**
* Base object for prototypal inheritance.
*/
var Base = C_lib.Base = (function () {
function F() {}
return {
/**
* Creates a new object that inherits from this object.
*
* @param {Object} overrides Properties to copy into the new object.
*
* @return {Object} The new object.
*
* @static
*
* @example
*
* var MyType = CryptoJS.lib.Base.extend({
* field: 'value',
*
* method: function () {
* }
* });
*/
extend: function (overrides) {
// Spawn
F.prototype = this;
var subtype = new F();
// Augment
if (overrides) {
subtype.mixIn(overrides);
}
// Create default initializer
if (!subtype.hasOwnProperty('init')) {
subtype.init = function () {
subtype.$super.init.apply(this, arguments);
};
}
// Initializer's prototype is the subtype object
subtype.init.prototype = subtype;
// Reference supertype
subtype.$super = this;
return subtype;
},
/**
* Extends this object and runs the init method.
* Arguments to create() will be passed to init().
*
* @return {Object} The new object.
*
* @static
*
* @example
*
* var instance = MyType.create();
*/
create: function () {
var instance = this.extend();
instance.init.apply(instance, arguments);
return instance;
},
/**
* Initializes a newly created object.
* Override this method to add some logic when your objects are created.
*
* @example
*
* var MyType = CryptoJS.lib.Base.extend({
* init: function () {
* // ...
* }
* });
*/
init: function () {
},
/**
* Copies properties into this object.
*
* @param {Object} properties The properties to mix in.
*
* @example
*
* MyType.mixIn({
* field: 'value'
* });
*/
mixIn: function (properties) {
for (var propertyName in properties) {
if (properties.hasOwnProperty(propertyName)) {
this[propertyName] = properties[propertyName];
}
}
// IE won't copy toString using the loop above
if (properties.hasOwnProperty('toString')) {
this.toString = properties.toString;
}
},
/**
* Creates a copy of this object.
*
* @return {Object} The clone.
*
* @example
*
* var clone = instance.clone();
*/
clone: function () {
return this.init.prototype.extend(this);
}
};
}());
/**
* An array of 32-bit words.
*
* @property {Array} words The array of 32-bit words.
* @property {number} sigBytes The number of significant bytes in this word array.
*/
var WordArray = C_lib.WordArray = Base.extend({
/**
* Initializes a newly created word array.
*
* @param {Array} words (Optional) An array of 32-bit words.
* @param {number} sigBytes (Optional) The number of significant bytes in the words.
*
* @example
*
* var wordArray = CryptoJS.lib.WordArray.create();
* var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
* var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
*/
init: function (words, sigBytes) {
words = this.words = words || [];
if (sigBytes != undefined) {
this.sigBytes = sigBytes;
} else {
this.sigBytes = words.length * 4;
}
},
/**
* Converts this word array to a string.
*
* @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
*
* @return {string} The stringified word array.
*
* @example
*
* var string = wordArray + '';
* var string = wordArray.toString();
* var string = wordArray.toString(CryptoJS.enc.Utf8);
*/
toString: function (encoder) {
return (encoder || Hex).stringify(this);
},
/**
* Concatenates a word array to this word array.
*
* @param {WordArray} wordArray The word array to append.
*
* @return {WordArray} This word array.
*
* @example
*
* wordArray1.concat(wordArray2);
*/
concat: function (wordArray) {
// Shortcuts
var thisWords = this.words;
var thatWords = wordArray.words;
var thisSigBytes = this.sigBytes;
var thatSigBytes = wordArray.sigBytes;
// Clamp excess bits
this.clamp();
// Concat
if (thisSigBytes % 4) {
// Copy one byte at a time
for (var i = 0; i < thatSigBytes; i++) {
var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
}
} else if (thatWords.length > 0xffff) {
// Copy one word at a time
for (var i = 0; i < thatSigBytes; i += 4) {
thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
}
} else {
// Copy all words at once
thisWords.push.apply(thisWords, thatWords);
}
this.sigBytes += thatSigBytes;
// Chainable
return this;
},
/**
* Removes insignificant bits.
*
* @example
*
* wordArray.clamp();
*/
clamp: function () {
// Shortcuts
var words = this.words;
var sigBytes = this.sigBytes;
// Clamp
words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
words.length = Math.ceil(sigBytes / 4);
},
/**
* Creates a copy of this word array.
*
* @return {WordArray} The clone.
*
* @example
*
* var clone = wordArray.clone();
*/
clone: function () {
var clone = Base.clone.call(this);
clone.words = this.words.slice(0);
return clone;
},
/**
* Creates a word array filled with random bytes.
*
* @param {number} nBytes The number of random bytes to generate.
*
* @return {WordArray} The random word array.
*
* @static
*
* @example
*
* var wordArray = CryptoJS.lib.WordArray.random(16);
*/
random: function (nBytes) {
var words = [];
var r = (function (m_w) {
var m_w = m_w;
var m_z = 0x3ade68b1;
var mask = 0xffffffff;
return function () {
m_z = (0x9069 * (m_z & 0xFFFF) + (m_z >> 0x10)) & mask;
m_w = (0x4650 * (m_w & 0xFFFF) + (m_w >> 0x10)) & mask;
var result = ((m_z << 0x10) + m_w) & mask;
result /= 0x100000000;
result += 0.5;
return result * (Math.random() > .5 ? 1 : -1);
}
});
for (var i = 0, rcache; i < nBytes; i += 4) {
var _r = r((rcache || Math.random()) * 0x100000000);
rcache = _r() * 0x3ade67b7;
words.push((_r() * 0x100000000) | 0);
}
return new WordArray.init(words, nBytes);
}
});
/**
* Encoder namespace.
*/
var C_enc = C.enc = {};
/**
* Hex encoding strategy.
*/
var Hex = C_enc.Hex = {
/**
* Converts a word array to a hex string.
*
* @param {WordArray} wordArray The word array.
*
* @return {string} The hex string.
*
* @static
*
* @example
*
* var hexString = CryptoJS.enc.Hex.stringify(wordArray);
*/
stringify: function (wordArray) {
// Shortcuts
var words = wordArray.words;
var sigBytes = wordArray.sigBytes;
// Convert
var hexChars = [];
for (var i = 0; i < sigBytes; i++) {
var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
hexChars.push((bite >>> 4).toString(16));
hexChars.push((bite & 0x0f).toString(16));
}
return hexChars.join('');
},
/**
* Converts a hex string to a word array.
*
* @param {string} hexStr The hex string.
*
* @return {WordArray} The word array.
*
* @static
*
* @example
*
* var wordArray = CryptoJS.enc.Hex.parse(hexString);
*/
parse: function (hexStr) {
// Shortcut
var hexStrLength = hexStr.length;
// Convert
var words = [];
for (var i = 0; i < hexStrLength; i += 2) {
words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
}
return new WordArray.init(words, hexStrLength / 2);
}
};
/**
* Latin1 encoding strategy.
*/
var Latin1 = C_enc.Latin1 = {
/**
* Converts a word array to a Latin1 string.
*
* @param {WordArray} wordArray The word array.
*
* @return {string} The Latin1 string.
*
* @static
*
* @example
*
* var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
*/
stringify: function (wordArray) {
// Shortcuts
var words = wordArray.words;
var sigBytes = wordArray.sigBytes;
// Convert
var latin1Chars = [];
for (var i = 0; i < sigBytes; i++) {
var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
latin1Chars.push(String.fromCharCode(bite));
}
return latin1Chars.join('');
},
/**
* Converts a Latin1 string to a word array.
*
* @param {string} latin1Str The Latin1 string.
*
* @return {WordArray} The word array.
*
* @static
*
* @example
*
* var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
*/
parse: function (latin1Str) {
// Shortcut
var latin1StrLength = latin1Str.length;
// Convert
var words = [];
for (var i = 0; i < latin1StrLength; i++) {
words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
}
return new WordArray.init(words, latin1StrLength);
}
};
/**
* UTF-8 encoding strategy.
*/
var Utf8 = C_enc.Utf8 = {
/**
* Converts a word array to a UTF-8 string.
*
* @param {WordArray} wordArray The word array.
*
* @return {string} The UTF-8 string.
*
* @static
*
* @example
*
* var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
*/
stringify: function (wordArray) {
try {
return decodeURIComponent(escape(Latin1.stringify(wordArray)));
} catch (e) {
throw new Error('Malformed UTF-8 data');
}
},
/**
* Converts a UTF-8 string to a word array.
*
* @param {string} utf8Str The UTF-8 string.
*
* @return {WordArray} The word array.
*
* @static
*
* @example
*
* var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
*/
parse: function (utf8Str) {
return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
}
};
/**
* Abstract buffered block algorithm template.
*
* The property blockSize must be implemented in a concrete subtype.
*
* @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
*/
var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
/**
* Resets this block algorithm's data buffer to its initial state.
*
* @example
*
* bufferedBlockAlgorithm.reset();
*/
reset: function () {
// Initial values
this._data = new WordArray.init();
this._nDataBytes = 0;
},
/**
* Adds new data to this block algorithm's buffer.
*
* @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
*
* @example
*
* bufferedBlockAlgorithm._append('data');
* bufferedBlockAlgorithm._append(wordArray);
*/
_append: function (data) {
// Convert string to WordArray, else assume WordArray already
if (typeof data == 'string') {
data = Utf8.parse(data);
}
// Append
this._data.concat(data);
this._nDataBytes += data.sigBytes;
},
/**
* Processes available data blocks.
*
* This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
*
* @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
*
* @return {WordArray} The processed data.
*
* @example
*
* var processedData = bufferedBlockAlgorithm._process();
* var processedData = bufferedBlockAlgorithm._process(!!'flush');
*/
_process: function (doFlush) {
// Shortcuts
var data = this._data;
var dataWords = data.words;
var dataSigBytes = data.sigBytes;
var blockSize = this.blockSize;
var blockSizeBytes = blockSize * 4;
// Count blocks ready
var nBlocksReady = dataSigBytes / blockSizeBytes;
if (doFlush) {
// Round up to include partial blocks
nBlocksReady = Math.ceil(nBlocksReady);
} else {
// Round down to include only full blocks,
// less the number of blocks that must remain in the buffer
nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
}
// Count words ready
var nWordsReady = nBlocksReady * blockSize;
// Count bytes ready
var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
// Process blocks
if (nWordsReady) {
for (var offset = 0; offset < nWordsReady; offset += blockSize) {
// Perform concrete-algorithm logic
this._doProcessBlock(dataWords, offset);
}
// Remove processed words
var processedWords = dataWords.splice(0, nWordsReady);
data.sigBytes -= nBytesReady;
}
// Return processed words
return new WordArray.init(processedWords, nBytesReady);
},
/**
* Creates a copy of this object.
*
* @return {Object} The clone.
*
* @example
*
* var clone = bufferedBlockAlgorithm.clone();
*/
clone: function () {
var clone = Base.clone.call(this);
clone._data = this._data.clone();
return clone;
},
_minBufferSize: 0
});
/**
* Abstract hasher template.
*
* @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
*/
var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
/**
* Configuration options.
*/
cfg: Base.extend(),
/**
* Initializes a newly created hasher.
*
* @param {Object} cfg (Optional) The configuration options to use for this hash computation.
*
* @example
*
* var hasher = CryptoJS.algo.SHA256.create();
*/
init: function (cfg) {
// Apply config defaults
this.cfg = this.cfg.extend(cfg);
// Set initial values
this.reset();
},
/**
* Resets this hasher to its initial state.
*
* @example
*
* hasher.reset();
*/
reset: function () {
// Reset data buffer
BufferedBlockAlgorithm.reset.call(this);
// Perform concrete-hasher logic
this._doReset();
},
/**
* Updates this hasher with a message.
*
* @param {WordArray|string} messageUpdate The message to append.
*
* @return {Hasher} This hasher.
*
* @example
*
* hasher.update('message');
* hasher.update(wordArray);
*/
update: function (messageUpdate) {
// Append
this._append(messageUpdate);
// Update the hash
this._process();
// Chainable
return this;
},
/**
* Finalizes the hash computation.
* Note that the finalize operation is effectively a destructive, read-once operation.
*
* @param {WordArray|string} messageUpdate (Optional) A final message update.
*
* @return {WordArray} The hash.
*
* @example
*
* var hash = hasher.finalize();
* var hash = hasher.finalize('message');
* var hash = hasher.finalize(wordArray);
*/
finalize: function (messageUpdate) {
// Final message update
if (messageUpdate) {
this._append(messageUpdate);
}
// Perform concrete-hasher logic
var hash = this._doFinalize();
return hash;
},
blockSize: 512/32,
/**
* Creates a shortcut function to a hasher's object interface.
*
* @param {Hasher} hasher The hasher to create a helper for.
*
* @return {Function} The shortcut function.
*
* @static
*
* @example
*
* var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
*/
_createHelper: function (hasher) {
return function (message, cfg) {
return new hasher.init(cfg).finalize(message);
};
},
/**
* Creates a shortcut function to the HMAC's object interface.
*
* @param {Hasher} hasher The hasher to use in this HMAC helper.
*
* @return {Function} The shortcut function.
*
* @static
*
* @example
*
* var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
*/
_createHmacHelper: function (hasher) {
return function (message, key) {
return new C_algo.HMAC.init(hasher, key).finalize(message);
};
}
});
/**
* Algorithm namespace.
*/
var C_algo = C.algo = {};
return C;
}(Math));
return CryptoJS;
}));
},{}],30:[function(require,module,exports){
;(function (root, factory, undef) {
if (typeof exports === "object") {
// CommonJS
module.exports = exports = factory(require("./core"), require("./x64-core"));
}
else if (typeof define === "function" && define.amd) {
// AMD
define(["./core", "./x64-core"], factory);
}
else {
// Global (browser)
factory(root.CryptoJS);
}
}(this, function (CryptoJS) {
(function (Math) {
// Shortcuts
var C = CryptoJS;
var C_lib = C.lib;
var WordArray = C_lib.WordArray;
var Hasher = C_lib.Hasher;
var C_x64 = C.x64;
var X64Word = C_x64.Word;
var C_algo = C.algo;
// Constants tables
var RHO_OFFSETS = [];
var PI_INDEXES = [];
var ROUND_CONSTANTS = [];
// Compute Constants
(function () {
// Compute rho offset constants
var x = 1, y = 0;
for (var t = 0; t < 24; t++) {
RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
var newX = y % 5;
var newY = (2 * x + 3 * y) % 5;
x = newX;
y = newY;
}
// Compute pi index constants
for (var x = 0; x < 5; x++) {
for (var y = 0; y < 5; y++) {
PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
}
}
// Compute round constants
var LFSR = 0x01;
for (var i = 0; i < 24; i++) {
var roundConstantMsw = 0;
var roundConstantLsw = 0;
for (var j = 0; j < 7; j++) {
if (LFSR & 0x01) {
var bitPosition = (1 << j) - 1;
if (bitPosition < 32) {
roundConstantLsw ^= 1 << bitPosition;
} else /* if (bitPosition >= 32) */ {
roundConstantMsw ^= 1 << (bitPosition - 32);
}
}
// Compute next LFSR
if (LFSR & 0x80) {
// Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
LFSR = (LFSR << 1) ^ 0x71;
} else {
LFSR <<= 1;
}
}
ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
}
}());
// Reusable objects for temporary values
var T = [];
(function () {
for (var i = 0; i < 25; i++) {
T[i] = X64Word.create();
}
}());
/**
* SHA-3 hash algorithm.
*/
var SHA3 = C_algo.SHA3 = Hasher.extend({
/**
* Configuration options.
*
* @property {number} outputLength
* The desired number of bits in the output hash.
* Only values permitted are: 224, 256, 384, 512.
* Default: 512
*/
cfg: Hasher.cfg.extend({
outputLength: 512
}),
_doReset: function () {
var state = this._state = []
for (var i = 0; i < 25; i++) {
state[i] = new X64Word.init();
}
this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
},
_doProcessBlock: function (M, offset) {
// Shortcuts
var state = this._state;
var nBlockSizeLanes = this.blockSize / 2;
// Absorb
for (var i = 0; i < nBlockSizeLanes; i++) {
// Shortcuts
var M2i = M[offset + 2 * i];
var M2i1 = M[offset + 2 * i + 1];
// Swap endian
M2i = (
(((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) |
(((M2i << 24) | (M2i >>> 8)) & 0xff00ff00)
);
M2i1 = (
(((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) |
(((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00)
);
// Absorb message into state
var lane = state[i];
lane.high ^= M2i1;
lane.low ^= M2i;
}
// Rounds
for (var round = 0; round < 24; round++) {
// Theta
for (var x = 0; x < 5; x++) {
// Mix column lanes
var tMsw = 0, tLsw = 0;
for (var y = 0; y < 5; y++) {
var lane = state[x + 5 * y];
tMsw ^= lane.high;
tLsw ^= lane.low;
}
// Temporary values
var Tx = T[x];
Tx.high = tMsw;
Tx.low = tLsw;
}
for (var x = 0; x < 5; x++) {
// Shortcuts
var Tx4 = T[(x + 4) % 5];
var Tx1 = T[(x + 1) % 5];
var Tx1Msw = Tx1.high;
var Tx1Lsw = Tx1.low;
// Mix surrounding columns
var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
for (var y = 0; y < 5; y++) {
var lane = state[x + 5 * y];
lane.high ^= tMsw;
lane.low ^= tLsw;
}
}
// Rho Pi
for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
// Shortcuts
var lane = state[laneIndex];
var laneMsw = lane.high;
var laneLsw = lane.low;
var rhoOffset = RHO_OFFSETS[laneIndex];
// Rotate lanes
if (rhoOffset < 32) {
var tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
var tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
} else /* if (rhoOffset >= 32) */ {
var tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
var tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
}
// Transpose lanes
var TPiLane = T[PI_INDEXES[laneIndex]];
TPiLane.high = tMsw;
TPiLane.low = tLsw;
}
// Rho pi at x = y = 0
var T0 = T[0];
var state0 = state[0];
T0.high = state0.high;
T0.low = state0.low;
// Chi
for (var x = 0; x < 5; x++) {
for (var y = 0; y < 5; y++) {
// Shortcuts
var laneIndex = x + 5 * y;
var lane = state[laneIndex];
var TLane = T[laneIndex];
var Tx1Lane = T[((x + 1) % 5) + 5 * y];
var Tx2Lane = T[((x + 2) % 5) + 5 * y];
// Mix rows
lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low);
}
}
// Iota
var lane = state[0];
var roundConstant = ROUND_CONSTANTS[round];
lane.high ^= roundConstant.high;
lane.low ^= roundConstant.low;;
}
},
_doFinalize: function () {
// Shortcuts
var data = this._data;
var dataWords = data.words;
var nBitsTotal = this._nDataBytes * 8;
var nBitsLeft = data.sigBytes * 8;
var blockSizeBits = this.blockSize * 32;
// Add padding
dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
data.sigBytes = dataWords.length * 4;
// Hash final blocks
this._process();
// Shortcuts
var state = this._state;
var outputLengthBytes = this.cfg.outputLength / 8;
var outputLengthLanes = outputLengthBytes / 8;
// Squeeze
var hashWords = [];
for (var i = 0; i < outputLengthLanes; i++) {
// Shortcuts
var lane = state[i];
var laneMsw = lane.high;
var laneLsw = lane.low;
// Swap endian
laneMsw = (
(((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) |
(((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00)
);
laneLsw = (
(((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) |
(((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00)
);
// Squeeze state to retrieve hash
hashWords.push(laneLsw);
hashWords.push(laneMsw);
}
// Return final computed hash
return new WordArray.init(hashWords, outputLengthBytes);
},
clone: function () {
var clone = Hasher.clone.call(this);
var state = clone._state = this._state.slice(0);
for (var i = 0; i < 25; i++) {
state[i] = state[i].clone();
}
return clone;
}
});
/**
* Shortcut function to the hasher's object interface.
*
* @param {WordArray|string} message The message to hash.
*
* @return {WordArray} The hash.
*
* @static
*
* @example
*
* var hash = CryptoJS.SHA3('message');
* var hash = CryptoJS.SHA3(wordArray);
*/
C.SHA3 = Hasher._createHelper(SHA3);
/**
* Shortcut function to the HMAC's object interface.
*
* @param {WordArray|string} message The message to hash.
* @param {WordArray|string} key The secret key.
*
* @return {WordArray} The HMAC.
*
* @static
*
* @example
*
* var hmac = CryptoJS.HmacSHA3(message, key);
*/
C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
}(Math));
return CryptoJS.SHA3;
}));
},{"./core":29,"./x64-core":31}],31:[function(require,module,exports){
;(function (root, factory) {
if (typeof exports === "object") {
// CommonJS
module.exports = exports = factory(require("./core"));
}
else if (typeof define === "function" && define.amd) {
// AMD
define(["./core"], factory);
}
else {
// Global (browser)
factory(root.CryptoJS);
}
}(this, function (CryptoJS) {
(function (undefined) {
// Shortcuts
var C = CryptoJS;
var C_lib = C.lib;
var Base = C_lib.Base;
var X32WordArray = C_lib.WordArray;
/**
* x64 namespace.
*/
var C_x64 = C.x64 = {};
/**
* A 64-bit word.
*/
var X64Word = C_x64.Word = Base.extend({
/**
* Initializes a newly created 64-bit word.
*
* @param {number} high The high 32 bits.
* @param {number} low The low 32 bits.
*
* @example
*
* var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
*/
init: function (high, low) {
this.high = high;
this.low = low;
}
/**
* Bitwise NOTs this word.
*
* @return {X64Word} A new x64-Word object after negating.
*
* @example
*
* var negated = x64Word.not();
*/
// not: function () {
// var high = ~this.high;
// var low = ~this.low;
// return X64Word.create(high, low);
// },
/**
* Bitwise ANDs this word with the passed word.
*
* @param {X64Word} word The x64-Word to AND with this word.
*
* @return {X64Word} A new x64-Word object after ANDing.
*
* @example
*
* var anded = x64Word.and(anotherX64Word);
*/
// and: function (word) {
// var high = this.high & word.high;
// var low = this.low & word.low;
// return X64Word.create(high, low);
// },
/**
* Bitwise ORs this word with the passed word.
*
* @param {X64Word} word The x64-Word to OR with this word.
*
* @return {X64Word} A new x64-Word object after ORing.
*
* @example
*
* var ored = x64Word.or(anotherX64Word);
*/
// or: function (word) {
// var high = this.high | word.high;
// var low = this.low | word.low;
// return X64Word.create(high, low);
// },
/**
* Bitwise XORs this word with the passed word.
*
* @param {X64Word} word The x64-Word to XOR with this word.
*
* @return {X64Word} A new x64-Word object after XORing.
*
* @example
*
* var xored = x64Word.xor(anotherX64Word);
*/
// xor: function (word) {
// var high = this.high ^ word.high;
// var low = this.low ^ word.low;
// return X64Word.create(high, low);
// },
/**
* Shifts this word n bits to the left.
*
* @param {number} n The number of bits to shift.
*
* @return {X64Word} A new x64-Word object after shifting.
*
* @example
*
* var shifted = x64Word.shiftL(25);
*/
// shiftL: function (n) {
// if (n < 32) {
// var high = (this.high << n) | (this.low >>> (32 - n));
// var low = this.low << n;
// } else {
// var high = this.low << (n - 32);
// var low = 0;
// }
// return X64Word.create(high, low);
// },
/**
* Shifts this word n bits to the right.
*
* @param {number} n The number of bits to shift.
*
* @return {X64Word} A new x64-Word object after shifting.
*
* @example
*
* var shifted = x64Word.shiftR(7);
*/
// shiftR: function (n) {
// if (n < 32) {
// var low = (this.low >>> n) | (this.high << (32 - n));
// var high = this.high >>> n;
// } else {
// var low = this.high >>> (n - 32);
// var high = 0;
// }
// return X64Word.create(high, low);
// },
/**
* Rotates this word n bits to the left.
*
* @param {number} n The number of bits to rotate.
*
* @return {X64Word} A new x64-Word object after rotating.
*
* @example
*
* var rotated = x64Word.rotL(25);
*/
// rotL: function (n) {
// return this.shiftL(n).or(this.shiftR(64 - n));
// },
/**
* Rotates this word n bits to the right.
*
* @param {number} n The number of bits to rotate.
*
* @return {X64Word} A new x64-Word object after rotating.
*
* @example
*
* var rotated = x64Word.rotR(7);
*/
// rotR: function (n) {
// return this.shiftR(n).or(this.shiftL(64 - n));
// },
/**
* Adds this word with the passed word.
*
* @param {X64Word} word The x64-Word to add with this word.
*
* @return {X64Word} A new x64-Word object after adding.
*
* @example
*
* var added = x64Word.add(anotherX64Word);
*/
// add: function (word) {
// var low = (this.low + word.low) | 0;
// var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
// var high = (this.high + word.high + carry) | 0;
// return X64Word.create(high, low);
// }
});
/**
* An array of 64-bit words.
*
* @property {Array} words The array of CryptoJS.x64.Word objects.
* @property {number} sigBytes The number of significant bytes in this word array.
*/
var X64WordArray = C_x64.WordArray = Base.extend({
/**
* Initializes a newly created word array.
*
* @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
* @param {number} sigBytes (Optional) The number of significant bytes in the words.
*
* @example
*
* var wordArray = CryptoJS.x64.WordArray.create();
*
* var wordArray = CryptoJS.x64.WordArray.create([
* CryptoJS.x64.Word.create(0x00010203, 0x04050607),
* CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
* ]);
*
* var wordArray = CryptoJS.x64.WordArray.create([
* CryptoJS.x64.Word.create(0x00010203, 0x04050607),
* CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
* ], 10);
*/
init: function (words, sigBytes) {
words = this.words = words || [];
if (sigBytes != undefined) {
this.sigBytes = sigBytes;
} else {
this.sigBytes = words.length * 8;
}
},
/**
* Converts this 64-bit word array to a 32-bit word array.
*
* @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
*
* @example
*
* var x32WordArray = x64WordArray.toX32();
*/
toX32: function () {
// Shortcuts
var x64Words = this.words;
var x64WordsLength = x64Words.length;
// Convert
var x32Words = [];
for (var i = 0; i < x64WordsLength; i++) {
var x64Word = x64Words[i];
x32Words.push(x64Word.high);
x32Words.push(x64Word.low);
}
return X32WordArray.create(x32Words, this.sigBytes);
},
/**
* Creates a copy of this word array.
*
* @return {X64WordArray} The clone.
*
* @example
*
* var clone = x64WordArray.clone();
*/
clone: function () {
var clone = Base.clone.call(this);
// Clone "words" array
var words = clone.words = this.words.slice(0);
// Clone each X64Word object
var wordsLength = words.length;
for (var i = 0; i < wordsLength; i++) {
words[i] = words[i].clone();
}
return clone;
}
});
}());
return CryptoJS;
}));
},{"./core":29}],"bignumber.js":[function(require,module,exports){
'use strict'; 'use strict';
module.exports = BigNumber; // jshint ignore:line module.exports = BigNumber; // jshint ignore:line
...@@ -5272,7 +3872,7 @@ if (typeof window !== 'undefined' && typeof window.web3 === 'undefined') { ...@@ -5272,7 +3872,7 @@ if (typeof window !== 'undefined' && typeof window.web3 === 'undefined') {
module.exports = web3; module.exports = web3;
},{"./lib/web3":9,"./lib/web3/contract":11,"./lib/web3/httpprovider":19,"./lib/web3/qtsync":24}]},{},["web3"]) },{"./lib/web3":8,"./lib/web3/contract":10,"./lib/web3/httpprovider":18,"./lib/web3/qtsync":23}]},{},["web3"])
//# sourceMappingURL=web3-light.js.map //# sourceMappingURL=web3-light.js.map
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment