diff --git a/dist/gnosis.js b/dist/gnosis.js index 0f157a7..77a9c03 100644 --- a/dist/gnosis.js +++ b/dist/gnosis.js @@ -61,7 +61,7 @@ var Gnosis = /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 134); +/******/ return __webpack_require__(__webpack_require__.s = 139); /******/ }) /************************************************************************/ /******/ ([ @@ -831,6 +831,13 @@ var Gnosis = /***/ }), /* 1 */ +/***/ (function(module, exports) { + +var core = module.exports = {version: '2.4.0'}; +if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef + +/***/ }), +/* 2 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -869,9 +876,9 @@ var Gnosis = */ -var BigNumber = __webpack_require__(42); -var sha3 = __webpack_require__(43); -var utf8 = __webpack_require__(309); +var BigNumber = __webpack_require__(43); +var sha3 = __webpack_require__(44); +var utf8 = __webpack_require__(310); var unitMap = { 'noether': '0', @@ -1465,7 +1472,7 @@ module.exports = { /***/ }), -/* 2 */ +/* 3 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -2344,19 +2351,12 @@ module.exports = { })); -/***/ }), -/* 3 */ -/***/ (function(module, exports) { - -var core = module.exports = {version: '2.4.0'}; -if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef - /***/ }), /* 4 */ /***/ (function(module, exports, __webpack_require__) { -var store = __webpack_require__(69)('wks') - , uid = __webpack_require__(47) +var store = __webpack_require__(72)('wks') + , uid = __webpack_require__(49) , Symbol = __webpack_require__(5).Symbol , USE_SYMBOL = typeof Symbol == 'function'; @@ -2402,10 +2402,10 @@ if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef * @date 2015 */ -var BigNumber = __webpack_require__(42); -var utils = __webpack_require__(1); -var c = __webpack_require__(58); -var SolidityParam = __webpack_require__(132); +var BigNumber = __webpack_require__(43); +var utils = __webpack_require__(2); +var c = __webpack_require__(60); +var SolidityParam = __webpack_require__(136); /** @@ -2638,9 +2638,75 @@ module.exports = { /* 7 */ /***/ (function(module, exports, __webpack_require__) { -var anObject = __webpack_require__(10) - , IE8_DOM_DEFINE = __webpack_require__(94) - , toPrimitive = __webpack_require__(66) +var global = __webpack_require__(5) + , core = __webpack_require__(1) + , ctx = __webpack_require__(19) + , hide = __webpack_require__(14) + , PROTOTYPE = 'prototype'; + +var $export = function(type, name, source){ + var IS_FORCED = type & $export.F + , IS_GLOBAL = type & $export.G + , IS_STATIC = type & $export.S + , IS_PROTO = type & $export.P + , IS_BIND = type & $export.B + , IS_WRAP = type & $export.W + , exports = IS_GLOBAL ? core : core[name] || (core[name] = {}) + , expProto = exports[PROTOTYPE] + , target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE] + , key, own, out; + if(IS_GLOBAL)source = name; + for(key in source){ + // contains in native + own = !IS_FORCED && target && target[key] !== undefined; + if(own && key in exports)continue; + // export native or passed + out = own ? target[key] : source[key]; + // prevent global pollution for namespaces + exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key] + // bind timers to global for call from export context + : IS_BIND && own ? ctx(out, global) + // wrap global constructors for prevent change them in library + : IS_WRAP && target[key] == out ? (function(C){ + var F = function(a, b, c){ + if(this instanceof C){ + switch(arguments.length){ + case 0: return new C; + case 1: return new C(a); + case 2: return new C(a, b); + } return new C(a, b, c); + } return C.apply(this, arguments); + }; + F[PROTOTYPE] = C[PROTOTYPE]; + return F; + // make static versions for prototype methods + })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out; + // export proto methods to core.%CONSTRUCTOR%.methods.%NAME% + if(IS_PROTO){ + (exports.virtual || (exports.virtual = {}))[key] = out; + // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME% + if(type & $export.R && expProto && !expProto[key])hide(expProto, key, out); + } + } +}; +// type bitmap +$export.F = 1; // forced +$export.G = 2; // global +$export.S = 4; // static +$export.P = 8; // proto +$export.B = 16; // bind +$export.W = 32; // wrap +$export.U = 64; // safe +$export.R = 128; // real proto method for `library` +module.exports = $export; + +/***/ }), +/* 8 */ +/***/ (function(module, exports, __webpack_require__) { + +var anObject = __webpack_require__(9) + , IE8_DOM_DEFINE = __webpack_require__(95) + , toPrimitive = __webpack_require__(68) , dP = Object.defineProperty; exports.f = __webpack_require__(11) ? Object.defineProperty : function defineProperty(O, P, Attributes){ @@ -2656,11 +2722,21 @@ exports.f = __webpack_require__(11) ? Object.defineProperty : function definePro }; /***/ }), -/* 8 */ +/* 9 */ +/***/ (function(module, exports, __webpack_require__) { + +var isObject = __webpack_require__(20); +module.exports = function(it){ + if(!isObject(it))throw TypeError(it + ' is not an object!'); + return it; +}; + +/***/ }), +/* 10 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityParam = __webpack_require__(132); +var SolidityParam = __webpack_require__(136); /** * SolidityType prototype is used to encode/decode solidity params of certain type @@ -2916,88 +2992,12 @@ SolidityType.prototype.decode = function (bytes, offset, name) { module.exports = SolidityType; -/***/ }), -/* 9 */ -/***/ (function(module, exports, __webpack_require__) { - -var global = __webpack_require__(5) - , core = __webpack_require__(3) - , ctx = __webpack_require__(31) - , hide = __webpack_require__(14) - , PROTOTYPE = 'prototype'; - -var $export = function(type, name, source){ - var IS_FORCED = type & $export.F - , IS_GLOBAL = type & $export.G - , IS_STATIC = type & $export.S - , IS_PROTO = type & $export.P - , IS_BIND = type & $export.B - , IS_WRAP = type & $export.W - , exports = IS_GLOBAL ? core : core[name] || (core[name] = {}) - , expProto = exports[PROTOTYPE] - , target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE] - , key, own, out; - if(IS_GLOBAL)source = name; - for(key in source){ - // contains in native - own = !IS_FORCED && target && target[key] !== undefined; - if(own && key in exports)continue; - // export native or passed - out = own ? target[key] : source[key]; - // prevent global pollution for namespaces - exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key] - // bind timers to global for call from export context - : IS_BIND && own ? ctx(out, global) - // wrap global constructors for prevent change them in library - : IS_WRAP && target[key] == out ? (function(C){ - var F = function(a, b, c){ - if(this instanceof C){ - switch(arguments.length){ - case 0: return new C; - case 1: return new C(a); - case 2: return new C(a, b); - } return new C(a, b, c); - } return C.apply(this, arguments); - }; - F[PROTOTYPE] = C[PROTOTYPE]; - return F; - // make static versions for prototype methods - })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out; - // export proto methods to core.%CONSTRUCTOR%.methods.%NAME% - if(IS_PROTO){ - (exports.virtual || (exports.virtual = {}))[key] = out; - // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME% - if(type & $export.R && expProto && !expProto[key])hide(expProto, key, out); - } - } -}; -// type bitmap -$export.F = 1; // forced -$export.G = 2; // global -$export.S = 4; // static -$export.P = 8; // proto -$export.B = 16; // bind -$export.W = 32; // wrap -$export.U = 64; // safe -$export.R = 128; // real proto method for `library` -module.exports = $export; - -/***/ }), -/* 10 */ -/***/ (function(module, exports, __webpack_require__) { - -var isObject = __webpack_require__(32); -module.exports = function(it){ - if(!isObject(it))throw TypeError(it + ' is not an object!'); - return it; -}; - /***/ }), /* 11 */ /***/ (function(module, exports, __webpack_require__) { // Thank's IE8 for his funny defineProperty -module.exports = !__webpack_require__(19)(function(){ +module.exports = !__webpack_require__(21)(function(){ return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7; }); @@ -3007,7 +3007,7 @@ module.exports = !__webpack_require__(19)(function(){ // to indexed object, toObject with fallback for non-array-like ES3 strings var IObject = __webpack_require__(98) - , defined = __webpack_require__(63); + , defined = __webpack_require__(65); module.exports = function(it){ return IObject(defined(it)); }; @@ -3043,9 +3043,9 @@ module.exports = function(it){ -var utils = __webpack_require__(1); -var config = __webpack_require__(58); -var Iban = __webpack_require__(59); +var utils = __webpack_require__(2); +var config = __webpack_require__(60); +var Iban = __webpack_require__(61); /** * Should the format output to a big number @@ -3332,7 +3332,7 @@ module.exports = { /* 14 */ /***/ (function(module, exports, __webpack_require__) { -var dP = __webpack_require__(7) +var dP = __webpack_require__(8) , createDesc = __webpack_require__(33); module.exports = __webpack_require__(11) ? function(object, key, value){ return dP.f(object, key, createDesc(1, value)); @@ -3356,7 +3356,7 @@ module.exports = function(it, key){ // 19.1.2.14 / 15.2.3.14 Object.keys(O) var $keys = __webpack_require__(97) - , enumBugKeys = __webpack_require__(70); + , enumBugKeys = __webpack_require__(73); module.exports = Object.keys || function keys(O){ return $keys(O, enumBugKeys); @@ -3366,8 +3366,8 @@ module.exports = Object.keys || function keys(O){ /* 17 */ /***/ (function(module, exports, __webpack_require__) { -var assignValue = __webpack_require__(77), - baseAssignValue = __webpack_require__(78); +var assignValue = __webpack_require__(79), + baseAssignValue = __webpack_require__(80); /** * Copies properties of `source` to `object`. @@ -3434,8 +3434,8 @@ module.exports = copyObject; * @date 2015 */ -var utils = __webpack_require__(1); -var errors = __webpack_require__(28); +var utils = __webpack_require__(2); +var errors = __webpack_require__(30); var Method = function (options) { this.name = options.name; @@ -3580,6 +3580,39 @@ module.exports = Method; /***/ }), /* 19 */ +/***/ (function(module, exports, __webpack_require__) { + +// optional / simple context binding +var aFunction = __webpack_require__(66); +module.exports = function(fn, that, length){ + aFunction(fn); + if(that === undefined)return fn; + switch(length){ + case 1: return function(a){ + return fn.call(that, a); + }; + case 2: return function(a, b){ + return fn.call(that, a, b); + }; + case 3: return function(a, b, c){ + return fn.call(that, a, b, c); + }; + } + return function(/* ...args */){ + return fn.apply(that, arguments); + }; +}; + +/***/ }), +/* 20 */ +/***/ (function(module, exports) { + +module.exports = function(it){ + return typeof it === 'object' ? it !== null : typeof it === 'function'; +}; + +/***/ }), +/* 21 */ /***/ (function(module, exports) { module.exports = function(exec){ @@ -3591,13 +3624,13 @@ module.exports = function(exec){ }; /***/ }), -/* 20 */ +/* 22 */ /***/ (function(module, exports) { module.exports = {}; /***/ }), -/* 21 */ +/* 23 */ /***/ (function(module, exports) { /** @@ -3634,7 +3667,7 @@ module.exports = isObject; /***/ }), -/* 22 */ +/* 24 */ /***/ (function(module, exports) { var g; @@ -3661,7 +3694,7 @@ module.exports = g; /***/ }), -/* 23 */ +/* 25 */ /***/ (function(module, exports) { module.exports = function(module) { @@ -3689,7 +3722,7 @@ module.exports = function(module) { /***/ }), -/* 24 */ +/* 26 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -3704,8 +3737,8 @@ module.exports = { toHash: toHash, getProperty: getProperty, escapeQuotes: escapeQuotes, - equal: __webpack_require__(86), - ucs2length: __webpack_require__(234), + equal: __webpack_require__(88), + ucs2length: __webpack_require__(235), varOccurences: varOccurences, varReplace: varReplace, cleanUpCode: cleanUpCode, @@ -3963,7 +3996,7 @@ function unescapeJsonPointer(str) { /***/ }), -/* 25 */ +/* 27 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -4103,7 +4136,7 @@ function unescapeJsonPointer(str) { })); /***/ }), -/* 26 */ +/* 28 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -4376,13 +4409,13 @@ function unescapeJsonPointer(str) { })); /***/ }), -/* 27 */ +/* 29 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(89), __webpack_require__(90)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(91), __webpack_require__(92)); } else if (typeof define === "function" && define.amd) { // AMD @@ -4513,7 +4546,7 @@ function unescapeJsonPointer(str) { })); /***/ }), -/* 28 */ +/* 30 */ /***/ (function(module, exports) { /* @@ -4562,7 +4595,7 @@ module.exports = { /***/ }), -/* 29 */ +/* 31 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -4588,7 +4621,7 @@ module.exports = { * @date 2015 */ -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); var Property = function (options) { this.name = options.name; @@ -4712,15 +4745,15 @@ module.exports = Property; /***/ }), -/* 30 */ +/* 32 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var $at = __webpack_require__(137)(true); +var $at = __webpack_require__(142)(true); // 21.1.3.27 String.prototype[@@iterator]() -__webpack_require__(93)(String, 'String', function(iterated){ +__webpack_require__(94)(String, 'String', function(iterated){ this._t = String(iterated); // target this._i = 0; // next index // 21.1.5.2.1 %StringIteratorPrototype%.next() @@ -4734,39 +4767,6 @@ __webpack_require__(93)(String, 'String', function(iterated){ return {value: point, done: false}; }); -/***/ }), -/* 31 */ -/***/ (function(module, exports, __webpack_require__) { - -// optional / simple context binding -var aFunction = __webpack_require__(64); -module.exports = function(fn, that, length){ - aFunction(fn); - if(that === undefined)return fn; - switch(length){ - case 1: return function(a){ - return fn.call(that, a); - }; - case 2: return function(a, b){ - return fn.call(that, a, b); - }; - case 3: return function(a, b, c){ - return fn.call(that, a, b, c); - }; - } - return function(/* ...args */){ - return fn.apply(that, arguments); - }; -}; - -/***/ }), -/* 32 */ -/***/ (function(module, exports) { - -module.exports = function(it){ - return typeof it === 'object' ? it !== null : typeof it === 'function'; -}; - /***/ }), /* 33 */ /***/ (function(module, exports) { @@ -4792,18 +4792,28 @@ module.exports = function(it){ /***/ }), /* 35 */ +/***/ (function(module, exports, __webpack_require__) { + +// 7.1.13 ToObject(argument) +var defined = __webpack_require__(65); +module.exports = function(it){ + return Object(defined(it)); +}; + +/***/ }), +/* 36 */ /***/ (function(module, exports) { exports.f = {}.propertyIsEnumerable; /***/ }), -/* 36 */ +/* 37 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(165), __esModule: true }; +module.exports = { "default": __webpack_require__(167), __esModule: true }; /***/ }), -/* 37 */ +/* 38 */ /***/ (function(module, exports) { /** Used for built-in method references. */ @@ -4831,7 +4841,7 @@ module.exports = objectToString; /***/ }), -/* 38 */ +/* 39 */ /***/ (function(module, exports) { /** @@ -4863,7 +4873,7 @@ module.exports = isArray; /***/ }), -/* 39 */ +/* 40 */ /***/ (function(module, exports) { /** @@ -4898,7 +4908,7 @@ module.exports = isObjectLike; /***/ }), -/* 40 */ +/* 41 */ /***/ (function(module, exports) { /** @@ -4924,7 +4934,7 @@ module.exports = nativeKeysIn; /***/ }), -/* 41 */ +/* 42 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -4938,9 +4948,9 @@ module.exports = nativeKeysIn; -var base64 = __webpack_require__(272) -var ieee754 = __webpack_require__(273) -var isArray = __webpack_require__(274) +var base64 = __webpack_require__(273) +var ieee754 = __webpack_require__(274) +var isArray = __webpack_require__(275) exports.Buffer = Buffer exports.SlowBuffer = SlowBuffer @@ -6718,10 +6728,10 @@ function isnan (val) { return val !== val // eslint-disable-line no-self-compare } -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(22))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24))) /***/ }), -/* 42 */ +/* 43 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_RESULT__;/*! bignumber.js v2.0.7 https://github.com/MikeMcl/bignumber.js/LICENCE */ @@ -9411,7 +9421,7 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*! bignumber.js v2.0.7 https://github.com/Mik /***/ }), -/* 43 */ +/* 44 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -9436,8 +9446,8 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/*! bignumber.js v2.0.7 https://github.com/Mik * @date 2015 */ -var CryptoJS = __webpack_require__(286); -var sha3 = __webpack_require__(131); +var CryptoJS = __webpack_require__(287); +var sha3 = __webpack_require__(135); module.exports = function (value, options) { if (options && options.encoding === 'hex') { @@ -9455,7 +9465,7 @@ module.exports = function (value, options) { /***/ }), -/* 44 */ +/* 45 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -9463,11 +9473,11 @@ module.exports = function (value, options) { exports.__esModule = true; -var _isIterable2 = __webpack_require__(345); +var _isIterable2 = __webpack_require__(346); var _isIterable3 = _interopRequireDefault(_isIterable2); -var _getIterator2 = __webpack_require__(348); +var _getIterator2 = __webpack_require__(349); var _getIterator3 = _interopRequireDefault(_getIterator2); @@ -9512,7 +9522,7 @@ exports.default = function () { }(); /***/ }), -/* 45 */ +/* 46 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -9521,128 +9531,178 @@ exports.default = function () { Object.defineProperty(exports, "__esModule", { value: true }); -exports.sendTransactionAndGetResult = exports.Decimal = undefined; +exports.sendTransactionAndGetResult = exports.TransactionError = exports.Decimal = undefined; -var _from = __webpack_require__(36); +var _from = __webpack_require__(37); var _from2 = _interopRequireDefault(_from); -var _promise = __webpack_require__(53); +var _promise = __webpack_require__(55); var _promise2 = _interopRequireDefault(_promise); -var _toConsumableArray2 = __webpack_require__(74); +var _assign = __webpack_require__(138); + +var _assign2 = _interopRequireDefault(_assign); + +var _getPrototypeOf = __webpack_require__(355); + +var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf); + +var _classCallCheck2 = __webpack_require__(109); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(358); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _inherits2 = __webpack_require__(359); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _stringify = __webpack_require__(367); + +var _stringify2 = _interopRequireDefault(_stringify); + +var _toConsumableArray2 = __webpack_require__(52); var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); -var _regenerator = __webpack_require__(51); +var _regenerator = __webpack_require__(53); var _regenerator2 = _interopRequireDefault(_regenerator); -var _asyncToGenerator2 = __webpack_require__(52); +var _asyncToGenerator2 = __webpack_require__(54); var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); -var _slicedToArray2 = __webpack_require__(44); +var _slicedToArray2 = __webpack_require__(45); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); -var _typeof2 = __webpack_require__(92); +var _typeof2 = __webpack_require__(47); var _typeof3 = _interopRequireDefault(_typeof2); -var _functionsIn2 = __webpack_require__(351); +var _functionsIn2 = __webpack_require__(369); var _functionsIn3 = _interopRequireDefault(_functionsIn2); -var _filter2 = __webpack_require__(354); +var _filter2 = __webpack_require__(372); var _filter3 = _interopRequireDefault(_filter2); -var _clone2 = __webpack_require__(355); +var _clone2 = __webpack_require__(373); var _clone3 = _interopRequireDefault(_clone2); -var _defaults2 = __webpack_require__(369); +var _defaults2 = __webpack_require__(387); var _defaults3 = _interopRequireDefault(_defaults2); -var _forOwn2 = __webpack_require__(108); +var _forOwn2 = __webpack_require__(112); var _forOwn3 = _interopRequireDefault(_forOwn2); -var _isNumber2 = __webpack_require__(372); +var _isNumber2 = __webpack_require__(390); var _isNumber3 = _interopRequireDefault(_isNumber2); -var _isBoolean2 = __webpack_require__(373); +var _isBoolean2 = __webpack_require__(391); var _isBoolean3 = _interopRequireDefault(_isBoolean2); -var _isString2 = __webpack_require__(374); +var _isString2 = __webpack_require__(392); var _isString3 = _interopRequireDefault(_isString2); -var _has2 = __webpack_require__(375); +var _has2 = __webpack_require__(393); var _has3 = _interopRequireDefault(_has2); -var _isArray2 = __webpack_require__(38); +var _isArray2 = __webpack_require__(39); var _isArray3 = _interopRequireDefault(_isArray2); var sendTransactionAndGetResult = exports.sendTransactionAndGetResult = function () { var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(opts) { - var _caller; + var caller, txHash, txResult, matchingLog, _caller$opts$methodNa; - var caller, result, matchingLog; return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { switch (_context3.prev = _context3.next) { case 0: opts = opts || {}; + caller = void 0, txHash = void 0, txResult = void 0, matchingLog = void 0; + _context3.prev = 2; caller = opts.callerContract; if (!(0, _has3.default)(caller, 'deployed')) { - _context3.next = 6; + _context3.next = 8; break; } - _context3.next = 5; + _context3.next = 7; return caller.deployed(); - case 5: + case 7: caller = _context3.sent; - case 6: - _context3.next = 8; - return (_caller = caller)[opts.methodName].apply(_caller, (0, _toConsumableArray3.default)(opts.methodArgs)); - case 8: - result = _context3.sent; - matchingLog = requireEventFromTXResult(result, opts.eventName); + _context3.next = 10; + return (_caller$opts$methodNa = caller[opts.methodName]).sendTransaction.apply(_caller$opts$methodNa, (0, _toConsumableArray3.default)(opts.methodArgs)); + + case 10: + txHash = _context3.sent; + + + if (opts.log != null) { + opts.log('got tx hash ' + txHash + ' for call ' + formatCallSignature({ caller: caller, methodName: opts.methodName, methodArgs: opts.methodArgs })); + } + + _context3.next = 14; + return caller.constructor.syncTransaction(txHash); + + case 14: + txResult = _context3.sent; + + matchingLog = requireEventFromTXResult(txResult, opts.eventName); if (!(opts.resultContract == null)) { - _context3.next = 14; + _context3.next = 20; break; } return _context3.abrupt('return', matchingLog.args[opts.eventArgName]); - case 14: - _context3.next = 16; + case 20: + opts.log('tx hash ' + txHash.slice(0, 6) + '..' + txHash.slice(-4) + ' returned ' + opts.resultContract.contractName + '(' + matchingLog.args[opts.eventArgName] + ')'); + _context3.next = 23; return opts.resultContract.at(matchingLog.args[opts.eventArgName]); - case 16: + case 23: return _context3.abrupt('return', _context3.sent); - case 17: + case 24: + _context3.next = 29; + break; + + case 26: + _context3.prev = 26; + _context3.t0 = _context3['catch'](2); + throw new TransactionError((0, _assign2.default)({ + caller: caller, txHash: txHash, txResult: txResult, matchingLog: matchingLog, + subError: _context3.t0 + }, opts)); + + case 29: case 'end': return _context3.stop(); } } - }, _callee3, this); + }, _callee3, this, [[2, 26]]); })); return function sendTransactionAndGetResult(_x) { @@ -9657,10 +9717,11 @@ var sendTransactionAndGetResult = exports.sendTransactionAndGetResult = function exports.normalizeWeb3Args = normalizeWeb3Args; exports.wrapWeb3Function = wrapWeb3Function; exports.requireEventFromTXResult = requireEventFromTXResult; +exports.formatCallSignature = formatCallSignature; exports.promisify = promisify; exports.promisifyAll = promisifyAll; -var _decimal = __webpack_require__(376); +var _decimal = __webpack_require__(394); var _decimal2 = _interopRequireDefault(_decimal); @@ -9913,6 +9974,7 @@ function wrapWeb3Function(spec) { var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() { var opts, speccedOpts, + callMetadata, _args = arguments; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { @@ -9920,13 +9982,17 @@ function wrapWeb3Function(spec) { case 0: opts = getOptsFromArgs(_args); speccedOpts = spec(this, opts); - _context.next = 4; - return sendTransactionAndGetResult(getWeb3CallMetadata(_args, opts, speccedOpts)); + callMetadata = getWeb3CallMetadata(_args, opts, speccedOpts); - case 4: + callMetadata.log = this.log; + + _context.next = 6; + return sendTransactionAndGetResult(callMetadata); + + case 6: return _context.abrupt('return', _context.sent); - case 5: + case 7: case 'end': return _context.stop(); } @@ -10028,6 +10094,29 @@ function requireEventFromTXResult(result, eventName) { return matchingLogs[0]; } +function formatCallSignature(opts) { + return opts.caller.constructor.contractName + '(' + opts.caller.address.slice(0, 6) + '..' + opts.caller.address.slice(-4) + ').' + opts.methodName + '(' + opts.methodArgs.map(function (v) { + return (0, _stringify2.default)(v); + }).join(', ') + ')'; +} + +var TransactionError = exports.TransactionError = function (_Error) { + (0, _inherits3.default)(TransactionError, _Error); + + function TransactionError(opts) { + (0, _classCallCheck3.default)(this, TransactionError); + + var _this = (0, _possibleConstructorReturn3.default)(this, (TransactionError.__proto__ || (0, _getPrototypeOf2.default)(TransactionError)).call(this, '' + formatCallSignature(opts) + (opts.txHash == null ? '' : '\n\n with transaction hash ' + opts.txHash) + '\n\n failed with ' + opts.subError)); + + (0, _assign2.default)(_this, opts); + + _this.name = 'TransactionError'; + return _this; + } + + return TransactionError; +}(Error); + function promisify(fn) { return new Proxy(fn, { apply: function apply(target, thisArg, args) { @@ -10057,13 +10146,40 @@ function promisifyAll(obj) { } /***/ }), -/* 46 */ +/* 47 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _iterator = __webpack_require__(140); + +var _iterator2 = _interopRequireDefault(_iterator); + +var _symbol = __webpack_require__(150); + +var _symbol2 = _interopRequireDefault(_symbol); + +var _typeof = typeof _symbol2.default === "function" && typeof _iterator2.default === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj; }; + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = typeof _symbol2.default === "function" && _typeof(_iterator2.default) === "symbol" ? function (obj) { + return typeof obj === "undefined" ? "undefined" : _typeof(obj); +} : function (obj) { + return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof(obj); +}; + +/***/ }), +/* 48 */ /***/ (function(module, exports) { module.exports = true; /***/ }), -/* 47 */ +/* 49 */ /***/ (function(module, exports) { var id = 0 @@ -10073,10 +10189,10 @@ module.exports = function(key){ }; /***/ }), -/* 48 */ +/* 50 */ /***/ (function(module, exports, __webpack_require__) { -var def = __webpack_require__(7).f +var def = __webpack_require__(8).f , has = __webpack_require__(15) , TAG = __webpack_require__(4)('toStringTag'); @@ -10085,23 +10201,13 @@ module.exports = function(it, tag, stat){ }; /***/ }), -/* 49 */ -/***/ (function(module, exports, __webpack_require__) { - -// 7.1.13 ToObject(argument) -var defined = __webpack_require__(63); -module.exports = function(it){ - return Object(defined(it)); -}; - -/***/ }), -/* 50 */ +/* 51 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(143); +__webpack_require__(147); var global = __webpack_require__(5) , hide = __webpack_require__(14) - , Iterators = __webpack_require__(20) + , Iterators = __webpack_require__(22) , TO_STRING_TAG = __webpack_require__(4)('toStringTag'); for(var collections = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList', 'CSSRuleList'], i = 0; i < 5; i++){ @@ -10113,14 +10219,41 @@ for(var collections = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList' } /***/ }), -/* 51 */ +/* 52 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(168); +"use strict"; + + +exports.__esModule = true; + +var _from = __webpack_require__(37); + +var _from2 = _interopRequireDefault(_from); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (arr) { + if (Array.isArray(arr)) { + for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { + arr2[i] = arr[i]; + } + return arr2; + } else { + return (0, _from2.default)(arr); + } +}; /***/ }), -/* 52 */ +/* 53 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(170); + + +/***/ }), +/* 54 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -10128,7 +10261,7 @@ module.exports = __webpack_require__(168); exports.__esModule = true; -var _promise = __webpack_require__(53); +var _promise = __webpack_require__(55); var _promise2 = _interopRequireDefault(_promise); @@ -10164,13 +10297,13 @@ exports.default = function (fn) { }; /***/ }), -/* 53 */ +/* 55 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(170), __esModule: true }; +module.exports = { "default": __webpack_require__(172), __esModule: true }; /***/ }), -/* 54 */ +/* 56 */ /***/ (function(module, exports) { /** @@ -10213,10 +10346,10 @@ module.exports = eq; /***/ }), -/* 55 */ +/* 57 */ /***/ (function(module, exports, __webpack_require__) { -var overArg = __webpack_require__(83); +var overArg = __webpack_require__(85); /* Built-in method references for those with the same name as other `lodash` methods. */ var nativeKeys = overArg(Object.keys, Object); @@ -10225,10 +10358,10 @@ module.exports = nativeKeys; /***/ }), -/* 56 */ +/* 58 */ /***/ (function(module, exports, __webpack_require__) { -var eq = __webpack_require__(54); +var eq = __webpack_require__(56); /** * Gets the index at which the `key` is found in `array` of key-value pairs. @@ -10252,7 +10385,7 @@ module.exports = assocIndexOf; /***/ }), -/* 57 */ +/* 59 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -10561,7 +10694,7 @@ module.exports = assocIndexOf; })); /***/ }), -/* 58 */ +/* 60 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -10601,7 +10734,7 @@ module.exports = assocIndexOf; /// required to define ETH_BIGNUMBER_ROUNDING_MODE -var BigNumber = __webpack_require__(42); +var BigNumber = __webpack_require__(43); var ETH_UNITS = [ 'wei', @@ -10646,7 +10779,7 @@ module.exports = { /***/ }), -/* 59 */ +/* 61 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -10671,7 +10804,7 @@ module.exports = { * @date 2015 */ -var BigNumber = __webpack_require__(42); +var BigNumber = __webpack_require__(43); var padLeft = function (string, bytes) { var result = string; @@ -10879,7 +11012,7 @@ module.exports = Iban; /***/ }), -/* 60 */ +/* 62 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -10909,7 +11042,7 @@ module.exports = Iban; */ var formatters = __webpack_require__(13); -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); /** * Converts a given topic to a hex string, but also allows null values. @@ -11130,7 +11263,7 @@ module.exports = Filter; /***/ }), -/* 61 */ +/* 63 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -11243,7 +11376,7 @@ module.exports = { /***/ }), -/* 62 */ +/* 64 */ /***/ (function(module, exports) { // 7.1.4 ToInteger @@ -11254,7 +11387,7 @@ module.exports = function(it){ }; /***/ }), -/* 63 */ +/* 65 */ /***/ (function(module, exports) { // 7.2.1 RequireObjectCoercible(argument) @@ -11264,7 +11397,7 @@ module.exports = function(it){ }; /***/ }), -/* 64 */ +/* 66 */ /***/ (function(module, exports) { module.exports = function(it){ @@ -11273,10 +11406,10 @@ module.exports = function(it){ }; /***/ }), -/* 65 */ +/* 67 */ /***/ (function(module, exports, __webpack_require__) { -var isObject = __webpack_require__(32) +var isObject = __webpack_require__(20) , document = __webpack_require__(5).document // in old IE typeof document.createElement is 'object' , is = isObject(document) && isObject(document.createElement); @@ -11285,11 +11418,11 @@ module.exports = function(it){ }; /***/ }), -/* 66 */ +/* 68 */ /***/ (function(module, exports, __webpack_require__) { // 7.1.1 ToPrimitive(input [, PreferredType]) -var isObject = __webpack_require__(32); +var isObject = __webpack_require__(20); // instead of the ES6 spec version, we didn't implement @@toPrimitive case // and the second argument - flag - preferred type is a string module.exports = function(it, S){ @@ -11302,28 +11435,75 @@ module.exports = function(it, S){ }; /***/ }), -/* 67 */ +/* 69 */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) +var anObject = __webpack_require__(9) + , dPs = __webpack_require__(144) + , enumBugKeys = __webpack_require__(73) + , IE_PROTO = __webpack_require__(71)('IE_PROTO') + , Empty = function(){ /* empty */ } + , PROTOTYPE = 'prototype'; + +// Create object with fake `null` prototype: use iframe Object with cleared prototype +var createDict = function(){ + // Thrash, waste and sodomy: IE GC bug + var iframe = __webpack_require__(67)('iframe') + , i = enumBugKeys.length + , lt = '<' + , gt = '>' + , iframeDocument; + iframe.style.display = 'none'; + __webpack_require__(99).appendChild(iframe); + iframe.src = 'javascript:'; // eslint-disable-line no-script-url + // createDict = iframe.contentWindow.Object; + // html.removeChild(iframe); + iframeDocument = iframe.contentWindow.document; + iframeDocument.open(); + iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt); + iframeDocument.close(); + createDict = iframeDocument.F; + while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]]; + return createDict(); +}; + +module.exports = Object.create || function create(O, Properties){ + var result; + if(O !== null){ + Empty[PROTOTYPE] = anObject(O); + result = new Empty; + Empty[PROTOTYPE] = null; + // add "__proto__" for Object.getPrototypeOf polyfill + result[IE_PROTO] = O; + } else result = createDict(); + return Properties === undefined ? result : dPs(result, Properties); +}; + + +/***/ }), +/* 70 */ /***/ (function(module, exports, __webpack_require__) { // 7.1.15 ToLength -var toInteger = __webpack_require__(62) +var toInteger = __webpack_require__(64) , min = Math.min; module.exports = function(it){ return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991 }; /***/ }), -/* 68 */ +/* 71 */ /***/ (function(module, exports, __webpack_require__) { -var shared = __webpack_require__(69)('keys') - , uid = __webpack_require__(47); +var shared = __webpack_require__(72)('keys') + , uid = __webpack_require__(49); module.exports = function(key){ return shared[key] || (shared[key] = uid(key)); }; /***/ }), -/* 69 */ +/* 72 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(5) @@ -11334,7 +11514,7 @@ module.exports = function(key){ }; /***/ }), -/* 70 */ +/* 73 */ /***/ (function(module, exports) { // IE 8- don't enum bug keys @@ -11343,73 +11523,46 @@ module.exports = ( ).split(','); /***/ }), -/* 71 */ +/* 74 */ /***/ (function(module, exports, __webpack_require__) { exports.f = __webpack_require__(4); /***/ }), -/* 72 */ +/* 75 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(5) - , core = __webpack_require__(3) - , LIBRARY = __webpack_require__(46) - , wksExt = __webpack_require__(71) - , defineProperty = __webpack_require__(7).f; + , core = __webpack_require__(1) + , LIBRARY = __webpack_require__(48) + , wksExt = __webpack_require__(74) + , defineProperty = __webpack_require__(8).f; module.exports = function(name){ var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {}); if(name.charAt(0) != '_' && !(name in $Symbol))defineProperty($Symbol, name, {value: wksExt.f(name)}); }; /***/ }), -/* 73 */ +/* 76 */ /***/ (function(module, exports) { exports.f = Object.getOwnPropertySymbols; /***/ }), -/* 74 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -exports.__esModule = true; - -var _from = __webpack_require__(36); - -var _from2 = _interopRequireDefault(_from); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -exports.default = function (arr) { - if (Array.isArray(arr)) { - for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { - arr2[i] = arr[i]; - } - - return arr2; - } else { - return (0, _from2.default)(arr); - } -}; - -/***/ }), -/* 75 */ +/* 77 */ /***/ (function(module, exports, __webpack_require__) { -var classof = __webpack_require__(76) +var classof = __webpack_require__(78) , ITERATOR = __webpack_require__(4)('iterator') - , Iterators = __webpack_require__(20); -module.exports = __webpack_require__(3).getIteratorMethod = function(it){ + , Iterators = __webpack_require__(22); +module.exports = __webpack_require__(1).getIteratorMethod = function(it){ if(it != undefined)return it[ITERATOR] || it['@@iterator'] || Iterators[classof(it)]; }; /***/ }), -/* 76 */ +/* 78 */ /***/ (function(module, exports, __webpack_require__) { // getting tag from 19.1.3.6 Object.prototype.toString() @@ -11437,11 +11590,11 @@ module.exports = function(it){ }; /***/ }), -/* 77 */ +/* 79 */ /***/ (function(module, exports, __webpack_require__) { -var baseAssignValue = __webpack_require__(78), - eq = __webpack_require__(54); +var baseAssignValue = __webpack_require__(80), + eq = __webpack_require__(56); /** Used for built-in method references. */ var objectProto = Object.prototype; @@ -11471,10 +11624,10 @@ module.exports = assignValue; /***/ }), -/* 78 */ +/* 80 */ /***/ (function(module, exports, __webpack_require__) { -var defineProperty = __webpack_require__(185); +var defineProperty = __webpack_require__(186); /** * The base implementation of `assignValue` and `assignMergeValue` without @@ -11502,11 +11655,11 @@ module.exports = baseAssignValue; /***/ }), -/* 79 */ +/* 81 */ /***/ (function(module, exports, __webpack_require__) { -var baseRest = __webpack_require__(80), - isIterateeCall = __webpack_require__(190); +var baseRest = __webpack_require__(82), + isIterateeCall = __webpack_require__(191); /** * Creates a function like `_.assign`. @@ -11545,12 +11698,12 @@ module.exports = createAssigner; /***/ }), -/* 80 */ +/* 82 */ /***/ (function(module, exports, __webpack_require__) { -var identity = __webpack_require__(187), - overRest = __webpack_require__(188), - setToString = __webpack_require__(189); +var identity = __webpack_require__(188), + overRest = __webpack_require__(189), + setToString = __webpack_require__(190); /** * The base implementation of `_.rest` which doesn't validate or coerce arguments. @@ -11568,7 +11721,7 @@ module.exports = baseRest; /***/ }), -/* 81 */ +/* 83 */ /***/ (function(module, exports) { /** @@ -11595,11 +11748,11 @@ module.exports = apply; /***/ }), -/* 82 */ +/* 84 */ /***/ (function(module, exports, __webpack_require__) { -var baseGetTag = __webpack_require__(37), - isObject = __webpack_require__(21); +var baseGetTag = __webpack_require__(38), + isObject = __webpack_require__(23); /** `Object#toString` result references. */ var asyncTag = '[object AsyncFunction]', @@ -11638,7 +11791,7 @@ module.exports = isFunction; /***/ }), -/* 83 */ +/* 85 */ /***/ (function(module, exports) { /** @@ -11659,10 +11812,10 @@ module.exports = overArg; /***/ }), -/* 84 */ +/* 86 */ /***/ (function(module, exports, __webpack_require__) { -var freeGlobal = __webpack_require__(200); +var freeGlobal = __webpack_require__(201); /** Detect free variable `self`. */ var freeSelf = typeof self == 'object' && self && self.Object === Object && self; @@ -11674,17 +11827,17 @@ module.exports = root; /***/ }), -/* 85 */ +/* 87 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var url = __webpack_require__(228) - , equal = __webpack_require__(86) - , util = __webpack_require__(24) - , SchemaObject = __webpack_require__(120) - , traverse = __webpack_require__(235); +var url = __webpack_require__(229) + , equal = __webpack_require__(88) + , util = __webpack_require__(26) + , SchemaObject = __webpack_require__(124) + , traverse = __webpack_require__(236); module.exports = resolve; @@ -11952,7 +12105,7 @@ function resolveIds(schema) { /***/ }), -/* 86 */ +/* 88 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -12002,13 +12155,13 @@ module.exports = function equal(a, b) { /***/ }), -/* 87 */ +/* 89 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var resolve = __webpack_require__(85); +var resolve = __webpack_require__(87); module.exports = { Validation: errorSubclass(ValidationError), @@ -12043,10 +12196,10 @@ function errorSubclass(Subclass) { /***/ }), -/* 88 */ +/* 90 */ /***/ (function(module, exports, __webpack_require__) { -var Web3 = __webpack_require__(284); +var Web3 = __webpack_require__(285); // dont override global variable if (typeof window !== 'undefined' && typeof window.Web3 === 'undefined') { @@ -12057,7 +12210,7 @@ module.exports = Web3; /***/ }), -/* 89 */ +/* 91 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -12212,7 +12365,7 @@ module.exports = Web3; })); /***/ }), -/* 90 */ +/* 92 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -12360,7 +12513,7 @@ module.exports = Web3; })); /***/ }), -/* 91 */ +/* 93 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -12387,15 +12540,15 @@ module.exports = Web3; var f = __webpack_require__(6); -var SolidityTypeAddress = __webpack_require__(312); -var SolidityTypeBool = __webpack_require__(313); -var SolidityTypeInt = __webpack_require__(314); -var SolidityTypeUInt = __webpack_require__(315); -var SolidityTypeDynamicBytes = __webpack_require__(316); -var SolidityTypeString = __webpack_require__(317); -var SolidityTypeReal = __webpack_require__(318); -var SolidityTypeUReal = __webpack_require__(319); -var SolidityTypeBytes = __webpack_require__(320); +var SolidityTypeAddress = __webpack_require__(313); +var SolidityTypeBool = __webpack_require__(314); +var SolidityTypeInt = __webpack_require__(315); +var SolidityTypeUInt = __webpack_require__(316); +var SolidityTypeDynamicBytes = __webpack_require__(317); +var SolidityTypeString = __webpack_require__(318); +var SolidityTypeReal = __webpack_require__(319); +var SolidityTypeUReal = __webpack_require__(320); +var SolidityTypeBytes = __webpack_require__(321); var isDynamic = function (solidityType, type) { return solidityType.isDynamicType(type) || @@ -12613,47 +12766,20 @@ module.exports = coder; /***/ }), -/* 92 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -exports.__esModule = true; - -var _iterator = __webpack_require__(135); - -var _iterator2 = _interopRequireDefault(_iterator); - -var _symbol = __webpack_require__(146); - -var _symbol2 = _interopRequireDefault(_symbol); - -var _typeof = typeof _symbol2.default === "function" && typeof _iterator2.default === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj; }; - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -exports.default = typeof _symbol2.default === "function" && _typeof(_iterator2.default) === "symbol" ? function (obj) { - return typeof obj === "undefined" ? "undefined" : _typeof(obj); -} : function (obj) { - return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof(obj); -}; - -/***/ }), -/* 93 */ +/* 94 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var LIBRARY = __webpack_require__(46) - , $export = __webpack_require__(9) - , redefine = __webpack_require__(95) +var LIBRARY = __webpack_require__(48) + , $export = __webpack_require__(7) + , redefine = __webpack_require__(96) , hide = __webpack_require__(14) , has = __webpack_require__(15) - , Iterators = __webpack_require__(20) - , $iterCreate = __webpack_require__(138) - , setToStringTag = __webpack_require__(48) - , getPrototypeOf = __webpack_require__(142) + , Iterators = __webpack_require__(22) + , $iterCreate = __webpack_require__(143) + , setToStringTag = __webpack_require__(50) + , getPrototypeOf = __webpack_require__(100) , ITERATOR = __webpack_require__(4)('iterator') , BUGGY = !([].keys && 'next' in [].keys()) // Safari has buggy iterators w/o `next` , FF_ITERATOR = '@@iterator' @@ -12715,66 +12841,19 @@ module.exports = function(Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED return methods; }; -/***/ }), -/* 94 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = !__webpack_require__(11) && !__webpack_require__(19)(function(){ - return Object.defineProperty(__webpack_require__(65)('div'), 'a', {get: function(){ return 7; }}).a != 7; -}); - /***/ }), /* 95 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(14); +module.exports = !__webpack_require__(11) && !__webpack_require__(21)(function(){ + return Object.defineProperty(__webpack_require__(67)('div'), 'a', {get: function(){ return 7; }}).a != 7; +}); /***/ }), /* 96 */ /***/ (function(module, exports, __webpack_require__) { -// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) -var anObject = __webpack_require__(10) - , dPs = __webpack_require__(139) - , enumBugKeys = __webpack_require__(70) - , IE_PROTO = __webpack_require__(68)('IE_PROTO') - , Empty = function(){ /* empty */ } - , PROTOTYPE = 'prototype'; - -// Create object with fake `null` prototype: use iframe Object with cleared prototype -var createDict = function(){ - // Thrash, waste and sodomy: IE GC bug - var iframe = __webpack_require__(65)('iframe') - , i = enumBugKeys.length - , lt = '<' - , gt = '>' - , iframeDocument; - iframe.style.display = 'none'; - __webpack_require__(99).appendChild(iframe); - iframe.src = 'javascript:'; // eslint-disable-line no-script-url - // createDict = iframe.contentWindow.Object; - // html.removeChild(iframe); - iframeDocument = iframe.contentWindow.document; - iframeDocument.open(); - iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt); - iframeDocument.close(); - createDict = iframeDocument.F; - while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]]; - return createDict(); -}; - -module.exports = Object.create || function create(O, Properties){ - var result; - if(O !== null){ - Empty[PROTOTYPE] = anObject(O); - result = new Empty; - Empty[PROTOTYPE] = null; - // add "__proto__" for Object.getPrototypeOf polyfill - result[IE_PROTO] = O; - } else result = createDict(); - return Properties === undefined ? result : dPs(result, Properties); -}; - +module.exports = __webpack_require__(14); /***/ }), /* 97 */ @@ -12782,8 +12861,8 @@ module.exports = Object.create || function create(O, Properties){ var has = __webpack_require__(15) , toIObject = __webpack_require__(12) - , arrayIndexOf = __webpack_require__(140)(false) - , IE_PROTO = __webpack_require__(68)('IE_PROTO'); + , arrayIndexOf = __webpack_require__(145)(false) + , IE_PROTO = __webpack_require__(71)('IE_PROTO'); module.exports = function(object, names){ var O = toIObject(object) @@ -12818,26 +12897,80 @@ module.exports = __webpack_require__(5).document && document.documentElement; /* 100 */ /***/ (function(module, exports, __webpack_require__) { +// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O) +var has = __webpack_require__(15) + , toObject = __webpack_require__(35) + , IE_PROTO = __webpack_require__(71)('IE_PROTO') + , ObjectProto = Object.prototype; + +module.exports = Object.getPrototypeOf || function(O){ + O = toObject(O); + if(has(O, IE_PROTO))return O[IE_PROTO]; + if(typeof O.constructor == 'function' && O instanceof O.constructor){ + return O.constructor.prototype; + } return O instanceof Object ? ObjectProto : null; +}; + +/***/ }), +/* 101 */ +/***/ (function(module, exports, __webpack_require__) { + // 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O) var $keys = __webpack_require__(97) - , hiddenKeys = __webpack_require__(70).concat('length', 'prototype'); + , hiddenKeys = __webpack_require__(73).concat('length', 'prototype'); exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){ return $keys(O, hiddenKeys); }; /***/ }), -/* 101 */ +/* 102 */ +/***/ (function(module, exports, __webpack_require__) { + +var pIE = __webpack_require__(36) + , createDesc = __webpack_require__(33) + , toIObject = __webpack_require__(12) + , toPrimitive = __webpack_require__(68) + , has = __webpack_require__(15) + , IE8_DOM_DEFINE = __webpack_require__(95) + , gOPD = Object.getOwnPropertyDescriptor; + +exports.f = __webpack_require__(11) ? gOPD : function getOwnPropertyDescriptor(O, P){ + O = toIObject(O); + P = toPrimitive(P, true); + if(IE8_DOM_DEFINE)try { + return gOPD(O, P); + } catch(e){ /* empty */ } + if(has(O, P))return createDesc(!pIE.f.call(O, P), O[P]); +}; + +/***/ }), +/* 103 */ /***/ (function(module, exports) { /***/ }), -/* 102 */ +/* 104 */ +/***/ (function(module, exports, __webpack_require__) { + +// most Object methods by ES6 should accept primitives +var $export = __webpack_require__(7) + , core = __webpack_require__(1) + , fails = __webpack_require__(21); +module.exports = function(KEY, exec){ + var fn = (core.Object || {})[KEY] || Object[KEY] + , exp = {}; + exp[KEY] = exec(fn); + $export($export.S + $export.F * fails(function(){ fn(1); }), 'Object', exp); +}; + +/***/ }), +/* 105 */ /***/ (function(module, exports, __webpack_require__) { // call something on iterator step with safe closing on error -var anObject = __webpack_require__(10); +var anObject = __webpack_require__(9); module.exports = function(iterator, fn, value, entries){ try { return entries ? fn(anObject(value)[0], value[1]) : fn(value); @@ -12850,11 +12983,11 @@ module.exports = function(iterator, fn, value, entries){ }; /***/ }), -/* 103 */ +/* 106 */ /***/ (function(module, exports, __webpack_require__) { // check on default Array iterator -var Iterators = __webpack_require__(20) +var Iterators = __webpack_require__(22) , ITERATOR = __webpack_require__(4)('iterator') , ArrayProto = Array.prototype; @@ -12863,7 +12996,7 @@ module.exports = function(it){ }; /***/ }), -/* 104 */ +/* 107 */ /***/ (function(module, exports, __webpack_require__) { var ITERATOR = __webpack_require__(4)('iterator') @@ -12889,13 +13022,13 @@ module.exports = function(exec, skipClosing){ }; /***/ }), -/* 105 */ +/* 108 */ /***/ (function(module, exports, __webpack_require__) { -var ctx = __webpack_require__(31) - , invoke = __webpack_require__(175) +var ctx = __webpack_require__(19) + , invoke = __webpack_require__(177) , html = __webpack_require__(99) - , cel = __webpack_require__(65) + , cel = __webpack_require__(67) , global = __webpack_require__(5) , process = global.process , setTask = global.setImmediate @@ -12969,11 +13102,26 @@ module.exports = { }; /***/ }), -/* 106 */ +/* 109 */ /***/ (function(module, exports, __webpack_require__) { -var isFunction = __webpack_require__(82), - isLength = __webpack_require__(191); +"use strict"; + + +exports.__esModule = true; + +exports.default = function (instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } +}; + +/***/ }), +/* 110 */ +/***/ (function(module, exports, __webpack_require__) { + +var isFunction = __webpack_require__(84), + isLength = __webpack_require__(192); /** * Checks if `value` is array-like. A value is considered array-like if it's @@ -13008,7 +13156,7 @@ module.exports = isArrayLike; /***/ }), -/* 107 */ +/* 111 */ /***/ (function(module, exports) { /** @@ -13032,11 +13180,11 @@ module.exports = stubFalse; /***/ }), -/* 108 */ +/* 112 */ /***/ (function(module, exports, __webpack_require__) { -var baseForOwn = __webpack_require__(192), - castFunction = __webpack_require__(194); +var baseForOwn = __webpack_require__(193), + castFunction = __webpack_require__(195); /** * Iterates over own enumerable string keyed properties of an object and @@ -13074,10 +13222,10 @@ module.exports = forOwn; /***/ }), -/* 109 */ +/* 113 */ /***/ (function(module, exports, __webpack_require__) { -var createBaseFor = __webpack_require__(193); +var createBaseFor = __webpack_require__(194); /** * The base implementation of `baseForOwn` which iterates over `object` @@ -13096,7 +13244,7 @@ module.exports = baseFor; /***/ }), -/* 110 */ +/* 114 */ /***/ (function(module, exports) { /** @@ -13120,15 +13268,15 @@ module.exports = stubFalse; /***/ }), -/* 111 */ +/* 115 */ /***/ (function(module, exports, __webpack_require__) { -var Stack = __webpack_require__(112), - assignMergeValue = __webpack_require__(113), - baseFor = __webpack_require__(109), - baseMergeDeep = __webpack_require__(211), - isObject = __webpack_require__(21), - keysIn = __webpack_require__(40); +var Stack = __webpack_require__(116), + assignMergeValue = __webpack_require__(117), + baseFor = __webpack_require__(113), + baseMergeDeep = __webpack_require__(212), + isObject = __webpack_require__(23), + keysIn = __webpack_require__(41); /** * The base implementation of `_.merge` without support for multiple sources. @@ -13167,14 +13315,14 @@ module.exports = baseMerge; /***/ }), -/* 112 */ +/* 116 */ /***/ (function(module, exports, __webpack_require__) { -var listCacheClear = __webpack_require__(206), - listCacheDelete = __webpack_require__(207), - listCacheGet = __webpack_require__(208), - listCacheHas = __webpack_require__(209), - listCacheSet = __webpack_require__(210); +var listCacheClear = __webpack_require__(207), + listCacheDelete = __webpack_require__(208), + listCacheGet = __webpack_require__(209), + listCacheHas = __webpack_require__(210), + listCacheSet = __webpack_require__(211); /** * Creates an list cache object. @@ -13205,11 +13353,11 @@ module.exports = ListCache; /***/ }), -/* 113 */ +/* 117 */ /***/ (function(module, exports, __webpack_require__) { -var baseAssignValue = __webpack_require__(78), - eq = __webpack_require__(54); +var baseAssignValue = __webpack_require__(80), + eq = __webpack_require__(56); /** * This function is like `assignValue` except that it doesn't assign @@ -13231,10 +13379,10 @@ module.exports = assignMergeValue; /***/ }), -/* 114 */ +/* 118 */ /***/ (function(module, exports, __webpack_require__) { -/* WEBPACK VAR INJECTION */(function(module) {var root = __webpack_require__(84); +/* WEBPACK VAR INJECTION */(function(module) {var root = __webpack_require__(86); /** Detect free variable `exports`. */ var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports; @@ -13270,10 +13418,10 @@ function cloneBuffer(buffer, isDeep) { module.exports = cloneBuffer; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(25)(module))) /***/ }), -/* 115 */ +/* 119 */ /***/ (function(module, exports) { /** @@ -13299,12 +13447,12 @@ module.exports = copyArray; /***/ }), -/* 116 */ +/* 120 */ /***/ (function(module, exports, __webpack_require__) { -var baseCreate = __webpack_require__(215), - getPrototype = __webpack_require__(117), - isPrototype = __webpack_require__(107); +var baseCreate = __webpack_require__(216), + getPrototype = __webpack_require__(121), + isPrototype = __webpack_require__(111); /** * Initializes an object clone. @@ -13323,10 +13471,10 @@ module.exports = initCloneObject; /***/ }), -/* 117 */ +/* 121 */ /***/ (function(module, exports, __webpack_require__) { -var overArg = __webpack_require__(83); +var overArg = __webpack_require__(85); /** Built-in value references. */ var getPrototype = overArg(Object.getPrototypeOf, Object); @@ -13335,7 +13483,7 @@ module.exports = getPrototype; /***/ }), -/* 118 */ +/* 122 */ /***/ (function(module, exports) { /** @@ -13359,7 +13507,7 @@ module.exports = stubFalse; /***/ }), -/* 119 */ +/* 123 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -14124,13 +14272,13 @@ module.exports = stubFalse; })); /***/ }), -/* 120 */ +/* 124 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var util = __webpack_require__(24); +var util = __webpack_require__(26); module.exports = SchemaObject; @@ -14140,10 +14288,10 @@ function SchemaObject(obj) { /***/ }), -/* 121 */ +/* 125 */ /***/ (function(module, exports, __webpack_require__) { -var json = typeof JSON !== 'undefined' ? JSON : __webpack_require__(236); +var json = typeof JSON !== 'undefined' ? JSON : __webpack_require__(237); module.exports = function (obj, opts) { if (!opts) opts = {}; @@ -14230,7 +14378,7 @@ var objectKeys = Object.keys || function (obj) { /***/ }), -/* 122 */ +/* 126 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -14695,7 +14843,7 @@ module.exports = function generate_validate(it, $keyword, $ruleType) { /***/ }), -/* 123 */ +/* 127 */ /***/ (function(module, exports) { @@ -14938,7 +15086,7 @@ function isObject(val) { /***/ }), -/* 124 */ +/* 128 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -15094,7 +15242,7 @@ module.exports = function generate__limit(it, $keyword, $ruleType) { /***/ }), -/* 125 */ +/* 129 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -15177,7 +15325,7 @@ module.exports = function generate__limitItems(it, $keyword, $ruleType) { /***/ }), -/* 126 */ +/* 130 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -15265,7 +15413,7 @@ module.exports = function generate__limitLength(it, $keyword, $ruleType) { /***/ }), -/* 127 */ +/* 131 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -15348,7 +15496,7 @@ module.exports = function generate__limitProperties(it, $keyword, $ruleType) { /***/ }), -/* 128 */ +/* 132 */ /***/ (function(module, exports) { /* @@ -15439,7 +15587,7 @@ module.exports = Jsonrpc; /***/ }), -/* 129 */ +/* 133 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -15643,13 +15791,13 @@ module.exports = Jsonrpc; })); /***/ }), -/* 130 */ +/* 134 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(57)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(59)); } else if (typeof define === "function" && define.amd) { // AMD @@ -15971,13 +16119,13 @@ module.exports = Jsonrpc; })); /***/ }), -/* 131 */ +/* 135 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(57)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(59)); } else if (typeof define === "function" && define.amd) { // AMD @@ -16299,7 +16447,7 @@ module.exports = Jsonrpc; })); /***/ }), -/* 132 */ +/* 136 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -16324,7 +16472,7 @@ module.exports = Jsonrpc; * @date 2015 */ -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); /** * SolidityParam object prototype. @@ -16457,7 +16605,7 @@ module.exports = SolidityParam; /***/ }), -/* 133 */ +/* 137 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -16482,12 +16630,12 @@ module.exports = SolidityParam; * @date 2014 */ -var utils = __webpack_require__(1); -var coder = __webpack_require__(91); +var utils = __webpack_require__(2); +var coder = __webpack_require__(93); var formatters = __webpack_require__(13); -var sha3 = __webpack_require__(43); -var Filter = __webpack_require__(60); -var watches = __webpack_require__(61); +var sha3 = __webpack_require__(44); +var Filter = __webpack_require__(62); +var watches = __webpack_require__(63); /** * This prototype should be used to create event filters @@ -16671,7 +16819,13 @@ module.exports = SolidityEvent; /***/ }), -/* 134 */ +/* 138 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(352), __esModule: true }; + +/***/ }), +/* 139 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -16681,95 +16835,95 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _typeof2 = __webpack_require__(92); +var _typeof2 = __webpack_require__(47); var _typeof3 = _interopRequireDefault(_typeof2); -var _keys = __webpack_require__(157); +var _keys = __webpack_require__(160); var _keys2 = _interopRequireDefault(_keys); -var _values = __webpack_require__(161); +var _values = __webpack_require__(163); var _values2 = _interopRequireDefault(_values); -var _toConsumableArray2 = __webpack_require__(74); +var _toConsumableArray2 = __webpack_require__(52); var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); -var _regenerator = __webpack_require__(51); +var _regenerator = __webpack_require__(53); var _regenerator2 = _interopRequireDefault(_regenerator); -var _asyncToGenerator2 = __webpack_require__(52); +var _asyncToGenerator2 = __webpack_require__(54); var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); -var _classCallCheck2 = __webpack_require__(179); +var _classCallCheck2 = __webpack_require__(109); var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); -var _createClass2 = __webpack_require__(180); +var _createClass2 = __webpack_require__(181); var _createClass3 = _interopRequireDefault(_createClass2); -var _promise = __webpack_require__(53); +var _promise = __webpack_require__(55); var _promise2 = _interopRequireDefault(_promise); -var _assign2 = __webpack_require__(184); +var _assign2 = __webpack_require__(185); var _assign3 = _interopRequireDefault(_assign2); -var _forOwn2 = __webpack_require__(108); +var _forOwn2 = __webpack_require__(112); var _forOwn3 = _interopRequireDefault(_forOwn2); -var _flatMap2 = __webpack_require__(195); +var _flatMap2 = __webpack_require__(196); var _flatMap3 = _interopRequireDefault(_flatMap2); -var _forEach2 = __webpack_require__(202); +var _forEach2 = __webpack_require__(203); var _forEach3 = _interopRequireDefault(_forEach2); -var _fromPairs2 = __webpack_require__(203); +var _fromPairs2 = __webpack_require__(204); var _fromPairs3 = _interopRequireDefault(_fromPairs2); -var _defaultsDeep2 = __webpack_require__(204); +var _defaultsDeep2 = __webpack_require__(205); var _defaultsDeep3 = _interopRequireDefault(_defaultsDeep2); -var _truffleContract = __webpack_require__(221); +var _truffleContract = __webpack_require__(222); var _truffleContract2 = _interopRequireDefault(_truffleContract); -var _web = __webpack_require__(88); +var _web = __webpack_require__(90); var _web2 = _interopRequireDefault(_web); -var _ipfsMini = __webpack_require__(342); +var _ipfsMini = __webpack_require__(343); var _ipfsMini2 = _interopRequireDefault(_ipfsMini); -var _lmsr = __webpack_require__(344); +var _lmsr = __webpack_require__(345); var lmsr = _interopRequireWildcard(_lmsr); -var _utils = __webpack_require__(45); +var _utils = __webpack_require__(46); var utils = _interopRequireWildcard(_utils); -var _oracles = __webpack_require__(377); +var _oracles = __webpack_require__(395); var oracles = _interopRequireWildcard(_oracles); -var _events = __webpack_require__(378); +var _events = __webpack_require__(396); var events = _interopRequireWildcard(_events); -var _markets = __webpack_require__(379); +var _markets = __webpack_require__(397); var markets = _interopRequireWildcard(_markets); @@ -16788,7 +16942,7 @@ var windowLoaded = new _promise2.default(function (accept, reject) { }, false); }); -var gasStatsData = __webpack_require__(384); +var gasStatsData = __webpack_require__(398); var gasLimit = 4e6; var gasDefaultMaxMultiplier = 1.5; @@ -16797,10 +16951,10 @@ var implementationInterfaceMap = { }; var contractArtifacts = ['Math', 'Event', 'CategoricalEvent', 'ScalarEvent', 'EventFactory', 'Token', 'HumanFriendlyToken', 'EtherToken', 'CentralizedOracle', 'CentralizedOracleFactory', 'UltimateOracle', 'UltimateOracleFactory', 'LMSRMarketMaker', 'Market', 'StandardMarket', 'StandardMarketFactory'].map(function (name) { - return __webpack_require__(385)("./" + name + '.json'); + return __webpack_require__(399)("./" + name + '.json'); }); -contractArtifacts.push(__webpack_require__(419)); +contractArtifacts.push(__webpack_require__(433)); var instanceModules = [oracles, events, markets]; @@ -16823,6 +16977,7 @@ var Gnosis = function () { * @param {string} [opts.ipfs.host='ipfs.infura.io'] - IPFS node address * @param {Number} [opts.ipfs.port=5001] - IPFS protocol port * @param {string} [opts.ipfs.protocol='https'] - IPFS protocol name + * @param {Function} [opts.logger] - A callback for logging. Can also provide 'console' to use `console.log`. * @returns {Gnosis} An instance of the gnosis.js API */ value: function () { @@ -16874,6 +17029,11 @@ var Gnosis = function () { (0, _classCallCheck3.default)(this, Gnosis); + // Logger setup + var logger = opts.logger; + + this.log = logger == null ? function () {} : logger === 'console' ? console.log : logger; + // IPFS instantiation this.ipfs = utils.promisifyAll(new _ipfsMini2.default(opts.ipfs)); @@ -17170,25 +17330,25 @@ exports.default = Gnosis; module.exports = exports['default']; /***/ }), -/* 135 */ +/* 140 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(136), __esModule: true }; +module.exports = { "default": __webpack_require__(141), __esModule: true }; /***/ }), -/* 136 */ +/* 141 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(30); -__webpack_require__(50); -module.exports = __webpack_require__(71).f('iterator'); +__webpack_require__(32); +__webpack_require__(51); +module.exports = __webpack_require__(74).f('iterator'); /***/ }), -/* 137 */ +/* 142 */ /***/ (function(module, exports, __webpack_require__) { -var toInteger = __webpack_require__(62) - , defined = __webpack_require__(63); +var toInteger = __webpack_require__(64) + , defined = __webpack_require__(65); // true -> String#at // false -> String#codePointAt module.exports = function(TO_STRING){ @@ -17206,14 +17366,14 @@ module.exports = function(TO_STRING){ }; /***/ }), -/* 138 */ +/* 143 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var create = __webpack_require__(96) +var create = __webpack_require__(69) , descriptor = __webpack_require__(33) - , setToStringTag = __webpack_require__(48) + , setToStringTag = __webpack_require__(50) , IteratorPrototype = {}; // 25.1.2.1.1 %IteratorPrototype%[@@iterator]() @@ -17225,11 +17385,11 @@ module.exports = function(Constructor, NAME, next){ }; /***/ }), -/* 139 */ +/* 144 */ /***/ (function(module, exports, __webpack_require__) { -var dP = __webpack_require__(7) - , anObject = __webpack_require__(10) +var dP = __webpack_require__(8) + , anObject = __webpack_require__(9) , getKeys = __webpack_require__(16); module.exports = __webpack_require__(11) ? Object.defineProperties : function defineProperties(O, Properties){ @@ -17243,14 +17403,14 @@ module.exports = __webpack_require__(11) ? Object.defineProperties : function de }; /***/ }), -/* 140 */ +/* 145 */ /***/ (function(module, exports, __webpack_require__) { // false -> Array#indexOf // true -> Array#includes var toIObject = __webpack_require__(12) - , toLength = __webpack_require__(67) - , toIndex = __webpack_require__(141); + , toLength = __webpack_require__(70) + , toIndex = __webpack_require__(146); module.exports = function(IS_INCLUDES){ return function($this, el, fromIndex){ var O = toIObject($this) @@ -17269,10 +17429,10 @@ module.exports = function(IS_INCLUDES){ }; /***/ }), -/* 141 */ +/* 146 */ /***/ (function(module, exports, __webpack_require__) { -var toInteger = __webpack_require__(62) +var toInteger = __webpack_require__(64) , max = Math.max , min = Math.min; module.exports = function(index, length){ @@ -17281,39 +17441,21 @@ module.exports = function(index, length){ }; /***/ }), -/* 142 */ -/***/ (function(module, exports, __webpack_require__) { - -// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O) -var has = __webpack_require__(15) - , toObject = __webpack_require__(49) - , IE_PROTO = __webpack_require__(68)('IE_PROTO') - , ObjectProto = Object.prototype; - -module.exports = Object.getPrototypeOf || function(O){ - O = toObject(O); - if(has(O, IE_PROTO))return O[IE_PROTO]; - if(typeof O.constructor == 'function' && O instanceof O.constructor){ - return O.constructor.prototype; - } return O instanceof Object ? ObjectProto : null; -}; - -/***/ }), -/* 143 */ +/* 147 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var addToUnscopables = __webpack_require__(144) - , step = __webpack_require__(145) - , Iterators = __webpack_require__(20) +var addToUnscopables = __webpack_require__(148) + , step = __webpack_require__(149) + , Iterators = __webpack_require__(22) , toIObject = __webpack_require__(12); // 22.1.3.4 Array.prototype.entries() // 22.1.3.13 Array.prototype.keys() // 22.1.3.29 Array.prototype.values() // 22.1.3.30 Array.prototype[@@iterator]() -module.exports = __webpack_require__(93)(Array, 'Array', function(iterated, kind){ +module.exports = __webpack_require__(94)(Array, 'Array', function(iterated, kind){ this._t = toIObject(iterated); // target this._i = 0; // next index this._k = kind; // kind @@ -17339,13 +17481,13 @@ addToUnscopables('values'); addToUnscopables('entries'); /***/ }), -/* 144 */ +/* 148 */ /***/ (function(module, exports) { module.exports = function(){ /* empty */ }; /***/ }), -/* 145 */ +/* 149 */ /***/ (function(module, exports) { module.exports = function(done, value){ @@ -17353,23 +17495,23 @@ module.exports = function(done, value){ }; /***/ }), -/* 146 */ +/* 150 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(147), __esModule: true }; +module.exports = { "default": __webpack_require__(151), __esModule: true }; /***/ }), -/* 147 */ +/* 151 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(148); -__webpack_require__(101); -__webpack_require__(155); -__webpack_require__(156); -module.exports = __webpack_require__(3).Symbol; +__webpack_require__(152); +__webpack_require__(103); +__webpack_require__(158); +__webpack_require__(159); +module.exports = __webpack_require__(1).Symbol; /***/ }), -/* 148 */ +/* 152 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -17378,27 +17520,27 @@ module.exports = __webpack_require__(3).Symbol; var global = __webpack_require__(5) , has = __webpack_require__(15) , DESCRIPTORS = __webpack_require__(11) - , $export = __webpack_require__(9) - , redefine = __webpack_require__(95) - , META = __webpack_require__(149).KEY - , $fails = __webpack_require__(19) - , shared = __webpack_require__(69) - , setToStringTag = __webpack_require__(48) - , uid = __webpack_require__(47) + , $export = __webpack_require__(7) + , redefine = __webpack_require__(96) + , META = __webpack_require__(153).KEY + , $fails = __webpack_require__(21) + , shared = __webpack_require__(72) + , setToStringTag = __webpack_require__(50) + , uid = __webpack_require__(49) , wks = __webpack_require__(4) - , wksExt = __webpack_require__(71) - , wksDefine = __webpack_require__(72) - , keyOf = __webpack_require__(150) - , enumKeys = __webpack_require__(151) - , isArray = __webpack_require__(152) - , anObject = __webpack_require__(10) + , wksExt = __webpack_require__(74) + , wksDefine = __webpack_require__(75) + , keyOf = __webpack_require__(154) + , enumKeys = __webpack_require__(155) + , isArray = __webpack_require__(156) + , anObject = __webpack_require__(9) , toIObject = __webpack_require__(12) - , toPrimitive = __webpack_require__(66) + , toPrimitive = __webpack_require__(68) , createDesc = __webpack_require__(33) - , _create = __webpack_require__(96) - , gOPNExt = __webpack_require__(153) - , $GOPD = __webpack_require__(154) - , $DP = __webpack_require__(7) + , _create = __webpack_require__(69) + , gOPNExt = __webpack_require__(157) + , $GOPD = __webpack_require__(102) + , $DP = __webpack_require__(8) , $keys = __webpack_require__(16) , gOPD = $GOPD.f , dP = $DP.f @@ -17522,11 +17664,11 @@ if(!USE_NATIVE){ $GOPD.f = $getOwnPropertyDescriptor; $DP.f = $defineProperty; - __webpack_require__(100).f = gOPNExt.f = $getOwnPropertyNames; - __webpack_require__(35).f = $propertyIsEnumerable; - __webpack_require__(73).f = $getOwnPropertySymbols; + __webpack_require__(101).f = gOPNExt.f = $getOwnPropertyNames; + __webpack_require__(36).f = $propertyIsEnumerable; + __webpack_require__(76).f = $getOwnPropertySymbols; - if(DESCRIPTORS && !__webpack_require__(46)){ + if(DESCRIPTORS && !__webpack_require__(48)){ redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true); } @@ -17610,18 +17752,18 @@ setToStringTag(Math, 'Math', true); setToStringTag(global.JSON, 'JSON', true); /***/ }), -/* 149 */ +/* 153 */ /***/ (function(module, exports, __webpack_require__) { -var META = __webpack_require__(47)('meta') - , isObject = __webpack_require__(32) +var META = __webpack_require__(49)('meta') + , isObject = __webpack_require__(20) , has = __webpack_require__(15) - , setDesc = __webpack_require__(7).f + , setDesc = __webpack_require__(8).f , id = 0; var isExtensible = Object.isExtensible || function(){ return true; }; -var FREEZE = !__webpack_require__(19)(function(){ +var FREEZE = !__webpack_require__(21)(function(){ return isExtensible(Object.preventExtensions({})); }); var setMeta = function(it){ @@ -17668,7 +17810,7 @@ var meta = module.exports = { }; /***/ }), -/* 150 */ +/* 154 */ /***/ (function(module, exports, __webpack_require__) { var getKeys = __webpack_require__(16) @@ -17683,13 +17825,13 @@ module.exports = function(object, el){ }; /***/ }), -/* 151 */ +/* 155 */ /***/ (function(module, exports, __webpack_require__) { // all enumerable object keys, includes symbols var getKeys = __webpack_require__(16) - , gOPS = __webpack_require__(73) - , pIE = __webpack_require__(35); + , gOPS = __webpack_require__(76) + , pIE = __webpack_require__(36); module.exports = function(it){ var result = getKeys(it) , getSymbols = gOPS.f; @@ -17703,7 +17845,7 @@ module.exports = function(it){ }; /***/ }), -/* 152 */ +/* 156 */ /***/ (function(module, exports, __webpack_require__) { // 7.2.2 IsArray(argument) @@ -17713,12 +17855,12 @@ module.exports = Array.isArray || function isArray(arg){ }; /***/ }), -/* 153 */ +/* 157 */ /***/ (function(module, exports, __webpack_require__) { // fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window var toIObject = __webpack_require__(12) - , gOPN = __webpack_require__(100).f + , gOPN = __webpack_require__(101).f , toString = {}.toString; var windowNames = typeof window == 'object' && window && Object.getOwnPropertyNames @@ -17738,100 +17880,64 @@ module.exports.f = function getOwnPropertyNames(it){ /***/ }), -/* 154 */ -/***/ (function(module, exports, __webpack_require__) { - -var pIE = __webpack_require__(35) - , createDesc = __webpack_require__(33) - , toIObject = __webpack_require__(12) - , toPrimitive = __webpack_require__(66) - , has = __webpack_require__(15) - , IE8_DOM_DEFINE = __webpack_require__(94) - , gOPD = Object.getOwnPropertyDescriptor; - -exports.f = __webpack_require__(11) ? gOPD : function getOwnPropertyDescriptor(O, P){ - O = toIObject(O); - P = toPrimitive(P, true); - if(IE8_DOM_DEFINE)try { - return gOPD(O, P); - } catch(e){ /* empty */ } - if(has(O, P))return createDesc(!pIE.f.call(O, P), O[P]); -}; - -/***/ }), -/* 155 */ +/* 158 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(72)('asyncIterator'); +__webpack_require__(75)('asyncIterator'); /***/ }), -/* 156 */ +/* 159 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(72)('observable'); +__webpack_require__(75)('observable'); /***/ }), -/* 157 */ +/* 160 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(158), __esModule: true }; +module.exports = { "default": __webpack_require__(161), __esModule: true }; /***/ }), -/* 158 */ +/* 161 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(159); -module.exports = __webpack_require__(3).Object.keys; +__webpack_require__(162); +module.exports = __webpack_require__(1).Object.keys; /***/ }), -/* 159 */ +/* 162 */ /***/ (function(module, exports, __webpack_require__) { // 19.1.2.14 Object.keys(O) -var toObject = __webpack_require__(49) +var toObject = __webpack_require__(35) , $keys = __webpack_require__(16); -__webpack_require__(160)('keys', function(){ +__webpack_require__(104)('keys', function(){ return function keys(it){ return $keys(toObject(it)); }; }); /***/ }), -/* 160 */ -/***/ (function(module, exports, __webpack_require__) { - -// most Object methods by ES6 should accept primitives -var $export = __webpack_require__(9) - , core = __webpack_require__(3) - , fails = __webpack_require__(19); -module.exports = function(KEY, exec){ - var fn = (core.Object || {})[KEY] || Object[KEY] - , exp = {}; - exp[KEY] = exec(fn); - $export($export.S + $export.F * fails(function(){ fn(1); }), 'Object', exp); -}; - -/***/ }), -/* 161 */ +/* 163 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(162), __esModule: true }; +module.exports = { "default": __webpack_require__(164), __esModule: true }; /***/ }), -/* 162 */ +/* 164 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(163); -module.exports = __webpack_require__(3).Object.values; +__webpack_require__(165); +module.exports = __webpack_require__(1).Object.values; /***/ }), -/* 163 */ +/* 165 */ /***/ (function(module, exports, __webpack_require__) { // https://github.com/tc39/proposal-object-values-entries -var $export = __webpack_require__(9) - , $values = __webpack_require__(164)(false); +var $export = __webpack_require__(7) + , $values = __webpack_require__(166)(false); $export($export.S, 'Object', { values: function values(it){ @@ -17840,12 +17946,12 @@ $export($export.S, 'Object', { }); /***/ }), -/* 164 */ +/* 166 */ /***/ (function(module, exports, __webpack_require__) { var getKeys = __webpack_require__(16) , toIObject = __webpack_require__(12) - , isEnum = __webpack_require__(35).f; + , isEnum = __webpack_require__(36).f; module.exports = function(isEntries){ return function(it){ var O = toIObject(it) @@ -17861,29 +17967,29 @@ module.exports = function(isEntries){ }; /***/ }), -/* 165 */ +/* 167 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(30); -__webpack_require__(166); -module.exports = __webpack_require__(3).Array.from; +__webpack_require__(32); +__webpack_require__(168); +module.exports = __webpack_require__(1).Array.from; /***/ }), -/* 166 */ +/* 168 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ctx = __webpack_require__(31) - , $export = __webpack_require__(9) - , toObject = __webpack_require__(49) - , call = __webpack_require__(102) - , isArrayIter = __webpack_require__(103) - , toLength = __webpack_require__(67) - , createProperty = __webpack_require__(167) - , getIterFn = __webpack_require__(75); +var ctx = __webpack_require__(19) + , $export = __webpack_require__(7) + , toObject = __webpack_require__(35) + , call = __webpack_require__(105) + , isArrayIter = __webpack_require__(106) + , toLength = __webpack_require__(70) + , createProperty = __webpack_require__(169) + , getIterFn = __webpack_require__(77); -$export($export.S + $export.F * !__webpack_require__(104)(function(iter){ Array.from(iter); }), 'Array', { +$export($export.S + $export.F * !__webpack_require__(107)(function(iter){ Array.from(iter); }), 'Array', { // 22.1.2.1 Array.from(arrayLike, mapfn = undefined, thisArg = undefined) from: function from(arrayLike/*, mapfn = undefined, thisArg = undefined*/){ var O = toObject(arrayLike) @@ -17913,12 +18019,12 @@ $export($export.S + $export.F * !__webpack_require__(104)(function(iter){ Array. /***/ }), -/* 167 */ +/* 169 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var $defineProperty = __webpack_require__(7) +var $defineProperty = __webpack_require__(8) , createDesc = __webpack_require__(33); module.exports = function(object, index, value){ @@ -17927,7 +18033,7 @@ module.exports = function(object, index, value){ }; /***/ }), -/* 168 */ +/* 170 */ /***/ (function(module, exports, __webpack_require__) { // This method of obtaining a reference to the global object needs to be @@ -17945,7 +18051,7 @@ var oldRuntime = hadRuntime && g.regeneratorRuntime; // Force reevalutation of runtime.js. g.regeneratorRuntime = undefined; -module.exports = __webpack_require__(169); +module.exports = __webpack_require__(171); if (hadRuntime) { // Restore the original runtime. @@ -17961,7 +18067,7 @@ if (hadRuntime) { /***/ }), -/* 169 */ +/* 171 */ /***/ (function(module, exports) { /** @@ -18697,33 +18803,33 @@ if (hadRuntime) { /***/ }), -/* 170 */ +/* 172 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(101); -__webpack_require__(30); -__webpack_require__(50); -__webpack_require__(171); -module.exports = __webpack_require__(3).Promise; +__webpack_require__(103); +__webpack_require__(32); +__webpack_require__(51); +__webpack_require__(173); +module.exports = __webpack_require__(1).Promise; /***/ }), -/* 171 */ +/* 173 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var LIBRARY = __webpack_require__(46) +var LIBRARY = __webpack_require__(48) , global = __webpack_require__(5) - , ctx = __webpack_require__(31) - , classof = __webpack_require__(76) - , $export = __webpack_require__(9) - , isObject = __webpack_require__(32) - , aFunction = __webpack_require__(64) - , anInstance = __webpack_require__(172) - , forOf = __webpack_require__(173) - , speciesConstructor = __webpack_require__(174) - , task = __webpack_require__(105).set - , microtask = __webpack_require__(176)() + , ctx = __webpack_require__(19) + , classof = __webpack_require__(78) + , $export = __webpack_require__(7) + , isObject = __webpack_require__(20) + , aFunction = __webpack_require__(66) + , anInstance = __webpack_require__(174) + , forOf = __webpack_require__(175) + , speciesConstructor = __webpack_require__(176) + , task = __webpack_require__(108).set + , microtask = __webpack_require__(178)() , PROMISE = 'Promise' , TypeError = global.TypeError , process = global.process @@ -18915,7 +19021,7 @@ if(!USE_NATIVE){ this._h = 0; // <- rejection state, 0 - default, 1 - handled, 2 - unhandled this._n = false; // <- notify }; - Internal.prototype = __webpack_require__(177)($Promise.prototype, { + Internal.prototype = __webpack_require__(179)($Promise.prototype, { // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected) then: function then(onFulfilled, onRejected){ var reaction = newPromiseCapability(speciesConstructor(this, $Promise)); @@ -18941,9 +19047,9 @@ if(!USE_NATIVE){ } $export($export.G + $export.W + $export.F * !USE_NATIVE, {Promise: $Promise}); -__webpack_require__(48)($Promise, PROMISE); -__webpack_require__(178)(PROMISE); -Wrapper = __webpack_require__(3)[PROMISE]; +__webpack_require__(50)($Promise, PROMISE); +__webpack_require__(180)(PROMISE); +Wrapper = __webpack_require__(1)[PROMISE]; // statics $export($export.S + $export.F * !USE_NATIVE, PROMISE, { @@ -18966,7 +19072,7 @@ $export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, { return capability.promise; } }); -$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(104)(function(iter){ +$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(107)(function(iter){ $Promise.all(iter)['catch'](empty); })), PROMISE, { // 25.4.4.1 Promise.all(iterable) @@ -19012,7 +19118,7 @@ $export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(104)(functio }); /***/ }), -/* 172 */ +/* 174 */ /***/ (function(module, exports) { module.exports = function(it, Constructor, name, forbiddenField){ @@ -19022,15 +19128,15 @@ module.exports = function(it, Constructor, name, forbiddenField){ }; /***/ }), -/* 173 */ +/* 175 */ /***/ (function(module, exports, __webpack_require__) { -var ctx = __webpack_require__(31) - , call = __webpack_require__(102) - , isArrayIter = __webpack_require__(103) - , anObject = __webpack_require__(10) - , toLength = __webpack_require__(67) - , getIterFn = __webpack_require__(75) +var ctx = __webpack_require__(19) + , call = __webpack_require__(105) + , isArrayIter = __webpack_require__(106) + , anObject = __webpack_require__(9) + , toLength = __webpack_require__(70) + , getIterFn = __webpack_require__(77) , BREAK = {} , RETURN = {}; var exports = module.exports = function(iterable, entries, fn, that, ITERATOR){ @@ -19052,12 +19158,12 @@ exports.BREAK = BREAK; exports.RETURN = RETURN; /***/ }), -/* 174 */ +/* 176 */ /***/ (function(module, exports, __webpack_require__) { // 7.3.20 SpeciesConstructor(O, defaultConstructor) -var anObject = __webpack_require__(10) - , aFunction = __webpack_require__(64) +var anObject = __webpack_require__(9) + , aFunction = __webpack_require__(66) , SPECIES = __webpack_require__(4)('species'); module.exports = function(O, D){ var C = anObject(O).constructor, S; @@ -19065,7 +19171,7 @@ module.exports = function(O, D){ }; /***/ }), -/* 175 */ +/* 177 */ /***/ (function(module, exports) { // fast apply, http://jsperf.lnkit.com/fast-apply/5 @@ -19086,11 +19192,11 @@ module.exports = function(fn, args, that){ }; /***/ }), -/* 176 */ +/* 178 */ /***/ (function(module, exports, __webpack_require__) { var global = __webpack_require__(5) - , macrotask = __webpack_require__(105).set + , macrotask = __webpack_require__(108).set , Observer = global.MutationObserver || global.WebKitMutationObserver , process = global.process , Promise = global.Promise @@ -19159,7 +19265,7 @@ module.exports = function(){ }; /***/ }), -/* 177 */ +/* 179 */ /***/ (function(module, exports, __webpack_require__) { var hide = __webpack_require__(14); @@ -19171,14 +19277,14 @@ module.exports = function(target, src, safe){ }; /***/ }), -/* 178 */ +/* 180 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var global = __webpack_require__(5) - , core = __webpack_require__(3) - , dP = __webpack_require__(7) + , core = __webpack_require__(1) + , dP = __webpack_require__(8) , DESCRIPTORS = __webpack_require__(11) , SPECIES = __webpack_require__(4)('species'); @@ -19191,22 +19297,7 @@ module.exports = function(KEY){ }; /***/ }), -/* 179 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -exports.__esModule = true; - -exports.default = function (instance, Constructor) { - if (!(instance instanceof Constructor)) { - throw new TypeError("Cannot call a class as a function"); - } -}; - -/***/ }), -/* 180 */ +/* 181 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -19214,7 +19305,7 @@ exports.default = function (instance, Constructor) { exports.__esModule = true; -var _defineProperty = __webpack_require__(181); +var _defineProperty = __webpack_require__(182); var _defineProperty2 = _interopRequireDefault(_defineProperty); @@ -19239,39 +19330,39 @@ exports.default = function () { }(); /***/ }), -/* 181 */ +/* 182 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(182), __esModule: true }; +module.exports = { "default": __webpack_require__(183), __esModule: true }; /***/ }), -/* 182 */ +/* 183 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(183); -var $Object = __webpack_require__(3).Object; +__webpack_require__(184); +var $Object = __webpack_require__(1).Object; module.exports = function defineProperty(it, key, desc){ return $Object.defineProperty(it, key, desc); }; /***/ }), -/* 183 */ +/* 184 */ /***/ (function(module, exports, __webpack_require__) { -var $export = __webpack_require__(9); +var $export = __webpack_require__(7); // 19.1.2.4 / 15.2.3.6 Object.defineProperty(O, P, Attributes) -$export($export.S + $export.F * !__webpack_require__(11), 'Object', {defineProperty: __webpack_require__(7).f}); +$export($export.S + $export.F * !__webpack_require__(11), 'Object', {defineProperty: __webpack_require__(8).f}); /***/ }), -/* 184 */ +/* 185 */ /***/ (function(module, exports, __webpack_require__) { -var assignValue = __webpack_require__(77), +var assignValue = __webpack_require__(79), copyObject = __webpack_require__(17), - createAssigner = __webpack_require__(79), - isArrayLike = __webpack_require__(106), - isPrototype = __webpack_require__(107), - keys = __webpack_require__(55); + createAssigner = __webpack_require__(81), + isArrayLike = __webpack_require__(110), + isPrototype = __webpack_require__(111), + keys = __webpack_require__(57); /** Used for built-in method references. */ var objectProto = Object.prototype; @@ -19327,10 +19418,10 @@ module.exports = assign; /***/ }), -/* 185 */ +/* 186 */ /***/ (function(module, exports, __webpack_require__) { -var getNative = __webpack_require__(186); +var getNative = __webpack_require__(187); var defineProperty = (function() { try { @@ -19344,7 +19435,7 @@ module.exports = defineProperty; /***/ }), -/* 186 */ +/* 187 */ /***/ (function(module, exports) { /** @@ -19363,7 +19454,7 @@ module.exports = getValue; /***/ }), -/* 187 */ +/* 188 */ /***/ (function(module, exports) { /** @@ -19390,10 +19481,10 @@ module.exports = identity; /***/ }), -/* 188 */ +/* 189 */ /***/ (function(module, exports, __webpack_require__) { -var apply = __webpack_require__(81); +var apply = __webpack_require__(83); /* Built-in method references for those with the same name as other `lodash` methods. */ var nativeMax = Math.max; @@ -19432,7 +19523,7 @@ module.exports = overRest; /***/ }), -/* 189 */ +/* 190 */ /***/ (function(module, exports) { /** @@ -19459,7 +19550,7 @@ module.exports = identity; /***/ }), -/* 190 */ +/* 191 */ /***/ (function(module, exports) { /** @@ -19483,7 +19574,7 @@ module.exports = stubFalse; /***/ }), -/* 191 */ +/* 192 */ /***/ (function(module, exports) { /** Used as references for various `Number` constants. */ @@ -19524,11 +19615,11 @@ module.exports = isLength; /***/ }), -/* 192 */ +/* 193 */ /***/ (function(module, exports, __webpack_require__) { -var baseFor = __webpack_require__(109), - keys = __webpack_require__(55); +var baseFor = __webpack_require__(113), + keys = __webpack_require__(57); /** * The base implementation of `_.forOwn` without support for iteratee shorthands. @@ -19546,7 +19637,7 @@ module.exports = baseForOwn; /***/ }), -/* 193 */ +/* 194 */ /***/ (function(module, exports) { /** @@ -19577,7 +19668,7 @@ module.exports = createBaseFor; /***/ }), -/* 194 */ +/* 195 */ /***/ (function(module, exports) { /** @@ -19604,11 +19695,11 @@ module.exports = identity; /***/ }), -/* 195 */ +/* 196 */ /***/ (function(module, exports, __webpack_require__) { -var baseFlatten = __webpack_require__(196), - map = __webpack_require__(201); +var baseFlatten = __webpack_require__(197), + map = __webpack_require__(202); /** * Creates a flattened array of values by running each element in `collection` @@ -19639,11 +19730,11 @@ module.exports = flatMap; /***/ }), -/* 196 */ +/* 197 */ /***/ (function(module, exports, __webpack_require__) { -var arrayPush = __webpack_require__(197), - isFlattenable = __webpack_require__(198); +var arrayPush = __webpack_require__(198), + isFlattenable = __webpack_require__(199); /** * The base implementation of `_.flatten` with support for restricting flattening. @@ -19683,7 +19774,7 @@ module.exports = baseFlatten; /***/ }), -/* 197 */ +/* 198 */ /***/ (function(module, exports) { /** @@ -19709,12 +19800,12 @@ module.exports = arrayPush; /***/ }), -/* 198 */ +/* 199 */ /***/ (function(module, exports, __webpack_require__) { -var Symbol = __webpack_require__(199), - isArguments = __webpack_require__(110), - isArray = __webpack_require__(38); +var Symbol = __webpack_require__(200), + isArguments = __webpack_require__(114), + isArray = __webpack_require__(39); /** Built-in value references. */ var spreadableSymbol = Symbol ? Symbol.isConcatSpreadable : undefined; @@ -19735,10 +19826,10 @@ module.exports = isFlattenable; /***/ }), -/* 199 */ +/* 200 */ /***/ (function(module, exports, __webpack_require__) { -var root = __webpack_require__(84); +var root = __webpack_require__(86); /** Built-in value references. */ var Symbol = root.Symbol; @@ -19747,7 +19838,7 @@ module.exports = Symbol; /***/ }), -/* 200 */ +/* 201 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(global) {/** Detect free variable `global` from Node.js. */ @@ -19755,10 +19846,10 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object module.exports = freeGlobal; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(22))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24))) /***/ }), -/* 201 */ +/* 202 */ /***/ (function(module, exports) { /** @@ -19785,7 +19876,7 @@ module.exports = arrayMap; /***/ }), -/* 202 */ +/* 203 */ /***/ (function(module, exports) { /** @@ -19813,7 +19904,7 @@ module.exports = arrayEach; /***/ }), -/* 203 */ +/* 204 */ /***/ (function(module, exports) { /** @@ -19847,13 +19938,13 @@ module.exports = fromPairs; /***/ }), -/* 204 */ +/* 205 */ /***/ (function(module, exports, __webpack_require__) { -var apply = __webpack_require__(81), - baseRest = __webpack_require__(80), - customDefaultsMerge = __webpack_require__(205), - mergeWith = __webpack_require__(220); +var apply = __webpack_require__(83), + baseRest = __webpack_require__(82), + customDefaultsMerge = __webpack_require__(206), + mergeWith = __webpack_require__(221); /** * This method is like `_.defaults` except that it recursively assigns @@ -19883,11 +19974,11 @@ module.exports = defaultsDeep; /***/ }), -/* 205 */ +/* 206 */ /***/ (function(module, exports, __webpack_require__) { -var baseMerge = __webpack_require__(111), - isObject = __webpack_require__(21); +var baseMerge = __webpack_require__(115), + isObject = __webpack_require__(23); /** * Used by `_.defaultsDeep` to customize its `_.merge` use to merge source @@ -19917,7 +20008,7 @@ module.exports = customDefaultsMerge; /***/ }), -/* 206 */ +/* 207 */ /***/ (function(module, exports) { /** @@ -19936,10 +20027,10 @@ module.exports = listCacheClear; /***/ }), -/* 207 */ +/* 208 */ /***/ (function(module, exports, __webpack_require__) { -var assocIndexOf = __webpack_require__(56); +var assocIndexOf = __webpack_require__(58); /** Used for built-in method references. */ var arrayProto = Array.prototype; @@ -19977,10 +20068,10 @@ module.exports = listCacheDelete; /***/ }), -/* 208 */ +/* 209 */ /***/ (function(module, exports, __webpack_require__) { -var assocIndexOf = __webpack_require__(56); +var assocIndexOf = __webpack_require__(58); /** * Gets the list cache value for `key`. @@ -20002,10 +20093,10 @@ module.exports = listCacheGet; /***/ }), -/* 209 */ +/* 210 */ /***/ (function(module, exports, __webpack_require__) { -var assocIndexOf = __webpack_require__(56); +var assocIndexOf = __webpack_require__(58); /** * Checks if a list cache value for `key` exists. @@ -20024,10 +20115,10 @@ module.exports = listCacheHas; /***/ }), -/* 210 */ +/* 211 */ /***/ (function(module, exports, __webpack_require__) { -var assocIndexOf = __webpack_require__(56); +var assocIndexOf = __webpack_require__(58); /** * Sets the list cache `key` to `value`. @@ -20056,23 +20147,23 @@ module.exports = listCacheSet; /***/ }), -/* 211 */ +/* 212 */ /***/ (function(module, exports, __webpack_require__) { -var assignMergeValue = __webpack_require__(113), - cloneBuffer = __webpack_require__(114), - cloneTypedArray = __webpack_require__(212), - copyArray = __webpack_require__(115), - initCloneObject = __webpack_require__(116), - isArguments = __webpack_require__(110), - isArray = __webpack_require__(38), - isArrayLikeObject = __webpack_require__(216), - isBuffer = __webpack_require__(118), - isFunction = __webpack_require__(82), - isObject = __webpack_require__(21), - isPlainObject = __webpack_require__(217), - isTypedArray = __webpack_require__(218), - toPlainObject = __webpack_require__(219); +var assignMergeValue = __webpack_require__(117), + cloneBuffer = __webpack_require__(118), + cloneTypedArray = __webpack_require__(213), + copyArray = __webpack_require__(119), + initCloneObject = __webpack_require__(120), + isArguments = __webpack_require__(114), + isArray = __webpack_require__(39), + isArrayLikeObject = __webpack_require__(217), + isBuffer = __webpack_require__(122), + isFunction = __webpack_require__(84), + isObject = __webpack_require__(23), + isPlainObject = __webpack_require__(218), + isTypedArray = __webpack_require__(219), + toPlainObject = __webpack_require__(220); /** * A specialized version of `baseMerge` for arrays and objects which performs @@ -20155,10 +20246,10 @@ module.exports = baseMergeDeep; /***/ }), -/* 212 */ +/* 213 */ /***/ (function(module, exports, __webpack_require__) { -var cloneArrayBuffer = __webpack_require__(213); +var cloneArrayBuffer = __webpack_require__(214); /** * Creates a clone of `typedArray`. @@ -20177,10 +20268,10 @@ module.exports = cloneTypedArray; /***/ }), -/* 213 */ +/* 214 */ /***/ (function(module, exports, __webpack_require__) { -var Uint8Array = __webpack_require__(214); +var Uint8Array = __webpack_require__(215); /** * Creates a clone of `arrayBuffer`. @@ -20199,10 +20290,10 @@ module.exports = cloneArrayBuffer; /***/ }), -/* 214 */ +/* 215 */ /***/ (function(module, exports, __webpack_require__) { -var root = __webpack_require__(84); +var root = __webpack_require__(86); /** Built-in value references. */ var Uint8Array = root.Uint8Array; @@ -20211,10 +20302,10 @@ module.exports = Uint8Array; /***/ }), -/* 215 */ +/* 216 */ /***/ (function(module, exports, __webpack_require__) { -var isObject = __webpack_require__(21); +var isObject = __webpack_require__(23); /** Built-in value references. */ var objectCreate = Object.create; @@ -20247,11 +20338,11 @@ module.exports = baseCreate; /***/ }), -/* 216 */ +/* 217 */ /***/ (function(module, exports, __webpack_require__) { -var isArrayLike = __webpack_require__(106), - isObjectLike = __webpack_require__(39); +var isArrayLike = __webpack_require__(110), + isObjectLike = __webpack_require__(40); /** * This method is like `_.isArrayLike` except that it also checks if `value` @@ -20286,12 +20377,12 @@ module.exports = isArrayLikeObject; /***/ }), -/* 217 */ +/* 218 */ /***/ (function(module, exports, __webpack_require__) { -var baseGetTag = __webpack_require__(37), - getPrototype = __webpack_require__(117), - isObjectLike = __webpack_require__(39); +var baseGetTag = __webpack_require__(38), + getPrototype = __webpack_require__(121), + isObjectLike = __webpack_require__(40); /** `Object#toString` result references. */ var objectTag = '[object Object]'; @@ -20354,7 +20445,7 @@ module.exports = isPlainObject; /***/ }), -/* 218 */ +/* 219 */ /***/ (function(module, exports) { /** @@ -20378,11 +20469,11 @@ module.exports = stubFalse; /***/ }), -/* 219 */ +/* 220 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - keysIn = __webpack_require__(40); + keysIn = __webpack_require__(41); /** * Converts `value` to a plain object flattening inherited enumerable string @@ -20416,11 +20507,11 @@ module.exports = toPlainObject; /***/ }), -/* 220 */ +/* 221 */ /***/ (function(module, exports, __webpack_require__) { -var baseMerge = __webpack_require__(111), - createAssigner = __webpack_require__(79); +var baseMerge = __webpack_require__(115), + createAssigner = __webpack_require__(81); /** * This method is like `_.merge` except that it accepts `customizer` which @@ -20461,11 +20552,11 @@ module.exports = mergeWith; /***/ }), -/* 221 */ +/* 222 */ /***/ (function(module, exports, __webpack_require__) { -var Schema = __webpack_require__(222); -var Contract = __webpack_require__(270); +var Schema = __webpack_require__(223); +var Contract = __webpack_require__(271); var contract = function(options) { var binary = Schema.normalize(options || {}); @@ -20530,16 +20621,16 @@ if (typeof window !== "undefined") { /***/ }), -/* 222 */ +/* 223 */ /***/ (function(module, exports, __webpack_require__) { -var sha3 = __webpack_require__(223); -var pkgVersion = __webpack_require__(225).version; -var Ajv = __webpack_require__(226); +var sha3 = __webpack_require__(224); +var pkgVersion = __webpack_require__(226).version; +var Ajv = __webpack_require__(227); -var contractObjectSchema = __webpack_require__(267); -var networkObjectSchema = __webpack_require__(268); -var abiSchema = __webpack_require__(269); +var contractObjectSchema = __webpack_require__(268); +var networkObjectSchema = __webpack_require__(269); +var abiSchema = __webpack_require__(270); /** @@ -20759,13 +20850,13 @@ module.exports = TruffleContractSchema; /***/ }), -/* 223 */ +/* 224 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(119), __webpack_require__(224)); + module.exports = exports = factory(__webpack_require__(123), __webpack_require__(225)); } else if (typeof define === "function" && define.amd) { // AMD @@ -21087,13 +21178,13 @@ module.exports = TruffleContractSchema; })); /***/ }), -/* 224 */ +/* 225 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(119)); + module.exports = exports = factory(__webpack_require__(123)); } else if (typeof define === "function" && define.amd) { // AMD @@ -21396,29 +21487,29 @@ module.exports = TruffleContractSchema; })); /***/ }), -/* 225 */ +/* 226 */ /***/ (function(module, exports) { module.exports = {"_args":[["truffle-contract-schema@1.0.1","/home/alan/src/github.com/gnosis/gnosis.js"]],"_from":"truffle-contract-schema@1.0.1","_id":"truffle-contract-schema@1.0.1","_inBundle":false,"_integrity":"sha512-37ZO9FVvmW/PZz/sh00LAz7HN2U4FHERuxI4mCbUR6h3r2cRgZ4YBfzHuAHOnZlrVzM1qx/Dx/1Ng3UyfWseEA==","_location":"/truffle-contract-schema","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"truffle-contract-schema@1.0.1","name":"truffle-contract-schema","escapedName":"truffle-contract-schema","rawSpec":"1.0.1","saveSpec":null,"fetchSpec":"1.0.1"},"_requiredBy":["/truffle-contract"],"_resolved":"https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-1.0.1.tgz","_spec":"1.0.1","_where":"/home/alan/src/github.com/gnosis/gnosis.js","author":{"name":"Tim Coulter","email":"tim.coulter@consensys.net"},"bugs":{"url":"https://github.com/trufflesuite/truffle-schema/issues"},"dependencies":{"ajv":"^5.1.1","crypto-js":"^3.1.9-1"},"description":"JSON schema for contract artifacts","devDependencies":{"mocha":"^3.2.0","solc":"^0.4.16"},"homepage":"https://github.com/trufflesuite/truffle-schema#readme","keywords":["ethereum","json","schema","contract","artifacts"],"license":"MIT","main":"index.js","name":"truffle-contract-schema","repository":{"type":"git","url":"git+https://github.com/trufflesuite/truffle-schema.git"},"scripts":{"test":"mocha"},"version":"1.0.1"} /***/ }), -/* 226 */ +/* 227 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var compileSchema = __webpack_require__(227) - , resolve = __webpack_require__(85) - , Cache = __webpack_require__(239) - , SchemaObject = __webpack_require__(120) - , stableStringify = __webpack_require__(121) - , formats = __webpack_require__(240) - , rules = __webpack_require__(241) - , $dataMetaSchema = __webpack_require__(260) - , patternGroups = __webpack_require__(261) - , util = __webpack_require__(24) - , co = __webpack_require__(123); +var compileSchema = __webpack_require__(228) + , resolve = __webpack_require__(87) + , Cache = __webpack_require__(240) + , SchemaObject = __webpack_require__(124) + , stableStringify = __webpack_require__(125) + , formats = __webpack_require__(241) + , rules = __webpack_require__(242) + , $dataMetaSchema = __webpack_require__(261) + , patternGroups = __webpack_require__(262) + , util = __webpack_require__(26) + , co = __webpack_require__(127); module.exports = Ajv; @@ -21435,13 +21526,13 @@ Ajv.prototype.errorsText = errorsText; Ajv.prototype._addSchema = _addSchema; Ajv.prototype._compile = _compile; -Ajv.prototype.compileAsync = __webpack_require__(262); -var customKeyword = __webpack_require__(263); +Ajv.prototype.compileAsync = __webpack_require__(263); +var customKeyword = __webpack_require__(264); Ajv.prototype.addKeyword = customKeyword.add; Ajv.prototype.getKeyword = customKeyword.get; Ajv.prototype.removeKeyword = customKeyword.remove; -var errorClasses = __webpack_require__(87); +var errorClasses = __webpack_require__(89); Ajv.ValidationError = errorClasses.Validation; Ajv.MissingRefError = errorClasses.MissingRef; Ajv.$dataMetaSchema = $dataMetaSchema; @@ -21844,11 +21935,11 @@ function addFormat(name, format) { function addDraft6MetaSchema(self) { var $dataSchema; if (self._opts.$data) { - $dataSchema = __webpack_require__(265); + $dataSchema = __webpack_require__(266); self.addMetaSchema($dataSchema, $dataSchema.$id, true); } if (self._opts.meta === false) return; - var metaSchema = __webpack_require__(266); + var metaSchema = __webpack_require__(267); if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA); self.addMetaSchema(metaSchema, META_SCHEMA_ID, true); self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID; @@ -21886,26 +21977,26 @@ function getMetaSchemaOptions(self) { /***/ }), -/* 227 */ +/* 228 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var resolve = __webpack_require__(85) - , util = __webpack_require__(24) - , errorClasses = __webpack_require__(87) - , stableStringify = __webpack_require__(121); +var resolve = __webpack_require__(87) + , util = __webpack_require__(26) + , errorClasses = __webpack_require__(89) + , stableStringify = __webpack_require__(125); -var validateGenerator = __webpack_require__(122); +var validateGenerator = __webpack_require__(126); /** * Functions below are used inside compiled validations function */ -var co = __webpack_require__(123); +var co = __webpack_require__(127); var ucs2length = util.ucs2length; -var equal = __webpack_require__(86); +var equal = __webpack_require__(88); // this error is thrown by async schemas to return validation errors via exception var ValidationError = errorClasses.Validation; @@ -22272,7 +22363,7 @@ function vars(arr, statement) { /***/ }), -/* 228 */ +/* 229 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -22299,8 +22390,8 @@ function vars(arr, statement) { -var punycode = __webpack_require__(229); -var util = __webpack_require__(230); +var punycode = __webpack_require__(230); +var util = __webpack_require__(231); exports.parse = urlParse; exports.resolve = urlResolve; @@ -22375,7 +22466,7 @@ var protocolPattern = /^([a-z0-9.+-]+:)/i, 'gopher:': true, 'file:': true }, - querystring = __webpack_require__(231); + querystring = __webpack_require__(232); function urlParse(url, parseQueryString, slashesDenoteHost) { if (url && util.isObject(url) && url instanceof Url) return url; @@ -23011,7 +23102,7 @@ Url.prototype.parseHost = function() { /***/ }), -/* 229 */ +/* 230 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module, global) {var __WEBPACK_AMD_DEFINE_RESULT__;/*! https://mths.be/punycode v1.4.1 by @mathias */ @@ -23547,10 +23638,10 @@ Url.prototype.parseHost = function() { }(this)); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module), __webpack_require__(22))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(25)(module), __webpack_require__(24))) /***/ }), -/* 230 */ +/* 231 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -23573,18 +23664,18 @@ module.exports = { /***/ }), -/* 231 */ +/* 232 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -exports.decode = exports.parse = __webpack_require__(232); -exports.encode = exports.stringify = __webpack_require__(233); +exports.decode = exports.parse = __webpack_require__(233); +exports.encode = exports.stringify = __webpack_require__(234); /***/ }), -/* 232 */ +/* 233 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -23675,7 +23766,7 @@ var isArray = Array.isArray || function (xs) { /***/ }), -/* 233 */ +/* 234 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -23767,7 +23858,7 @@ var objectKeys = Object.keys || function (obj) { /***/ }), -/* 234 */ +/* 235 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -23794,7 +23885,7 @@ module.exports = function ucs2length(str) { /***/ }), -/* 235 */ +/* 236 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -23882,15 +23973,15 @@ function escapeJsonPtr(str) { /***/ }), -/* 236 */ +/* 237 */ /***/ (function(module, exports, __webpack_require__) { -exports.parse = __webpack_require__(237); -exports.stringify = __webpack_require__(238); +exports.parse = __webpack_require__(238); +exports.stringify = __webpack_require__(239); /***/ }), -/* 237 */ +/* 238 */ /***/ (function(module, exports) { var at, // The index of the current character @@ -24169,7 +24260,7 @@ module.exports = function (source, reviver) { /***/ }), -/* 238 */ +/* 239 */ /***/ (function(module, exports) { var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, @@ -24329,7 +24420,7 @@ module.exports = function (value, replacer, space) { /***/ }), -/* 239 */ +/* 240 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24362,13 +24453,13 @@ Cache.prototype.clear = function Cache_clear() { /***/ }), -/* 240 */ +/* 241 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var util = __webpack_require__(24); +var util = __webpack_require__(26); var DATE = /^\d\d\d\d-(\d\d)-(\d\d)$/; var DAYS = [0,31,29,31,30,31,30,31,31,30,31,30,31]; @@ -24504,14 +24595,14 @@ function regex(str) { /***/ }), -/* 241 */ +/* 242 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var ruleModules = __webpack_require__(242) - , toHash = __webpack_require__(24).toHash; +var ruleModules = __webpack_require__(243) + , toHash = __webpack_require__(26).toHash; module.exports = function rules() { var RULES = [ @@ -24569,7 +24660,7 @@ module.exports = function rules() { /***/ }), -/* 242 */ +/* 243 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24577,37 +24668,37 @@ module.exports = function rules() { //all requires must be explicit because browserify won't work with dynamic requires module.exports = { - '$ref': __webpack_require__(243), - allOf: __webpack_require__(244), - anyOf: __webpack_require__(245), - const: __webpack_require__(246), - contains: __webpack_require__(247), - dependencies: __webpack_require__(248), - 'enum': __webpack_require__(249), - format: __webpack_require__(250), - items: __webpack_require__(251), - maximum: __webpack_require__(124), - minimum: __webpack_require__(124), - maxItems: __webpack_require__(125), - minItems: __webpack_require__(125), - maxLength: __webpack_require__(126), - minLength: __webpack_require__(126), - maxProperties: __webpack_require__(127), - minProperties: __webpack_require__(127), - multipleOf: __webpack_require__(252), - not: __webpack_require__(253), - oneOf: __webpack_require__(254), - pattern: __webpack_require__(255), - properties: __webpack_require__(256), - propertyNames: __webpack_require__(257), - required: __webpack_require__(258), - uniqueItems: __webpack_require__(259), - validate: __webpack_require__(122) + '$ref': __webpack_require__(244), + allOf: __webpack_require__(245), + anyOf: __webpack_require__(246), + const: __webpack_require__(247), + contains: __webpack_require__(248), + dependencies: __webpack_require__(249), + 'enum': __webpack_require__(250), + format: __webpack_require__(251), + items: __webpack_require__(252), + maximum: __webpack_require__(128), + minimum: __webpack_require__(128), + maxItems: __webpack_require__(129), + minItems: __webpack_require__(129), + maxLength: __webpack_require__(130), + minLength: __webpack_require__(130), + maxProperties: __webpack_require__(131), + minProperties: __webpack_require__(131), + multipleOf: __webpack_require__(253), + not: __webpack_require__(254), + oneOf: __webpack_require__(255), + pattern: __webpack_require__(256), + properties: __webpack_require__(257), + propertyNames: __webpack_require__(258), + required: __webpack_require__(259), + uniqueItems: __webpack_require__(260), + validate: __webpack_require__(126) }; /***/ }), -/* 243 */ +/* 244 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24737,7 +24828,7 @@ module.exports = function generate_ref(it, $keyword, $ruleType) { /***/ }), -/* 244 */ +/* 245 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24787,7 +24878,7 @@ module.exports = function generate_allOf(it, $keyword, $ruleType) { /***/ }), -/* 245 */ +/* 246 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24867,7 +24958,7 @@ module.exports = function generate_anyOf(it, $keyword, $ruleType) { /***/ }), -/* 246 */ +/* 247 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -24929,7 +25020,7 @@ module.exports = function generate_const(it, $keyword, $ruleType) { /***/ }), -/* 247 */ +/* 248 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25017,7 +25108,7 @@ module.exports = function generate_contains(it, $keyword, $ruleType) { /***/ }), -/* 248 */ +/* 249 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25191,7 +25282,7 @@ module.exports = function generate_dependencies(it, $keyword, $ruleType) { /***/ }), -/* 249 */ +/* 250 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25263,7 +25354,7 @@ module.exports = function generate_enum(it, $keyword, $ruleType) { /***/ }), -/* 250 */ +/* 251 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25419,7 +25510,7 @@ module.exports = function generate_format(it, $keyword, $ruleType) { /***/ }), -/* 251 */ +/* 252 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25566,7 +25657,7 @@ module.exports = function generate_items(it, $keyword, $ruleType) { /***/ }), -/* 252 */ +/* 253 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25649,7 +25740,7 @@ module.exports = function generate_multipleOf(it, $keyword, $ruleType) { /***/ }), -/* 253 */ +/* 254 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25739,7 +25830,7 @@ module.exports = function generate_not(it, $keyword, $ruleType) { /***/ }), -/* 254 */ +/* 255 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25816,7 +25907,7 @@ module.exports = function generate_oneOf(it, $keyword, $ruleType) { /***/ }), -/* 255 */ +/* 256 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25897,7 +25988,7 @@ module.exports = function generate_pattern(it, $keyword, $ruleType) { /***/ }), -/* 256 */ +/* 257 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26372,7 +26463,7 @@ module.exports = function generate_properties(it, $keyword, $ruleType) { /***/ }), -/* 257 */ +/* 258 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26460,7 +26551,7 @@ module.exports = function generate_propertyNames(it, $keyword, $ruleType) { /***/ }), -/* 258 */ +/* 259 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26735,7 +26826,7 @@ module.exports = function generate_required(it, $keyword, $ruleType) { /***/ }), -/* 259 */ +/* 260 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26813,7 +26904,7 @@ module.exports = function generate_uniqueItems(it, $keyword, $ruleType) { /***/ }), -/* 260 */ +/* 261 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26869,7 +26960,7 @@ module.exports = function (metaSchema, keywordsJsonPointers) { /***/ }), -/* 261 */ +/* 262 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26912,13 +27003,13 @@ module.exports = function (ajv) { /***/ }), -/* 262 */ +/* 263 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var MissingRefError = __webpack_require__(87).MissingRef; +var MissingRefError = __webpack_require__(89).MissingRef; module.exports = compileAsync; @@ -27009,14 +27100,14 @@ function compileAsync(schema, meta, callback) { /***/ }), -/* 263 */ +/* 264 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i; -var customRuleCode = __webpack_require__(264); +var customRuleCode = __webpack_require__(265); module.exports = { add: addKeyword, @@ -27146,7 +27237,7 @@ function removeKeyword(keyword) { /***/ }), -/* 264 */ +/* 265 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -27379,42 +27470,42 @@ module.exports = function generate_custom(it, $keyword, $ruleType) { /***/ }), -/* 265 */ +/* 266 */ /***/ (function(module, exports) { module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/$data.json#","description":"Meta-schema for $data reference (JSON-schema extension proposal)","type":"object","required":["$data"],"properties":{"$data":{"type":"string","anyOf":[{"format":"relative-json-pointer"},{"format":"json-pointer"}]}},"additionalProperties":false} /***/ }), -/* 266 */ +/* 267 */ /***/ (function(module, exports) { module.exports = {"$schema":"http://json-schema.org/draft-06/schema#","$id":"http://json-schema.org/draft-06/schema#","title":"Core schema meta-schema","definitions":{"schemaArray":{"type":"array","minItems":1,"items":{"$ref":"#"}},"nonNegativeInteger":{"type":"integer","minimum":0},"nonNegativeIntegerDefault0":{"allOf":[{"$ref":"#/definitions/nonNegativeInteger"},{"default":0}]},"simpleTypes":{"enum":["array","boolean","integer","null","number","object","string"]},"stringArray":{"type":"array","items":{"type":"string"},"uniqueItems":true,"default":[]}},"type":["object","boolean"],"properties":{"$id":{"type":"string","format":"uri-reference"},"$schema":{"type":"string","format":"uri"},"$ref":{"type":"string","format":"uri-reference"},"title":{"type":"string"},"description":{"type":"string"},"default":{},"multipleOf":{"type":"number","exclusiveMinimum":0},"maximum":{"type":"number"},"exclusiveMaximum":{"type":"number"},"minimum":{"type":"number"},"exclusiveMinimum":{"type":"number"},"maxLength":{"$ref":"#/definitions/nonNegativeInteger"},"minLength":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"pattern":{"type":"string","format":"regex"},"additionalItems":{"$ref":"#"},"items":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/schemaArray"}],"default":{}},"maxItems":{"$ref":"#/definitions/nonNegativeInteger"},"minItems":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"uniqueItems":{"type":"boolean","default":false},"contains":{"$ref":"#"},"maxProperties":{"$ref":"#/definitions/nonNegativeInteger"},"minProperties":{"$ref":"#/definitions/nonNegativeIntegerDefault0"},"required":{"$ref":"#/definitions/stringArray"},"additionalProperties":{"$ref":"#"},"definitions":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"properties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"patternProperties":{"type":"object","additionalProperties":{"$ref":"#"},"default":{}},"dependencies":{"type":"object","additionalProperties":{"anyOf":[{"$ref":"#"},{"$ref":"#/definitions/stringArray"}]}},"propertyNames":{"$ref":"#"},"const":{},"enum":{"type":"array","minItems":1,"uniqueItems":true},"type":{"anyOf":[{"$ref":"#/definitions/simpleTypes"},{"type":"array","items":{"$ref":"#/definitions/simpleTypes"},"minItems":1,"uniqueItems":true}]},"format":{"type":"string"},"allOf":{"$ref":"#/definitions/schemaArray"},"anyOf":{"$ref":"#/definitions/schemaArray"},"oneOf":{"$ref":"#/definitions/schemaArray"},"not":{"$ref":"#"}},"default":{}} /***/ }), -/* 267 */ +/* 268 */ /***/ (function(module, exports) { module.exports = {"id":"contract-object.spec.json","$schema":"http://json-schema.org/schema#","title":"Contract Object","description":"Describes a contract consumable by Truffle, possibly including deployed instances on networks","type":"object","properties":{"contractName":{"allOf":[{"$ref":"#/definitions/ContractName"},{"description":"Name used to identify the contract","default":"Contract"}]},"abi":{"allOf":[{"$ref":"abi.spec.json#"},{"description":"Interface description returned by compiler for source"}]},"bytecode":{"allOf":[{"$ref":"#/definitions/Bytecode"},{"description":"Bytecode sent as contract-creation transaction data, with unresolved link references"}]},"deployedBytecode":{"allOf":[{"$ref":"#/definitions/Bytecode"},{"description":"On-chain deployed contract bytecode, with unresolved link references"}]},"sourceMap":{"allOf":[{"$ref":"#/definitions/SourceMap"},{"description":"Source mapping for contract-creation transaction data bytecode"}]},"deployedSourceMap":{"allOf":[{"$ref":"#/definitions/SourceMap"},{"description":"Source mapping for contract bytecode"}]},"source":{"$ref":"#/definitions/Source"},"sourcePath":{"$ref":"#/definitions/SourcePath"},"ast":{"$ref":"#/definitions/AST"},"compiler":{"type":"object","properties":{"name":{"type":"string"},"version":{"type":"string"}}},"networks":{"patternProperties":{"^[a-zA-Z0-9]+$":{"$ref":"network-object.spec.json#"}},"additionalProperties":false},"schemaVersion":{"$ref":"#/definitions/SchemaVersion"},"updatedAt":{"type":"string","format":"date-time"}},"required":["abi"],"patternProperties":{"^x-":{"anyOf":[{"type":"string"},{"type":"number"},{"type":"object"},{"type":"array"}]}},"additionalProperties":false,"definitions":{"ContractName":{"type":"string","pattern":"^[a-zA-Z_][a-zA-Z0-9_]*$"},"Bytecode":{"type":"string","pattern":"^0x0$|^0x([a-fA-F0-9]{2}|__.{38})+$"},"Source":{"type":"string"},"SourceMap":{"type":"string","examples":["315:637:1:-;;;452:55;;;;;;;-1:-1:-1;;;;;485:9:1;476:19;:8;:19;;;;;;;;;;498:5;476:27;;452:55;315:637;;;;;;;"]},"SourcePath":{"type":"string"},"AST":{"type":"object"},"SchemaVersion":{"type":"string","pattern":"[0-9]+\\.[0-9]+\\.[0-9]+"}}} /***/ }), -/* 268 */ +/* 269 */ /***/ (function(module, exports) { module.exports = {"id":"network-object.spec.json","$schema":"http://json-schema.org/schema#","title":"Network Object","type":"object","properties":{"address":{"$ref":"#/definitions/Address"},"events":{"type":"object","patternProperties":{"^0x[a-fA-F0-9]{64}$":{"$ref":"abi.spec.json#/definitions/Event"}},"additionalProperties":false},"links":{"type":"object","patternProperties":{"^[a-zA-Z_][a-zA-Z0-9_]*$":{"$ref":"#/definitions/Link"}},"additionalProperties":false}},"additionalProperties":false,"definitions":{"Address":{"type":"string","pattern":"^0x[a-fA-F0-9]{40}$"},"Link":{"type":"object","properties":{"address":{"$ref":"#/definitions/Address"},"events":{"type":"object","patternProperties":{"^0x[a-fA-F0-9]{64}$":{"$ref":"abi.spec.json#/definitions/Event"}},"additionalProperties":false}}}}} /***/ }), -/* 269 */ +/* 270 */ /***/ (function(module, exports) { module.exports = {"id":"abi.spec.json","$schema":"http://json-schema.org/schema#","title":"ABI","type":"array","items":{"oneOf":[{"$ref":"#/definitions/Event"},{"$ref":"#/definitions/ConstructorFunction"},{"$ref":"#/definitions/FallbackFunction"},{"$ref":"#/definitions/NormalFunction"}]},"definitions":{"Name":{"type":"string","pattern":"^$|^[a-zA-Z_\\$][a-zA-Z_\\$0-9]*$"},"Type":{"type":"string","oneOf":[{"pattern":"^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?(\\[[0-9]*\\])?$"},{"pattern":"^address(\\[[0-9]*\\])?$"},{"pattern":"^bool(\\[[0-9]*\\])?$"},{"pattern":"^u?fixed(0x8|8x0|0x16|8x8|16x0|0x24|8x16|16x8|24x0|0x32|8x24|16x16|24x8|32x0|0x40|8x32|16x24|24x16|32x8|40x0|0x48|8x40|16x32|24x24|32x16|40x8|48x0|0x56|8x48|16x40|24x32|32x24|40x16|48x8|56x0|0x64|8x56|16x48|24x40|32x32|40x24|48x16|56x8|64x0|0x72|8x64|16x56|24x48|32x40|40x32|48x24|56x16|64x8|72x0|0x80|8x72|16x64|24x56|32x48|40x40|48x32|56x24|64x16|72x8|80x0|0x88|8x80|16x72|24x64|32x56|40x48|48x40|56x32|64x24|72x16|80x8|88x0|0x96|8x88|16x80|24x72|32x64|40x56|48x48|56x40|64x32|72x24|80x16|88x8|96x0|0x104|8x96|16x88|24x80|32x72|40x64|48x56|56x48|64x40|72x32|80x24|88x16|96x8|104x0|0x112|8x104|16x96|24x88|32x80|40x72|48x64|56x56|64x48|72x40|80x32|88x24|96x16|104x8|112x0|0x120|8x112|16x104|24x96|32x88|40x80|48x72|56x64|64x56|72x48|80x40|88x32|96x24|104x16|112x8|120x0|0x128|8x120|16x112|24x104|32x96|40x88|48x80|56x72|64x64|72x56|80x48|88x40|96x32|104x24|112x16|120x8|128x0|0x136|8x128|16x120|24x112|32x104|40x96|48x88|56x80|64x72|72x64|80x56|88x48|96x40|104x32|112x24|120x16|128x8|136x0|0x144|8x136|16x128|24x120|32x112|40x104|48x96|56x88|64x80|72x72|80x64|88x56|96x48|104x40|112x32|120x24|128x16|136x8|144x0|0x152|8x144|16x136|24x128|32x120|40x112|48x104|56x96|64x88|72x80|80x72|88x64|96x56|104x48|112x40|120x32|128x24|136x16|144x8|152x0|0x160|8x152|16x144|24x136|32x128|40x120|48x112|56x104|64x96|72x88|80x80|88x72|96x64|104x56|112x48|120x40|128x32|136x24|144x16|152x8|160x0|0x168|8x160|16x152|24x144|32x136|40x128|48x120|56x112|64x104|72x96|80x88|88x80|96x72|104x64|112x56|120x48|128x40|136x32|144x24|152x16|160x8|168x0|0x176|8x168|16x160|24x152|32x144|40x136|48x128|56x120|64x112|72x104|80x96|88x88|96x80|104x72|112x64|120x56|128x48|136x40|144x32|152x24|160x16|168x8|176x0|0x184|8x176|16x168|24x160|32x152|40x144|48x136|56x128|64x120|72x112|80x104|88x96|96x88|104x80|112x72|120x64|128x56|136x48|144x40|152x32|160x24|168x16|176x8|184x0|0x192|8x184|16x176|24x168|32x160|40x152|48x144|56x136|64x128|72x120|80x112|88x104|96x96|104x88|112x80|120x72|128x64|136x56|144x48|152x40|160x32|168x24|176x16|184x8|192x0|0x200|8x192|16x184|24x176|32x168|40x160|48x152|56x144|64x136|72x128|80x120|88x112|96x104|104x96|112x88|120x80|128x72|136x64|144x56|152x48|160x40|168x32|176x24|184x16|192x8|200x0|0x208|8x200|16x192|24x184|32x176|40x168|48x160|56x152|64x144|72x136|80x128|88x120|96x112|104x104|112x96|120x88|128x80|136x72|144x64|152x56|160x48|168x40|176x32|184x24|192x16|200x8|208x0|0x216|8x208|16x200|24x192|32x184|40x176|48x168|56x160|64x152|72x144|80x136|88x128|96x120|104x112|112x104|120x96|128x88|136x80|144x72|152x64|160x56|168x48|176x40|184x32|192x24|200x16|208x8|216x0|0x224|8x216|16x208|24x200|32x192|40x184|48x176|56x168|64x160|72x152|80x144|88x136|96x128|104x120|112x112|120x104|128x96|136x88|144x80|152x72|160x64|168x56|176x48|184x40|192x32|200x24|208x16|216x8|224x0|0x232|8x224|16x216|24x208|32x200|40x192|48x184|56x176|64x168|72x160|80x152|88x144|96x136|104x128|112x120|120x112|128x104|136x96|144x88|152x80|160x72|168x64|176x56|184x48|192x40|200x32|208x24|216x16|224x8|232x0|0x240|8x232|16x224|24x216|32x208|40x200|48x192|56x184|64x176|72x168|80x160|88x152|96x144|104x136|112x128|120x120|128x112|136x104|144x96|152x88|160x80|168x72|176x64|184x56|192x48|200x40|208x32|216x24|224x16|232x8|240x0|0x248|8x240|16x232|24x224|32x216|40x208|48x200|56x192|64x184|72x176|80x168|88x160|96x152|104x144|112x136|120x128|128x120|136x112|144x104|152x96|160x88|168x80|176x72|184x64|192x56|200x48|208x40|216x32|224x24|232x16|240x8|248x0|0x256|8x248|16x240|24x232|32x224|40x216|48x208|56x200|64x192|72x184|80x176|88x168|96x160|104x152|112x144|120x136|128x128|136x120|144x112|152x104|160x96|168x88|176x80|184x72|192x64|200x56|208x48|216x40|224x32|232x24|240x16|248x8|256x0)?(\\[[0-9]*\\])?$"},{"pattern":"^bytes(0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)(\\[[0-9]*\\])?"},{"pattern":"^bytes$"},{"pattern":"^function(\\[[0-9]*\\])?$"},{"pattern":"^string$"}]},"StateMutability":{"type":"string","enum":["pure","view","nonpayable","payable"]},"NormalFunction":{"type":"object","properties":{"type":{"type":"string","enum":["function"],"default":"function"},"name":{"$ref":"#/definitions/Name"},"inputs":{"type":"array","items":{"$ref":"#/definitions/Parameter"}},"outputs":{"type":"array","items":{"$ref":"#/definitions/Parameter"},"default":[]},"stateMutability":{"$ref":"#/definitions/StateMutability"},"constant":{"type":"boolean"},"payable":{"type":"boolean","default":false}},"required":["name","inputs","constant"],"additionalProperties":false},"ConstructorFunction":{"type":"object","properties":{"type":{"type":"string","enum":["constructor"]},"inputs":{"type":"array","items":{"$ref":"#/definitions/Parameter"}},"payable":{"type":"boolean","default":false}},"required":["type","inputs"],"additionalProperties":false},"FallbackFunction":{"type":"object","properties":{"type":{"type":"string","enum":["fallback"]},"constant":{"type":"boolean"},"payable":{"type":"boolean","default":false}},"required":["type"],"additionalProperties":false},"Event":{"type":"object","properties":{"type":{"type":"string","enum":["event"]},"name":{"$ref":"#/definitions/Name"},"inputs":{"type":"array","items":{"$ref":"#/definitions/EventParameter"}},"anonymous":{"type":"boolean"}},"required":["type","name","inputs","anonymous"],"additionalProperties":false},"Parameter":{"type":"object","properties":{"name":{"$ref":"#/definitions/Name"},"type":{"$ref":"#/definitions/Type"}},"required":["name","type"]},"EventParameter":{"type":"object","properties":{"name":{"$ref":"#/definitions/Name"},"type":{"$ref":"#/definitions/Type"},"indexed":{"type":"boolean"}},"required":["name","type","indexed"]}}} /***/ }), -/* 270 */ +/* 271 */ /***/ (function(module, exports, __webpack_require__) { -/* WEBPACK VAR INJECTION */(function(global, module) {var ethJSABI = __webpack_require__(271); -var BlockchainUtils = __webpack_require__(283); -var Web3 = __webpack_require__(88); +/* WEBPACK VAR INJECTION */(function(global, module) {var ethJSABI = __webpack_require__(272); +var BlockchainUtils = __webpack_require__(284); +var Web3 = __webpack_require__(90); // For browserified version. If browserify gave us an empty version, // look for the one provided by the user. @@ -28309,10 +28400,10 @@ var contract = (function(module) { return Contract; })(module || {}); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(22), __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(24), __webpack_require__(25)(module))) /***/ }), -/* 271 */ +/* 272 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28320,7 +28411,7 @@ var contract = (function(module) { /* eslint-disable */ -var utils = __webpack_require__(275); +var utils = __webpack_require__(276); var uint256Coder = utils.uint256Coder; var coderBoolean = utils.coderBoolean; var coderFixedBytes = utils.coderFixedBytes; @@ -28449,10 +28540,10 @@ module.exports = { encodeEvent: encodeEvent, decodeEvent: decodeEvent }; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(41).Buffer)) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(42).Buffer)) /***/ }), -/* 272 */ +/* 273 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28573,7 +28664,7 @@ function fromByteArray (uint8) { /***/ }), -/* 273 */ +/* 274 */ /***/ (function(module, exports) { exports.read = function (buffer, offset, isLE, mLen, nBytes) { @@ -28663,7 +28754,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) { /***/ }), -/* 274 */ +/* 275 */ /***/ (function(module, exports) { var toString = {}.toString; @@ -28674,15 +28765,15 @@ module.exports = Array.isArray || function (arr) { /***/ }), -/* 275 */ +/* 276 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; /* WEBPACK VAR INJECTION */(function(Buffer) { -var BN = __webpack_require__(276); -var numberToBN = __webpack_require__(277); -var keccak256 = __webpack_require__(281).keccak_256; +var BN = __webpack_require__(277); +var numberToBN = __webpack_require__(278); +var keccak256 = __webpack_require__(282).keccak_256; // from ethereumjs-util function stripZeros(aInput) { @@ -29095,10 +29186,10 @@ module.exports = { paramTypePart: paramTypePart, getParamCoder: getParamCoder }; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(41).Buffer)) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(42).Buffer)) /***/ }), -/* 276 */ +/* 277 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {(function (module, exports) { @@ -29153,7 +29244,7 @@ module.exports = { var Buffer; try { - Buffer = __webpack_require__(41).Buffer; + Buffer = __webpack_require__(42).Buffer; } catch (e) { } @@ -32529,14 +32620,14 @@ module.exports = { }; })(typeof module === 'undefined' || module, this); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(25)(module))) /***/ }), -/* 277 */ +/* 278 */ /***/ (function(module, exports, __webpack_require__) { -var BN = __webpack_require__(278); -var stripHexPrefix = __webpack_require__(279); +var BN = __webpack_require__(279); +var stripHexPrefix = __webpack_require__(280); /** * Returns a BN object, converts a number value to a BN @@ -32576,7 +32667,7 @@ module.exports = function numberToBN(arg) { /***/ }), -/* 278 */ +/* 279 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {(function (module, exports) { @@ -32631,7 +32722,7 @@ module.exports = function numberToBN(arg) { var Buffer; try { - Buffer = __webpack_require__(41).Buffer; + Buffer = __webpack_require__(42).Buffer; } catch (e) { } @@ -36007,13 +36098,13 @@ module.exports = function numberToBN(arg) { }; })(typeof module === 'undefined' || module, this); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(25)(module))) /***/ }), -/* 279 */ +/* 280 */ /***/ (function(module, exports, __webpack_require__) { -var isHexPrefixed = __webpack_require__(280); +var isHexPrefixed = __webpack_require__(281); /** * Removes '0x' from a given `String` is present @@ -36030,7 +36121,7 @@ module.exports = function stripHexPrefix(str) { /***/ }), -/* 280 */ +/* 281 */ /***/ (function(module, exports) { /** @@ -36049,7 +36140,7 @@ module.exports = function isHexPrefixed(str) { /***/ }), -/* 281 */ +/* 282 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(process, global) {/** @@ -36524,10 +36615,10 @@ module.exports = function isHexPrefixed(str) { } }(this)); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(282), __webpack_require__(22))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(283), __webpack_require__(24))) /***/ }), -/* 282 */ +/* 283 */ /***/ (function(module, exports) { // shim for using process in browser @@ -36717,12 +36808,12 @@ process.umask = function() { return 0; }; /***/ }), -/* 283 */ +/* 284 */ /***/ (function(module, exports, __webpack_require__) { // TODO: remove web3 requirement // Call functions directly on the provider. -var Web3 = __webpack_require__(88); +var Web3 = __webpack_require__(90); var Blockchain = { parse: function(uri) { @@ -36784,7 +36875,7 @@ module.exports = Blockchain; /***/ }), -/* 284 */ +/* 285 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -36814,24 +36905,24 @@ module.exports = Blockchain; * @date 2014 */ -var RequestManager = __webpack_require__(285); -var Iban = __webpack_require__(59); -var Eth = __webpack_require__(310); -var DB = __webpack_require__(329); -var Shh = __webpack_require__(330); -var Net = __webpack_require__(331); -var Personal = __webpack_require__(332); -var Swarm = __webpack_require__(333); -var Settings = __webpack_require__(334); -var version = __webpack_require__(335); -var utils = __webpack_require__(1); -var sha3 = __webpack_require__(43); -var extend = __webpack_require__(336); -var Batch = __webpack_require__(337); -var Property = __webpack_require__(29); -var HttpProvider = __webpack_require__(338); -var IpcProvider = __webpack_require__(341); -var BigNumber = __webpack_require__(42); +var RequestManager = __webpack_require__(286); +var Iban = __webpack_require__(61); +var Eth = __webpack_require__(311); +var DB = __webpack_require__(330); +var Shh = __webpack_require__(331); +var Net = __webpack_require__(332); +var Personal = __webpack_require__(333); +var Swarm = __webpack_require__(334); +var Settings = __webpack_require__(335); +var version = __webpack_require__(336); +var utils = __webpack_require__(2); +var sha3 = __webpack_require__(44); +var extend = __webpack_require__(337); +var Batch = __webpack_require__(338); +var Property = __webpack_require__(31); +var HttpProvider = __webpack_require__(339); +var IpcProvider = __webpack_require__(342); +var BigNumber = __webpack_require__(43); @@ -36942,7 +37033,7 @@ module.exports = Web3; /***/ }), -/* 285 */ +/* 286 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -36971,10 +37062,10 @@ module.exports = Web3; * @date 2014 */ -var Jsonrpc = __webpack_require__(128); -var utils = __webpack_require__(1); -var c = __webpack_require__(58); -var errors = __webpack_require__(28); +var Jsonrpc = __webpack_require__(132); +var utils = __webpack_require__(2); +var c = __webpack_require__(60); +var errors = __webpack_require__(30); /** * It's responsible for passing messages to providers @@ -37213,13 +37304,13 @@ module.exports = RequestManager; /***/ }), -/* 286 */ +/* 287 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(57), __webpack_require__(287), __webpack_require__(288), __webpack_require__(25), __webpack_require__(26), __webpack_require__(89), __webpack_require__(129), __webpack_require__(289), __webpack_require__(130), __webpack_require__(290), __webpack_require__(131), __webpack_require__(291), __webpack_require__(90), __webpack_require__(292), __webpack_require__(27), __webpack_require__(2), __webpack_require__(293), __webpack_require__(294), __webpack_require__(295), __webpack_require__(296), __webpack_require__(297), __webpack_require__(298), __webpack_require__(299), __webpack_require__(300), __webpack_require__(301), __webpack_require__(302), __webpack_require__(303), __webpack_require__(304), __webpack_require__(305), __webpack_require__(306), __webpack_require__(307), __webpack_require__(308)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(59), __webpack_require__(288), __webpack_require__(289), __webpack_require__(27), __webpack_require__(28), __webpack_require__(91), __webpack_require__(133), __webpack_require__(290), __webpack_require__(134), __webpack_require__(291), __webpack_require__(135), __webpack_require__(292), __webpack_require__(92), __webpack_require__(293), __webpack_require__(29), __webpack_require__(3), __webpack_require__(294), __webpack_require__(295), __webpack_require__(296), __webpack_require__(297), __webpack_require__(298), __webpack_require__(299), __webpack_require__(300), __webpack_require__(301), __webpack_require__(302), __webpack_require__(303), __webpack_require__(304), __webpack_require__(305), __webpack_require__(306), __webpack_require__(307), __webpack_require__(308), __webpack_require__(309)); } else if (typeof define === "function" && define.amd) { // AMD @@ -37236,7 +37327,7 @@ module.exports = RequestManager; })); /***/ }), -/* 287 */ +/* 288 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -37317,7 +37408,7 @@ module.exports = RequestManager; })); /***/ }), -/* 288 */ +/* 289 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -37471,13 +37562,13 @@ module.exports = RequestManager; })); /***/ }), -/* 289 */ +/* 290 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(129)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(133)); } else if (typeof define === "function" && define.amd) { // AMD @@ -37556,13 +37647,13 @@ module.exports = RequestManager; })); /***/ }), -/* 290 */ +/* 291 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(57), __webpack_require__(130)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(59), __webpack_require__(134)); } else if (typeof define === "function" && define.amd) { // AMD @@ -37644,7 +37735,7 @@ module.exports = RequestManager; })); /***/ }), -/* 291 */ +/* 292 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory) { @@ -37916,13 +38007,13 @@ module.exports = RequestManager; })); /***/ }), -/* 292 */ +/* 293 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(89), __webpack_require__(90)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(91), __webpack_require__(92)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38066,13 +38157,13 @@ module.exports = RequestManager; })); /***/ }), -/* 293 */ +/* 294 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38149,13 +38240,13 @@ module.exports = RequestManager; })); /***/ }), -/* 294 */ +/* 295 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38212,13 +38303,13 @@ module.exports = RequestManager; })); /***/ }), -/* 295 */ +/* 296 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38333,13 +38424,13 @@ module.exports = RequestManager; })); /***/ }), -/* 296 */ +/* 297 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38392,13 +38483,13 @@ module.exports = RequestManager; })); /***/ }), -/* 297 */ +/* 298 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38437,13 +38528,13 @@ module.exports = RequestManager; })); /***/ }), -/* 298 */ +/* 299 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38491,13 +38582,13 @@ module.exports = RequestManager; })); /***/ }), -/* 299 */ +/* 300 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38540,13 +38631,13 @@ module.exports = RequestManager; })); /***/ }), -/* 300 */ +/* 301 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38585,13 +38676,13 @@ module.exports = RequestManager; })); /***/ }), -/* 301 */ +/* 302 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38635,13 +38726,13 @@ module.exports = RequestManager; })); /***/ }), -/* 302 */ +/* 303 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38670,13 +38761,13 @@ module.exports = RequestManager; })); /***/ }), -/* 303 */ +/* 304 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38741,13 +38832,13 @@ module.exports = RequestManager; })); /***/ }), -/* 304 */ +/* 305 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(25), __webpack_require__(26), __webpack_require__(27), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(27), __webpack_require__(28), __webpack_require__(29), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -38978,13 +39069,13 @@ module.exports = RequestManager; })); /***/ }), -/* 305 */ +/* 306 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(25), __webpack_require__(26), __webpack_require__(27), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(27), __webpack_require__(28), __webpack_require__(29), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -39753,13 +39844,13 @@ module.exports = RequestManager; })); /***/ }), -/* 306 */ +/* 307 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(25), __webpack_require__(26), __webpack_require__(27), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(27), __webpack_require__(28), __webpack_require__(29), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -39897,13 +39988,13 @@ module.exports = RequestManager; })); /***/ }), -/* 307 */ +/* 308 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(25), __webpack_require__(26), __webpack_require__(27), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(27), __webpack_require__(28), __webpack_require__(29), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -40094,13 +40185,13 @@ module.exports = RequestManager; })); /***/ }), -/* 308 */ +/* 309 */ /***/ (function(module, exports, __webpack_require__) { ;(function (root, factory, undef) { if (true) { // CommonJS - module.exports = exports = factory(__webpack_require__(0), __webpack_require__(25), __webpack_require__(26), __webpack_require__(27), __webpack_require__(2)); + module.exports = exports = factory(__webpack_require__(0), __webpack_require__(27), __webpack_require__(28), __webpack_require__(29), __webpack_require__(3)); } else if (typeof define === "function" && define.amd) { // AMD @@ -40289,7 +40380,7 @@ module.exports = RequestManager; })); /***/ }), -/* 309 */ +/* 310 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module, global) {var __WEBPACK_AMD_DEFINE_RESULT__;/*! https://mths.be/utf8js v2.1.2 by @mathias */ @@ -40536,10 +40627,10 @@ module.exports = RequestManager; }(this)); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(23)(module), __webpack_require__(22))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(25)(module), __webpack_require__(24))) /***/ }), -/* 310 */ +/* 311 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40569,17 +40660,17 @@ module.exports = RequestManager; var formatters = __webpack_require__(13); -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); var Method = __webpack_require__(18); -var Property = __webpack_require__(29); -var c = __webpack_require__(58); -var Contract = __webpack_require__(311); -var watches = __webpack_require__(61); -var Filter = __webpack_require__(60); -var IsSyncing = __webpack_require__(323); -var namereg = __webpack_require__(324); -var Iban = __webpack_require__(59); -var transfer = __webpack_require__(327); +var Property = __webpack_require__(31); +var c = __webpack_require__(60); +var Contract = __webpack_require__(312); +var watches = __webpack_require__(63); +var Filter = __webpack_require__(62); +var IsSyncing = __webpack_require__(324); +var namereg = __webpack_require__(325); +var Iban = __webpack_require__(61); +var transfer = __webpack_require__(328); var blockCall = function (args) { return (utils.isString(args[0]) && args[0].indexOf('0x') === 0) ? "eth_getBlockByHash" : "eth_getBlockByNumber"; @@ -40900,7 +40991,7 @@ module.exports = Eth; /***/ }), -/* 311 */ +/* 312 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -40925,11 +41016,11 @@ module.exports = Eth; * @date 2014 */ -var utils = __webpack_require__(1); -var coder = __webpack_require__(91); -var SolidityEvent = __webpack_require__(133); -var SolidityFunction = __webpack_require__(321); -var AllEvents = __webpack_require__(322); +var utils = __webpack_require__(2); +var coder = __webpack_require__(93); +var SolidityEvent = __webpack_require__(137); +var SolidityFunction = __webpack_require__(322); +var AllEvents = __webpack_require__(323); /** * Should be called to encode constructor params @@ -41216,11 +41307,11 @@ module.exports = ContractFactory; /***/ }), -/* 312 */ +/* 313 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeAddress is a prootype that represents address type @@ -41248,11 +41339,11 @@ module.exports = SolidityTypeAddress; /***/ }), -/* 313 */ +/* 314 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeBool is a prootype that represents bool type @@ -41280,11 +41371,11 @@ module.exports = SolidityTypeBool; /***/ }), -/* 314 */ +/* 315 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeInt is a prootype that represents int type @@ -41318,11 +41409,11 @@ module.exports = SolidityTypeInt; /***/ }), -/* 315 */ +/* 316 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeUInt is a prootype that represents uint type @@ -41356,11 +41447,11 @@ module.exports = SolidityTypeUInt; /***/ }), -/* 316 */ +/* 317 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); var SolidityTypeDynamicBytes = function () { this._inputFormatter = f.formatInputDynamicBytes; @@ -41382,11 +41473,11 @@ module.exports = SolidityTypeDynamicBytes; /***/ }), -/* 317 */ +/* 318 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); var SolidityTypeString = function () { this._inputFormatter = f.formatInputString; @@ -41408,11 +41499,11 @@ module.exports = SolidityTypeString; /***/ }), -/* 318 */ +/* 319 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeReal is a prootype that represents real type @@ -41446,11 +41537,11 @@ module.exports = SolidityTypeReal; /***/ }), -/* 319 */ +/* 320 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeUReal is a prootype that represents ureal type @@ -41484,11 +41575,11 @@ module.exports = SolidityTypeUReal; /***/ }), -/* 320 */ +/* 321 */ /***/ (function(module, exports, __webpack_require__) { var f = __webpack_require__(6); -var SolidityType = __webpack_require__(8); +var SolidityType = __webpack_require__(10); /** * SolidityTypeBytes is a prototype that represents the bytes type. @@ -41519,7 +41610,7 @@ module.exports = SolidityTypeBytes; /***/ }), -/* 321 */ +/* 322 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -41544,11 +41635,11 @@ module.exports = SolidityTypeBytes; * @date 2015 */ -var coder = __webpack_require__(91); -var utils = __webpack_require__(1); -var errors = __webpack_require__(28); +var coder = __webpack_require__(93); +var utils = __webpack_require__(2); +var errors = __webpack_require__(30); var formatters = __webpack_require__(13); -var sha3 = __webpack_require__(43); +var sha3 = __webpack_require__(44); /** * This prototype should be used to call/sendTransaction to solidity functions @@ -41808,7 +41899,7 @@ module.exports = SolidityFunction; /***/ }), -/* 322 */ +/* 323 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -41833,12 +41924,12 @@ module.exports = SolidityFunction; * @date 2014 */ -var sha3 = __webpack_require__(43); -var SolidityEvent = __webpack_require__(133); +var sha3 = __webpack_require__(44); +var SolidityEvent = __webpack_require__(137); var formatters = __webpack_require__(13); -var utils = __webpack_require__(1); -var Filter = __webpack_require__(60); -var watches = __webpack_require__(61); +var utils = __webpack_require__(2); +var Filter = __webpack_require__(62); +var watches = __webpack_require__(63); var AllSolidityEvents = function (requestManager, json, address) { this._requestManager = requestManager; @@ -41902,7 +41993,7 @@ module.exports = AllSolidityEvents; /***/ }), -/* 323 */ +/* 324 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -41928,7 +42019,7 @@ module.exports = AllSolidityEvents; */ var formatters = __webpack_require__(13); -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); var count = 1; @@ -42001,7 +42092,7 @@ module.exports = IsSyncing; /***/ }), -/* 324 */ +/* 325 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42026,8 +42117,8 @@ module.exports = IsSyncing; * @date 2015 */ -var globalRegistrarAbi = __webpack_require__(325); -var icapRegistrarAbi= __webpack_require__(326); +var globalRegistrarAbi = __webpack_require__(326); +var icapRegistrarAbi= __webpack_require__(327); var globalNameregAddress = '0xc6d9d2cd449a754c494264e1809c50e34d64562b'; var icapNameregAddress = '0xa1a111bc074c9cfa781f0c38e63bd51c91b8af00'; @@ -42046,19 +42137,19 @@ module.exports = { /***/ }), -/* 325 */ +/* 326 */ /***/ (function(module, exports) { module.exports = [{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"name","outputs":[{"name":"o_name","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"content","outputs":[{"name":"","type":"bytes32"}],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"addr","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"subRegistrar","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_newOwner","type":"address"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_registrar","type":"address"}],"name":"setSubRegistrar","outputs":[],"type":"function"},{"constant":false,"inputs":[],"name":"Registrar","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_a","type":"address"},{"name":"_primary","type":"bool"}],"name":"setAddress","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_content","type":"bytes32"}],"name":"setContent","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"disown","outputs":[],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_name","type":"bytes32"},{"indexed":false,"name":"_winner","type":"address"}],"name":"AuctionEnded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"_name","type":"bytes32"},{"indexed":false,"name":"_bidder","type":"address"},{"indexed":false,"name":"_value","type":"uint256"}],"name":"NewBid","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"}],"name":"Changed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"},{"indexed":true,"name":"addr","type":"address"}],"name":"PrimaryChanged","type":"event"}] /***/ }), -/* 326 */ +/* 327 */ /***/ (function(module, exports) { module.exports = [{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_refund","type":"address"}],"name":"disown","outputs":[],"type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}],"name":"addr","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"}],"name":"reserve","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_newOwner","type":"address"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_name","type":"bytes32"},{"name":"_a","type":"address"}],"name":"setAddr","outputs":[],"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"name","type":"bytes32"}],"name":"Changed","type":"event"}] /***/ }), -/* 327 */ +/* 328 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42083,8 +42174,8 @@ module.exports = [{"constant":true,"inputs":[{"name":"_name","type":"bytes32"}], * @date 2015 */ -var Iban = __webpack_require__(59); -var exchangeAbi = __webpack_require__(328); +var Iban = __webpack_require__(61); +var exchangeAbi = __webpack_require__(329); /** * Should be used to make Iban transfer @@ -42156,13 +42247,13 @@ module.exports = transfer; /***/ }), -/* 328 */ +/* 329 */ /***/ (function(module, exports) { module.exports = [{"constant":false,"inputs":[{"name":"from","type":"bytes32"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"bytes32"},{"name":"to","type":"address"},{"name":"indirectId","type":"bytes32"},{"name":"value","type":"uint256"}],"name":"icapTransfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"bytes32"}],"name":"deposit","outputs":[],"payable":true,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"AnonymousDeposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"bytes32"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"bytes32"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"bytes32"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"indirectId","type":"bytes32"},{"indexed":false,"name":"value","type":"uint256"}],"name":"IcapTransfer","type":"event"}] /***/ }), -/* 329 */ +/* 330 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42234,7 +42325,7 @@ module.exports = DB; /***/ }), -/* 330 */ +/* 331 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42261,8 +42352,8 @@ module.exports = DB; */ var Method = __webpack_require__(18); -var Filter = __webpack_require__(60); -var watches = __webpack_require__(61); +var Filter = __webpack_require__(62); +var watches = __webpack_require__(63); var Shh = function (web3) { this._requestManager = web3._requestManager; @@ -42384,7 +42475,7 @@ module.exports = Shh; /***/ }), -/* 331 */ +/* 332 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42409,8 +42500,8 @@ module.exports = Shh; * @date 2015 */ -var utils = __webpack_require__(1); -var Property = __webpack_require__(29); +var utils = __webpack_require__(2); +var Property = __webpack_require__(31); var Net = function (web3) { this._requestManager = web3._requestManager; @@ -42442,7 +42533,7 @@ module.exports = Net; /***/ }), -/* 332 */ +/* 333 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -42472,7 +42563,7 @@ module.exports = Net; var Method = __webpack_require__(18); -var Property = __webpack_require__(29); +var Property = __webpack_require__(31); var formatters = __webpack_require__(13); function Personal(web3) { @@ -42564,7 +42655,7 @@ module.exports = Personal; /***/ }), -/* 333 */ +/* 334 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -42595,7 +42686,7 @@ module.exports = Personal; var Method = __webpack_require__(18); -var Property = __webpack_require__(29); +var Property = __webpack_require__(31); function Swarm(web3) { this._requestManager = web3._requestManager; @@ -42716,7 +42807,7 @@ module.exports = Swarm; /***/ }), -/* 334 */ +/* 335 */ /***/ (function(module, exports) { @@ -42731,19 +42822,19 @@ module.exports = Settings; /***/ }), -/* 335 */ +/* 336 */ /***/ (function(module, exports) { module.exports = {"version":"0.20.2"} /***/ }), -/* 336 */ +/* 337 */ /***/ (function(module, exports, __webpack_require__) { var formatters = __webpack_require__(13); -var utils = __webpack_require__(1); +var utils = __webpack_require__(2); var Method = __webpack_require__(18); -var Property = __webpack_require__(29); +var Property = __webpack_require__(31); // TODO: refactor, so the input params are not altered. // it's necessary to make same 'extension' work with multiple providers @@ -42791,7 +42882,7 @@ module.exports = extend; /***/ }), -/* 337 */ +/* 338 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -42816,8 +42907,8 @@ module.exports = extend; * @date 2015 */ -var Jsonrpc = __webpack_require__(128); -var errors = __webpack_require__(28); +var Jsonrpc = __webpack_require__(132); +var errors = __webpack_require__(30); var Batch = function (web3) { this.requestManager = web3._requestManager; @@ -42863,7 +42954,7 @@ module.exports = Batch; /***/ }), -/* 338 */ +/* 339 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(Buffer) {/* @@ -42890,7 +42981,7 @@ module.exports = Batch; * @date 2015 */ -var errors = __webpack_require__(28); +var errors = __webpack_require__(30); // workaround to use httpprovider in different envs @@ -42899,10 +42990,10 @@ if (typeof window !== 'undefined' && window.XMLHttpRequest) { XMLHttpRequest = window.XMLHttpRequest; // jshint ignore: line // node } else { - XMLHttpRequest = __webpack_require__(339).XMLHttpRequest; // jshint ignore: line + XMLHttpRequest = __webpack_require__(340).XMLHttpRequest; // jshint ignore: line } -var XHR2 = __webpack_require__(340); // jshint ignore: line +var XHR2 = __webpack_require__(341); // jshint ignore: line /** * HttpProvider should be used to send rpc calls over http @@ -43024,10 +43115,10 @@ HttpProvider.prototype.isConnected = function () { module.exports = HttpProvider; -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(41).Buffer)) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(42).Buffer)) /***/ }), -/* 339 */ +/* 340 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43043,14 +43134,14 @@ if (typeof XMLHttpRequest === 'undefined') { /***/ }), -/* 340 */ +/* 341 */ /***/ (function(module, exports) { module.exports = XMLHttpRequest; /***/ }), -/* 341 */ +/* 342 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43078,8 +43169,8 @@ module.exports = XMLHttpRequest; -var utils = __webpack_require__(1); -var errors = __webpack_require__(28); +var utils = __webpack_require__(2); +var errors = __webpack_require__(30); var IpcProvider = function (path, net) { @@ -43264,13 +43355,13 @@ module.exports = IpcProvider; /***/ }), -/* 342 */ +/* 343 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var XMLHttpRequest = __webpack_require__(343); +var XMLHttpRequest = __webpack_require__(344); module.exports = IPFS; @@ -43444,7 +43535,7 @@ IPFS.prototype.catJSON = function cat(ipfsHash, callback) { }; /***/ }), -/* 343 */ +/* 344 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43455,7 +43546,7 @@ var XMLHttpRequest = window.XMLHttpRequest; // eslint-disable-line module.exports = XMLHttpRequest; /***/ }), -/* 344 */ +/* 345 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43465,15 +43556,15 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _toConsumableArray2 = __webpack_require__(74); +var _toConsumableArray2 = __webpack_require__(52); var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); -var _from = __webpack_require__(36); +var _from = __webpack_require__(37); var _from2 = _interopRequireDefault(_from); -var _slicedToArray2 = __webpack_require__(44); +var _slicedToArray2 = __webpack_require__(45); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); @@ -43482,7 +43573,7 @@ exports.calcLMSRProfit = calcLMSRProfit; exports.calcLMSROutcomeTokenCount = calcLMSROutcomeTokenCount; exports.calcLMSRMarginalPrice = calcLMSRMarginalPrice; -var _utils = __webpack_require__(45); +var _utils = __webpack_require__(46); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -43626,27 +43717,27 @@ function calcLMSRMarginalPrice() { } /***/ }), -/* 345 */ +/* 346 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(346), __esModule: true }; +module.exports = { "default": __webpack_require__(347), __esModule: true }; /***/ }), -/* 346 */ +/* 347 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(50); -__webpack_require__(30); -module.exports = __webpack_require__(347); +__webpack_require__(51); +__webpack_require__(32); +module.exports = __webpack_require__(348); /***/ }), -/* 347 */ +/* 348 */ /***/ (function(module, exports, __webpack_require__) { -var classof = __webpack_require__(76) +var classof = __webpack_require__(78) , ITERATOR = __webpack_require__(4)('iterator') - , Iterators = __webpack_require__(20); -module.exports = __webpack_require__(3).isIterable = function(it){ + , Iterators = __webpack_require__(22); +module.exports = __webpack_require__(1).isIterable = function(it){ var O = Object(it); return O[ITERATOR] !== undefined || '@@iterator' in O @@ -43654,37 +43745,272 @@ module.exports = __webpack_require__(3).isIterable = function(it){ }; /***/ }), -/* 348 */ +/* 349 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = { "default": __webpack_require__(349), __esModule: true }; +module.exports = { "default": __webpack_require__(350), __esModule: true }; /***/ }), -/* 349 */ +/* 350 */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(50); -__webpack_require__(30); -module.exports = __webpack_require__(350); +__webpack_require__(51); +__webpack_require__(32); +module.exports = __webpack_require__(351); /***/ }), -/* 350 */ +/* 351 */ /***/ (function(module, exports, __webpack_require__) { -var anObject = __webpack_require__(10) - , get = __webpack_require__(75); -module.exports = __webpack_require__(3).getIterator = function(it){ +var anObject = __webpack_require__(9) + , get = __webpack_require__(77); +module.exports = __webpack_require__(1).getIterator = function(it){ var iterFn = get(it); if(typeof iterFn != 'function')throw TypeError(it + ' is not iterable!'); return anObject(iterFn.call(it)); }; /***/ }), -/* 351 */ +/* 352 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(353); +module.exports = __webpack_require__(1).Object.assign; + +/***/ }), +/* 353 */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.3.1 Object.assign(target, source) +var $export = __webpack_require__(7); + +$export($export.S + $export.F, 'Object', {assign: __webpack_require__(354)}); + +/***/ }), +/* 354 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +// 19.1.2.1 Object.assign(target, source, ...) +var getKeys = __webpack_require__(16) + , gOPS = __webpack_require__(76) + , pIE = __webpack_require__(36) + , toObject = __webpack_require__(35) + , IObject = __webpack_require__(98) + , $assign = Object.assign; + +// should work with symbols and should have deterministic property order (V8 bug) +module.exports = !$assign || __webpack_require__(21)(function(){ + var A = {} + , B = {} + , S = Symbol() + , K = 'abcdefghijklmnopqrst'; + A[S] = 7; + K.split('').forEach(function(k){ B[k] = k; }); + return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K; +}) ? function assign(target, source){ // eslint-disable-line no-unused-vars + var T = toObject(target) + , aLen = arguments.length + , index = 1 + , getSymbols = gOPS.f + , isEnum = pIE.f; + while(aLen > index){ + var S = IObject(arguments[index++]) + , keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S) + , length = keys.length + , j = 0 + , key; + while(length > j)if(isEnum.call(S, key = keys[j++]))T[key] = S[key]; + } return T; +} : $assign; + +/***/ }), +/* 355 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(356), __esModule: true }; + +/***/ }), +/* 356 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(357); +module.exports = __webpack_require__(1).Object.getPrototypeOf; + +/***/ }), +/* 357 */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.9 Object.getPrototypeOf(O) +var toObject = __webpack_require__(35) + , $getPrototypeOf = __webpack_require__(100); + +__webpack_require__(104)('getPrototypeOf', function(){ + return function getPrototypeOf(it){ + return $getPrototypeOf(toObject(it)); + }; +}); + +/***/ }), +/* 358 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _typeof2 = __webpack_require__(47); + +var _typeof3 = _interopRequireDefault(_typeof2); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (self, call) { + if (!self) { + throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); + } + + return call && ((typeof call === "undefined" ? "undefined" : (0, _typeof3.default)(call)) === "object" || typeof call === "function") ? call : self; +}; + +/***/ }), +/* 359 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _setPrototypeOf = __webpack_require__(360); + +var _setPrototypeOf2 = _interopRequireDefault(_setPrototypeOf); + +var _create = __webpack_require__(364); + +var _create2 = _interopRequireDefault(_create); + +var _typeof2 = __webpack_require__(47); + +var _typeof3 = _interopRequireDefault(_typeof2); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (subClass, superClass) { + if (typeof superClass !== "function" && superClass !== null) { + throw new TypeError("Super expression must either be null or a function, not " + (typeof superClass === "undefined" ? "undefined" : (0, _typeof3.default)(superClass))); + } + + subClass.prototype = (0, _create2.default)(superClass && superClass.prototype, { + constructor: { + value: subClass, + enumerable: false, + writable: true, + configurable: true + } + }); + if (superClass) _setPrototypeOf2.default ? (0, _setPrototypeOf2.default)(subClass, superClass) : subClass.__proto__ = superClass; +}; + +/***/ }), +/* 360 */ /***/ (function(module, exports, __webpack_require__) { -var baseFunctions = __webpack_require__(352), - keysIn = __webpack_require__(40); +module.exports = { "default": __webpack_require__(361), __esModule: true }; + +/***/ }), +/* 361 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(362); +module.exports = __webpack_require__(1).Object.setPrototypeOf; + +/***/ }), +/* 362 */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.3.19 Object.setPrototypeOf(O, proto) +var $export = __webpack_require__(7); +$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(363).set}); + +/***/ }), +/* 363 */ +/***/ (function(module, exports, __webpack_require__) { + +// Works with __proto__ only. Old v8 can't work with null proto objects. +/* eslint-disable no-proto */ +var isObject = __webpack_require__(20) + , anObject = __webpack_require__(9); +var check = function(O, proto){ + anObject(O); + if(!isObject(proto) && proto !== null)throw TypeError(proto + ": can't set as prototype!"); +}; +module.exports = { + set: Object.setPrototypeOf || ('__proto__' in {} ? // eslint-disable-line + function(test, buggy, set){ + try { + set = __webpack_require__(19)(Function.call, __webpack_require__(102).f(Object.prototype, '__proto__').set, 2); + set(test, []); + buggy = !(test instanceof Array); + } catch(e){ buggy = true; } + return function setPrototypeOf(O, proto){ + check(O, proto); + if(buggy)O.__proto__ = proto; + else set(O, proto); + return O; + }; + }({}, false) : undefined), + check: check +}; + +/***/ }), +/* 364 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(365), __esModule: true }; + +/***/ }), +/* 365 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(366); +var $Object = __webpack_require__(1).Object; +module.exports = function create(P, D){ + return $Object.create(P, D); +}; + +/***/ }), +/* 366 */ +/***/ (function(module, exports, __webpack_require__) { + +var $export = __webpack_require__(7) +// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) +$export($export.S, 'Object', {create: __webpack_require__(69)}); + +/***/ }), +/* 367 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(368), __esModule: true }; + +/***/ }), +/* 368 */ +/***/ (function(module, exports, __webpack_require__) { + +var core = __webpack_require__(1) + , $JSON = core.JSON || (core.JSON = {stringify: JSON.stringify}); +module.exports = function stringify(it){ // eslint-disable-line no-unused-vars + return $JSON.stringify.apply($JSON, arguments); +}; + +/***/ }), +/* 369 */ +/***/ (function(module, exports, __webpack_require__) { + +var baseFunctions = __webpack_require__(370), + keysIn = __webpack_require__(41); /** * Creates an array of function property names from own and inherited @@ -43717,11 +44043,11 @@ module.exports = functionsIn; /***/ }), -/* 352 */ +/* 370 */ /***/ (function(module, exports, __webpack_require__) { -var arrayFilter = __webpack_require__(353), - isFunction = __webpack_require__(82); +var arrayFilter = __webpack_require__(371), + isFunction = __webpack_require__(84); /** * The base implementation of `_.functions` which creates an array of @@ -43742,7 +44068,7 @@ module.exports = baseFunctions; /***/ }), -/* 353 */ +/* 371 */ /***/ (function(module, exports) { /** @@ -43773,7 +44099,7 @@ module.exports = arrayFilter; /***/ }), -/* 354 */ +/* 372 */ /***/ (function(module, exports) { /** @@ -43804,10 +44130,10 @@ module.exports = arrayFilter; /***/ }), -/* 355 */ +/* 373 */ /***/ (function(module, exports, __webpack_require__) { -var baseClone = __webpack_require__(356); +var baseClone = __webpack_require__(374); /** Used to compose bitmasks for cloning. */ var CLONE_SYMBOLS_FLAG = 4; @@ -43846,28 +44172,28 @@ module.exports = clone; /***/ }), -/* 356 */ +/* 374 */ /***/ (function(module, exports, __webpack_require__) { -var Stack = __webpack_require__(112), - arrayEach = __webpack_require__(357), - assignValue = __webpack_require__(77), - baseAssign = __webpack_require__(358), - baseAssignIn = __webpack_require__(359), - cloneBuffer = __webpack_require__(114), - copyArray = __webpack_require__(115), - copySymbols = __webpack_require__(360), - copySymbolsIn = __webpack_require__(362), - getAllKeys = __webpack_require__(364), - getAllKeysIn = __webpack_require__(365), - getTag = __webpack_require__(366), - initCloneArray = __webpack_require__(367), - initCloneByTag = __webpack_require__(368), - initCloneObject = __webpack_require__(116), - isArray = __webpack_require__(38), - isBuffer = __webpack_require__(118), - isObject = __webpack_require__(21), - keys = __webpack_require__(55); +var Stack = __webpack_require__(116), + arrayEach = __webpack_require__(375), + assignValue = __webpack_require__(79), + baseAssign = __webpack_require__(376), + baseAssignIn = __webpack_require__(377), + cloneBuffer = __webpack_require__(118), + copyArray = __webpack_require__(119), + copySymbols = __webpack_require__(378), + copySymbolsIn = __webpack_require__(380), + getAllKeys = __webpack_require__(382), + getAllKeysIn = __webpack_require__(383), + getTag = __webpack_require__(384), + initCloneArray = __webpack_require__(385), + initCloneByTag = __webpack_require__(386), + initCloneObject = __webpack_require__(120), + isArray = __webpack_require__(39), + isBuffer = __webpack_require__(122), + isObject = __webpack_require__(23), + keys = __webpack_require__(57); /** Used to compose bitmasks for cloning. */ var CLONE_DEEP_FLAG = 1, @@ -44005,7 +44331,7 @@ module.exports = baseClone; /***/ }), -/* 357 */ +/* 375 */ /***/ (function(module, exports) { /** @@ -44033,11 +44359,11 @@ module.exports = arrayEach; /***/ }), -/* 358 */ +/* 376 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - keys = __webpack_require__(55); + keys = __webpack_require__(57); /** * The base implementation of `_.assign` without support for multiple sources @@ -44056,11 +44382,11 @@ module.exports = baseAssign; /***/ }), -/* 359 */ +/* 377 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - keysIn = __webpack_require__(40); + keysIn = __webpack_require__(41); /** * The base implementation of `_.assignIn` without support for multiple sources @@ -44079,11 +44405,11 @@ module.exports = baseAssignIn; /***/ }), -/* 360 */ +/* 378 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - getSymbols = __webpack_require__(361); + getSymbols = __webpack_require__(379); /** * Copies own symbols of `source` to `object`. @@ -44101,7 +44427,7 @@ module.exports = copySymbols; /***/ }), -/* 361 */ +/* 379 */ /***/ (function(module, exports) { /** @@ -44130,11 +44456,11 @@ module.exports = stubArray; /***/ }), -/* 362 */ +/* 380 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - getSymbolsIn = __webpack_require__(363); + getSymbolsIn = __webpack_require__(381); /** * Copies own and inherited symbols of `source` to `object`. @@ -44152,7 +44478,7 @@ module.exports = copySymbolsIn; /***/ }), -/* 363 */ +/* 381 */ /***/ (function(module, exports) { /** @@ -44181,10 +44507,10 @@ module.exports = stubArray; /***/ }), -/* 364 */ +/* 382 */ /***/ (function(module, exports, __webpack_require__) { -var overArg = __webpack_require__(83); +var overArg = __webpack_require__(85); /* Built-in method references for those with the same name as other `lodash` methods. */ var nativeKeys = overArg(Object.keys, Object); @@ -44193,7 +44519,7 @@ module.exports = nativeKeys; /***/ }), -/* 365 */ +/* 383 */ /***/ (function(module, exports) { /** @@ -44219,7 +44545,7 @@ module.exports = nativeKeysIn; /***/ }), -/* 366 */ +/* 384 */ /***/ (function(module, exports) { /** Used for built-in method references. */ @@ -44247,7 +44573,7 @@ module.exports = objectToString; /***/ }), -/* 367 */ +/* 385 */ /***/ (function(module, exports) { /** Used for built-in method references. */ @@ -44279,7 +44605,7 @@ module.exports = initCloneArray; /***/ }), -/* 368 */ +/* 386 */ /***/ (function(module, exports) { /** @@ -44306,13 +44632,13 @@ module.exports = identity; /***/ }), -/* 369 */ +/* 387 */ /***/ (function(module, exports, __webpack_require__) { -var apply = __webpack_require__(81), - assignInWith = __webpack_require__(370), - baseRest = __webpack_require__(80), - customDefaultsAssignIn = __webpack_require__(371); +var apply = __webpack_require__(83), + assignInWith = __webpack_require__(388), + baseRest = __webpack_require__(82), + customDefaultsAssignIn = __webpack_require__(389); /** * Assigns own and inherited enumerable string keyed properties of source @@ -44344,12 +44670,12 @@ module.exports = defaults; /***/ }), -/* 370 */ +/* 388 */ /***/ (function(module, exports, __webpack_require__) { var copyObject = __webpack_require__(17), - createAssigner = __webpack_require__(79), - keysIn = __webpack_require__(40); + createAssigner = __webpack_require__(81), + keysIn = __webpack_require__(41); /** * This method is like `_.assignIn` except that it accepts `customizer` @@ -44388,10 +44714,10 @@ module.exports = assignInWith; /***/ }), -/* 371 */ +/* 389 */ /***/ (function(module, exports, __webpack_require__) { -var eq = __webpack_require__(54); +var eq = __webpack_require__(56); /** Used for built-in method references. */ var objectProto = Object.prototype; @@ -44423,11 +44749,11 @@ module.exports = customDefaultsAssignIn; /***/ }), -/* 372 */ +/* 390 */ /***/ (function(module, exports, __webpack_require__) { -var baseGetTag = __webpack_require__(37), - isObjectLike = __webpack_require__(39); +var baseGetTag = __webpack_require__(38), + isObjectLike = __webpack_require__(40); /** `Object#toString` result references. */ var numberTag = '[object Number]'; @@ -44467,11 +44793,11 @@ module.exports = isNumber; /***/ }), -/* 373 */ +/* 391 */ /***/ (function(module, exports, __webpack_require__) { -var baseGetTag = __webpack_require__(37), - isObjectLike = __webpack_require__(39); +var baseGetTag = __webpack_require__(38), + isObjectLike = __webpack_require__(40); /** `Object#toString` result references. */ var boolTag = '[object Boolean]'; @@ -44502,12 +44828,12 @@ module.exports = isBoolean; /***/ }), -/* 374 */ +/* 392 */ /***/ (function(module, exports, __webpack_require__) { -var baseGetTag = __webpack_require__(37), - isArray = __webpack_require__(38), - isObjectLike = __webpack_require__(39); +var baseGetTag = __webpack_require__(38), + isArray = __webpack_require__(39), + isObjectLike = __webpack_require__(40); /** `Object#toString` result references. */ var stringTag = '[object String]'; @@ -44538,7 +44864,7 @@ module.exports = isString; /***/ }), -/* 375 */ +/* 393 */ /***/ (function(module, exports) { /** Used for built-in method references. */ @@ -44563,7 +44889,7 @@ module.exports = baseHas; /***/ }), -/* 376 */ +/* 394 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49355,7 +49681,7 @@ PI = new Decimal(pi); /***/ }), -/* 377 */ +/* 395 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49366,11 +49692,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.createUltimateOracle = exports.createCentralizedOracle = undefined; -var _slicedToArray2 = __webpack_require__(44); +var _slicedToArray2 = __webpack_require__(45); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); -var _utils = __webpack_require__(45); +var _utils = __webpack_require__(46); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -49431,7 +49757,7 @@ var createUltimateOracle = exports.createUltimateOracle = (0, _utils.wrapWeb3Fun }); /***/ }), -/* 378 */ +/* 396 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49442,19 +49768,19 @@ Object.defineProperty(exports, "__esModule", { }); exports.resolveEvent = exports.loadEventDescription = exports.publishEventDescription = exports.createScalarEvent = exports.createCategoricalEvent = undefined; -var _from = __webpack_require__(36); +var _from = __webpack_require__(37); var _from2 = _interopRequireDefault(_from); -var _slicedToArray2 = __webpack_require__(44); +var _slicedToArray2 = __webpack_require__(45); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); -var _regenerator = __webpack_require__(51); +var _regenerator = __webpack_require__(53); var _regenerator2 = _interopRequireDefault(_regenerator); -var _asyncToGenerator2 = __webpack_require__(52); +var _asyncToGenerator2 = __webpack_require__(54); var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); @@ -49473,6 +49799,7 @@ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); */ var publishEventDescription = exports.publishEventDescription = function () { var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(description) { + var resultHash; return _regenerator2.default.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { @@ -49481,9 +49808,12 @@ var publishEventDescription = exports.publishEventDescription = function () { return this.ipfs.addJSONAsync(description); case 2: - return _context.abrupt('return', _context.sent); + resultHash = _context.sent; - case 3: + this.log('published event description on IPFS at ' + resultHash); + return _context.abrupt('return', resultHash); + + case 5: case 'end': return _context.stop(); } @@ -49607,7 +49937,7 @@ var resolveEvent = exports.resolveEvent = function () { }; }(); -var _utils = __webpack_require__(45); +var _utils = __webpack_require__(46); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -49687,7 +50017,7 @@ resolveEvent.estimateGas = function () { }(); /***/ }), -/* 379 */ +/* 397 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49698,27 +50028,31 @@ Object.defineProperty(exports, "__esModule", { }); exports.sellOutcomeTokens = exports.buyOutcomeTokens = exports.createMarket = undefined; -var _regenerator = __webpack_require__(51); +var _from = __webpack_require__(37); -var _regenerator2 = _interopRequireDefault(_regenerator); +var _from2 = _interopRequireDefault(_from); -var _promise = __webpack_require__(53); +var _slicedToArray2 = __webpack_require__(45); + +var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); + +var _promise = __webpack_require__(55); var _promise2 = _interopRequireDefault(_promise); -var _assign = __webpack_require__(380); +var _regenerator = __webpack_require__(53); -var _assign2 = _interopRequireDefault(_assign); +var _regenerator2 = _interopRequireDefault(_regenerator); -var _from = __webpack_require__(36); +var _assign = __webpack_require__(138); -var _from2 = _interopRequireDefault(_from); +var _assign2 = _interopRequireDefault(_assign); -var _slicedToArray2 = __webpack_require__(44); +var _toConsumableArray2 = __webpack_require__(52); -var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); -var _asyncToGenerator2 = __webpack_require__(52); +var _asyncToGenerator2 = __webpack_require__(54); var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); @@ -49743,7 +50077,7 @@ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2); * @alias Gnosis#buyOutcomeTokens */ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { - var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() { + var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() { var _normalizeWeb3Args, _normalizeWeb3Args2, _normalizeWeb3Args2$, @@ -49751,7 +50085,7 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { outcomeTokenIndex, outcomeTokenCount, opts, - _ref2, + _ref4, approvalAmount, approvalResetAmount, limitMargin, @@ -49767,17 +50101,17 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { marketAllowance, txRequiredEvents, purchaseEvent, - _args = arguments; + _args3 = arguments; - return _regenerator2.default.wrap(function _callee$(_context) { + return _regenerator2.default.wrap(function _callee3$(_context3) { while (1) { - switch (_context.prev = _context.next) { + switch (_context3.prev = _context3.next) { case 0: - _normalizeWeb3Args = (0, _utils.normalizeWeb3Args)((0, _from2.default)(_args), { + _normalizeWeb3Args = (0, _utils.normalizeWeb3Args)((0, _from2.default)(_args3), { methodName: 'buyOutcomeTokens', functionInputs: [{ name: 'market', type: 'address' }, { name: 'outcomeTokenIndex', type: 'uint8' }, { name: 'outcomeTokenCount', type: 'uint256' }] }), _normalizeWeb3Args2 = (0, _slicedToArray3.default)(_normalizeWeb3Args, 2), _normalizeWeb3Args2$ = (0, _slicedToArray3.default)(_normalizeWeb3Args2[0], 3), marketAddress = _normalizeWeb3Args2$[0], outcomeTokenIndex = _normalizeWeb3Args2$[1], outcomeTokenCount = _normalizeWeb3Args2$[2], opts = _normalizeWeb3Args2[1]; - _ref2 = opts || {}, approvalAmount = _ref2.approvalAmount, approvalResetAmount = _ref2.approvalResetAmount, limitMargin = _ref2.limitMargin, cost = _ref2.cost, approveTxOpts = _ref2.approveTxOpts, buyTxOpts = _ref2.buyTxOpts; + _ref4 = opts || {}, approvalAmount = _ref4.approvalAmount, approvalResetAmount = _ref4.approvalResetAmount, limitMargin = _ref4.limitMargin, cost = _ref4.cost, approveTxOpts = _ref4.approveTxOpts, buyTxOpts = _ref4.buyTxOpts; ['approvalAmount', 'approvalResetAmount', 'limitMargin', 'cost', 'approveTxOpts', 'buyTxOpts'].forEach(function (prop) { delete opts[prop]; @@ -49785,31 +50119,31 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { approveTxOpts = (0, _assign2.default)({}, opts, approveTxOpts); buyTxOpts = (0, _assign2.default)({}, opts, buyTxOpts); - _context.next = 7; + _context3.next = 7; return this.contracts.Market.at(marketAddress); case 7: - market = _context.sent; - _context.t0 = this.contracts.Token; - _context.t1 = this.contracts.Event; - _context.next = 12; + market = _context3.sent; + _context3.t0 = this.contracts.Token; + _context3.t1 = this.contracts.Event; + _context3.next = 12; return market.eventContract(opts); case 12: - _context.t2 = _context.sent; - _context.next = 15; - return _context.t1.at.call(_context.t1, _context.t2).collateralToken(); + _context3.t2 = _context3.sent; + _context3.next = 15; + return _context3.t1.at.call(_context3.t1, _context3.t2).collateralToken(); case 15: - _context.t3 = _context.sent; - _context.next = 18; - return _context.t0.at.call(_context.t0, _context.t3); + _context3.t3 = _context3.sent; + _context3.next = 18; + return _context3.t0.at.call(_context3.t0, _context3.t3); case 18: - collateralToken = _context.sent; + collateralToken = _context3.sent; if (!(cost == null)) { - _context.next = 30; + _context3.next = 30; break; } @@ -49817,18 +50151,18 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { limitMargin = 0; } - _context.next = 23; + _context3.next = 23; return this.lmsrMarketMaker.calcCost(marketAddress, outcomeTokenIndex, outcomeTokenCount, opts); case 23: - baseCost = _context.sent; - _context.t4 = baseCost; - _context.next = 27; + baseCost = _context3.sent; + _context3.t4 = baseCost; + _context3.next = 27; return market.calcMarketFee(baseCost, opts); case 27: - _context.t5 = _context.sent; - baseCostWithFee = _context.t4.add.call(_context.t4, _context.t5); + _context3.t5 = _context3.sent; + baseCostWithFee = _context3.t4.add.call(_context3.t4, _context3.t5); cost = baseCostWithFee.mul(this.web3.toBigNumber(1).add(limitMargin)).round(); @@ -49841,104 +50175,76 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { txInfo = []; if (!(approvalAmount == null)) { - _context.next = 47; + _context3.next = 42; break; } buyer = opts.from || this.defaultAccount; - _context.next = 36; + _context3.next = 36; return collateralToken.allowance(buyer, marketAddress, opts); case 36: - marketAllowance = _context.sent; + marketAllowance = _context3.sent; if (!marketAllowance.lt(cost)) { - _context.next = 45; + _context3.next = 40; break; } - _context.t6 = txInfo; - _context.next = 41; - return collateralToken.approve.sendTransaction(marketAddress, approvalResetAmount, approveTxOpts); - - case 41: - _context.t7 = _context.sent; - _context.t8 = this.contracts.Token; - _context.t9 = { - tx: _context.t7, - contract: _context.t8, + _context3.next = 40; + return pushDescribedTransaction(txInfo, this.log, { + caller: collateralToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalResetAmount, approveTxOpts], requiredEventName: 'Approval' - }; - - _context.t6.push.call(_context.t6, _context.t9); + }); - case 45: - _context.next = 55; + case 40: + _context3.next = 45; break; - case 47: + case 42: if (!this.web3.toBigNumber(0).lt(approvalAmount)) { - _context.next = 55; + _context3.next = 45; break; } - _context.t10 = txInfo; - _context.next = 51; - return collateralToken.approve.sendTransaction(marketAddress, approvalAmount, approveTxOpts); - - case 51: - _context.t11 = _context.sent; - _context.t12 = this.contracts.Token; - _context.t13 = { - tx: _context.t11, - contract: _context.t12, + _context3.next = 45; + return pushDescribedTransaction(txInfo, this.log, { + caller: collateralToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalAmount, approveTxOpts], requiredEventName: 'Approval' - }; - - _context.t10.push.call(_context.t10, _context.t13); - - case 55: - _context.t14 = txInfo; - _context.next = 58; - return market.buy.sendTransaction(outcomeTokenIndex, outcomeTokenCount, cost, buyTxOpts); + }); - case 58: - _context.t15 = _context.sent; - _context.t16 = this.contracts.Market; - _context.t17 = { - tx: _context.t15, - contract: _context.t16, + case 45: + _context3.next = 47; + return pushDescribedTransaction(txInfo, this.log, { + caller: market, + methodName: 'buy', + methodArgs: [outcomeTokenIndex, outcomeTokenCount, cost, buyTxOpts], requiredEventName: 'OutcomeTokenPurchase' - }; - - _context.t14.push.call(_context.t14, _context.t17); - - _context.next = 64; - return _promise2.default.all(txInfo.map(function (_ref3, i) { - var tx = _ref3.tx, - contract = _ref3.contract; - return contract.syncTransaction(tx); - })); + }); - case 64: - _context.t18 = function (res, i) { - return (0, _utils.requireEventFromTXResult)(res, txInfo[i].requiredEventName); - }; + case 47: + _context3.next = 49; + return syncDescribedTransactions(txInfo, this.log); - txRequiredEvents = _context.sent.map(_context.t18); + case 49: + txRequiredEvents = _context3.sent; purchaseEvent = txRequiredEvents[txRequiredEvents.length - 1]; - return _context.abrupt('return', purchaseEvent.args.outcomeTokenCost.plus(purchaseEvent.args.marketFees)); + return _context3.abrupt('return', purchaseEvent.args.outcomeTokenCost.plus(purchaseEvent.args.marketFees)); - case 68: + case 52: case 'end': - return _context.stop(); + return _context3.stop(); } } - }, _callee, this); + }, _callee3, this); })); return function buyOutcomeTokens() { - return _ref.apply(this, arguments); + return _ref3.apply(this, arguments); }; }(); @@ -49962,7 +50268,7 @@ var buyOutcomeTokens = exports.buyOutcomeTokens = function () { * @alias Gnosis#sellOutcomeTokens */ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { - var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() { + var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() { var _normalizeWeb3Args3, _normalizeWeb3Args4, _normalizeWeb3Args4$, @@ -49970,7 +50276,7 @@ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { outcomeTokenIndex, outcomeTokenCount, opts, - _ref7, + _ref8, approvalAmount, approvalResetAmount, limitMargin, @@ -49986,17 +50292,17 @@ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { marketAllowance, txRequiredEvents, saleEvent, - _args3 = arguments; + _args5 = arguments; - return _regenerator2.default.wrap(function _callee3$(_context3) { + return _regenerator2.default.wrap(function _callee5$(_context5) { while (1) { - switch (_context3.prev = _context3.next) { + switch (_context5.prev = _context5.next) { case 0: - _normalizeWeb3Args3 = (0, _utils.normalizeWeb3Args)((0, _from2.default)(_args3), { + _normalizeWeb3Args3 = (0, _utils.normalizeWeb3Args)((0, _from2.default)(_args5), { methodName: 'sellOutcomeTokens', functionInputs: [{ name: 'market', type: 'address' }, { name: 'outcomeTokenIndex', type: 'uint8' }, { name: 'outcomeTokenCount', type: 'uint256' }] }), _normalizeWeb3Args4 = (0, _slicedToArray3.default)(_normalizeWeb3Args3, 2), _normalizeWeb3Args4$ = (0, _slicedToArray3.default)(_normalizeWeb3Args4[0], 3), marketAddress = _normalizeWeb3Args4$[0], outcomeTokenIndex = _normalizeWeb3Args4$[1], outcomeTokenCount = _normalizeWeb3Args4$[2], opts = _normalizeWeb3Args4[1]; - _ref7 = opts || {}, approvalAmount = _ref7.approvalAmount, approvalResetAmount = _ref7.approvalResetAmount, limitMargin = _ref7.limitMargin, minProfit = _ref7.minProfit, approveTxOpts = _ref7.approveTxOpts, sellTxOpts = _ref7.sellTxOpts; + _ref8 = opts || {}, approvalAmount = _ref8.approvalAmount, approvalResetAmount = _ref8.approvalResetAmount, limitMargin = _ref8.limitMargin, minProfit = _ref8.minProfit, approveTxOpts = _ref8.approveTxOpts, sellTxOpts = _ref8.sellTxOpts; ['approvalAmount', 'approvalResetAmount', 'limitMargin', 'minProfit', 'approveTxOpts', 'sellTxOpts'].forEach(function (prop) { delete opts[prop]; @@ -50004,32 +50310,32 @@ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { approveTxOpts = (0, _assign2.default)({}, opts, approveTxOpts); sellTxOpts = (0, _assign2.default)({}, opts, sellTxOpts); - _context3.next = 7; + _context5.next = 7; return this.contracts.Market.at(marketAddress); case 7: - market = _context3.sent; - _context3.t0 = this.contracts.Token; - _context3.t1 = this.contracts.Event; - _context3.next = 12; + market = _context5.sent; + _context5.t0 = this.contracts.Token; + _context5.t1 = this.contracts.Event; + _context5.next = 12; return market.eventContract(opts); case 12: - _context3.t2 = _context3.sent; - _context3.t3 = outcomeTokenIndex; - _context3.next = 16; - return _context3.t1.at.call(_context3.t1, _context3.t2).outcomeTokens(_context3.t3); + _context5.t2 = _context5.sent; + _context5.t3 = outcomeTokenIndex; + _context5.next = 16; + return _context5.t1.at.call(_context5.t1, _context5.t2).outcomeTokens(_context5.t3); case 16: - _context3.t4 = _context3.sent; - _context3.next = 19; - return _context3.t0.at.call(_context3.t0, _context3.t4); + _context5.t4 = _context5.sent; + _context5.next = 19; + return _context5.t0.at.call(_context5.t0, _context5.t4); case 19: - outcomeToken = _context3.sent; + outcomeToken = _context5.sent; if (!(minProfit == null)) { - _context3.next = 31; + _context5.next = 31; break; } @@ -50037,18 +50343,18 @@ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { limitMargin = 0; } - _context3.next = 24; + _context5.next = 24; return this.lmsrMarketMaker.calcProfit(marketAddress, outcomeTokenIndex, outcomeTokenCount, opts); case 24: - baseProfit = _context3.sent; - _context3.t5 = baseProfit; - _context3.next = 28; + baseProfit = _context5.sent; + _context5.t5 = baseProfit; + _context5.next = 28; return market.calcMarketFee(baseProfit, opts); case 28: - _context3.t6 = _context3.sent; - baseProfitWithFee = _context3.t5.sub.call(_context3.t5, _context3.t6); + _context5.t6 = _context5.sent; + baseProfitWithFee = _context5.t5.sub.call(_context5.t5, _context5.t6); minProfit = baseProfitWithFee.mul(this.web3.toBigNumber(1).sub(limitMargin)).round(); @@ -50061,108 +50367,80 @@ var sellOutcomeTokens = exports.sellOutcomeTokens = function () { txInfo = []; if (!(approvalAmount == null)) { - _context3.next = 48; + _context5.next = 43; break; } seller = opts.from || this.defaultAccount; - _context3.next = 37; + _context5.next = 37; return outcomeToken.allowance(seller, marketAddress, opts); case 37: - marketAllowance = _context3.sent; + marketAllowance = _context5.sent; if (!marketAllowance.lt(outcomeTokenCount)) { - _context3.next = 46; + _context5.next = 41; break; } - _context3.t7 = txInfo; - _context3.next = 42; - return outcomeToken.approve.sendTransaction(marketAddress, approvalResetAmount, approveTxOpts); - - case 42: - _context3.t8 = _context3.sent; - _context3.t9 = this.contracts.Token; - _context3.t10 = { - tx: _context3.t8, - contract: _context3.t9, + _context5.next = 41; + return pushDescribedTransaction(txInfo, this.log, { + caller: outcomeToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalResetAmount, approveTxOpts], requiredEventName: 'Approval' - }; - - _context3.t7.push.call(_context3.t7, _context3.t10); + }); - case 46: - _context3.next = 56; + case 41: + _context5.next = 46; break; - case 48: + case 43: if (!this.web3.toBigNumber(0).lt(approvalAmount)) { - _context3.next = 56; + _context5.next = 46; break; } - _context3.t11 = txInfo; - _context3.next = 52; - return outcomeToken.approve.sendTransaction(marketAddress, approvalAmount, approveTxOpts); - - case 52: - _context3.t12 = _context3.sent; - _context3.t13 = this.contracts.Token; - _context3.t14 = { - tx: _context3.t12, - contract: _context3.t13, + _context5.next = 46; + return pushDescribedTransaction(txInfo, this.log, { + caller: outcomeToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalAmount, approveTxOpts], requiredEventName: 'Approval' - }; - - _context3.t11.push.call(_context3.t11, _context3.t14); - - case 56: - _context3.t15 = txInfo; - _context3.next = 59; - return market.sell.sendTransaction(outcomeTokenIndex, outcomeTokenCount, minProfit, sellTxOpts); + }); - case 59: - _context3.t16 = _context3.sent; - _context3.t17 = this.contracts.Market; - _context3.t18 = { - tx: _context3.t16, - contract: _context3.t17, + case 46: + _context5.next = 48; + return pushDescribedTransaction(txInfo, this.log, { + caller: market, + methodName: 'sell', + methodArgs: [outcomeTokenIndex, outcomeTokenCount, minProfit, sellTxOpts], requiredEventName: 'OutcomeTokenSale' - }; - - _context3.t15.push.call(_context3.t15, _context3.t18); - - _context3.next = 65; - return _promise2.default.all(txInfo.map(function (_ref8, i) { - var tx = _ref8.tx, - contract = _ref8.contract; - return contract.syncTransaction(tx); - })); + }); - case 65: - _context3.t19 = function (res, i) { - return (0, _utils.requireEventFromTXResult)(res, txInfo[i].requiredEventName); - }; + case 48: + _context5.next = 50; + return syncDescribedTransactions(txInfo, this.log); - txRequiredEvents = _context3.sent.map(_context3.t19); + case 50: + txRequiredEvents = _context5.sent; saleEvent = txRequiredEvents[txRequiredEvents.length - 1]; - return _context3.abrupt('return', saleEvent.args.outcomeTokenProfit.minus(saleEvent.args.marketFees)); + return _context5.abrupt('return', saleEvent.args.outcomeTokenProfit.minus(saleEvent.args.marketFees)); - case 69: + case 53: case 'end': - return _context3.stop(); + return _context5.stop(); } } - }, _callee3, this); + }, _callee5, this); })); return function sellOutcomeTokens() { - return _ref6.apply(this, arguments); + return _ref7.apply(this, arguments); }; }(); -var _utils = __webpack_require__(45); +var _utils = __webpack_require__(46); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -50193,39 +50471,85 @@ var createMarket = exports.createMarket = (0, _utils.wrapWeb3Function)(function }; }); -buyOutcomeTokens.estimateGas = function () { - var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(_ref4) { - var using = _ref4.using; +var pushDescribedTransaction = function () { + var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(txInfo, log, opts) { + var caller, methodName, methodArgs, txHash, _caller$methodName; + + return _regenerator2.default.wrap(function _callee$(_context) { + while (1) { + switch (_context.prev = _context.next) { + case 0: + caller = opts.caller, methodName = opts.methodName, methodArgs = opts.methodArgs; + txHash = void 0; + _context.prev = 2; + _context.next = 5; + return (_caller$methodName = caller[methodName]).sendTransaction.apply(_caller$methodName, (0, _toConsumableArray3.default)(methodArgs)); + + case 5: + txHash = _context.sent; + + log('got tx hash ' + txHash + ' for call ' + (0, _utils.formatCallSignature)(opts)); + txInfo.push((0, _assign2.default)({ txHash: txHash }, opts)); + _context.next = 13; + break; + + case 10: + _context.prev = 10; + _context.t0 = _context['catch'](2); + throw new _utils.TransactionError((0, _assign2.default)({ txHash: txHash, subError: _context.t0 }, opts)); + + case 13: + case 'end': + return _context.stop(); + } + } + }, _callee, undefined, [[2, 10]]); + })); + + return function pushDescribedTransaction(_x, _x2, _x3) { + return _ref.apply(this, arguments); + }; +}(); + +var syncDescribedTransactions = function () { + var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(txInfo, log) { return _regenerator2.default.wrap(function _callee2$(_context2) { while (1) { switch (_context2.prev = _context2.next) { case 0: - if (!(using === 'stats')) { - _context2.next = 2; - break; - } - - return _context2.abrupt('return', this.contracts.Token.gasStats.approve.averageGasUsed + this.contracts.Market.gasStats.buy.averageGasUsed); + _context2.next = 2; + return _promise2.default.all(txInfo.map(function (opts) { + return opts.caller.constructor.syncTransaction(opts.txHash).then(function (res) { + log('tx ' + opts.txHash + ' synced'); + return res; + }).catch(function (err) { + return new _utils.TransactionError((0, _assign2.default)({ subError: err }, opts)); + }); + })); case 2: - throw new Error('unsupported gas estimation source ' + using); + _context2.t0 = function (res, i) { + return (0, _utils.requireEventFromTXResult)(res, txInfo[i].requiredEventName); + }; - case 3: + return _context2.abrupt('return', _context2.sent.map(_context2.t0)); + + case 4: case 'end': return _context2.stop(); } } - }, _callee2, this); + }, _callee2, undefined); })); - return function (_x) { - return _ref5.apply(this, arguments); + return function syncDescribedTransactions(_x4, _x5) { + return _ref2.apply(this, arguments); }; }(); -sellOutcomeTokens.estimateGas = function () { - var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref9) { - var using = _ref9.using; +buyOutcomeTokens.estimateGas = function () { + var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref5) { + var using = _ref5.using; return _regenerator2.default.wrap(function _callee4$(_context4) { while (1) { switch (_context4.prev = _context4.next) { @@ -50235,7 +50559,7 @@ sellOutcomeTokens.estimateGas = function () { break; } - return _context4.abrupt('return', this.contracts.Token.gasStats.approve.averageGasUsed + this.contracts.Market.gasStats.sell.averageGasUsed); + return _context4.abrupt('return', this.contracts.Token.gasStats.approve.averageGasUsed + this.contracts.Market.gasStats.buy.averageGasUsed); case 2: throw new Error('unsupported gas estimation source ' + using); @@ -50248,116 +50572,85 @@ sellOutcomeTokens.estimateGas = function () { }, _callee4, this); })); - return function (_x2) { - return _ref10.apply(this, arguments); + return function (_x6) { + return _ref6.apply(this, arguments); }; }(); -/***/ }), -/* 380 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = { "default": __webpack_require__(381), __esModule: true }; - -/***/ }), -/* 381 */ -/***/ (function(module, exports, __webpack_require__) { - -__webpack_require__(382); -module.exports = __webpack_require__(3).Object.assign; - -/***/ }), -/* 382 */ -/***/ (function(module, exports, __webpack_require__) { - -// 19.1.3.1 Object.assign(target, source) -var $export = __webpack_require__(9); +sellOutcomeTokens.estimateGas = function () { + var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_ref9) { + var using = _ref9.using; + return _regenerator2.default.wrap(function _callee6$(_context6) { + while (1) { + switch (_context6.prev = _context6.next) { + case 0: + if (!(using === 'stats')) { + _context6.next = 2; + break; + } -$export($export.S + $export.F, 'Object', {assign: __webpack_require__(383)}); + return _context6.abrupt('return', this.contracts.Token.gasStats.approve.averageGasUsed + this.contracts.Market.gasStats.sell.averageGasUsed); -/***/ }), -/* 383 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; + case 2: + throw new Error('unsupported gas estimation source ' + using); -// 19.1.2.1 Object.assign(target, source, ...) -var getKeys = __webpack_require__(16) - , gOPS = __webpack_require__(73) - , pIE = __webpack_require__(35) - , toObject = __webpack_require__(49) - , IObject = __webpack_require__(98) - , $assign = Object.assign; + case 3: + case 'end': + return _context6.stop(); + } + } + }, _callee6, this); + })); -// should work with symbols and should have deterministic property order (V8 bug) -module.exports = !$assign || __webpack_require__(19)(function(){ - var A = {} - , B = {} - , S = Symbol() - , K = 'abcdefghijklmnopqrst'; - A[S] = 7; - K.split('').forEach(function(k){ B[k] = k; }); - return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K; -}) ? function assign(target, source){ // eslint-disable-line no-unused-vars - var T = toObject(target) - , aLen = arguments.length - , index = 1 - , getSymbols = gOPS.f - , isEnum = pIE.f; - while(aLen > index){ - var S = IObject(arguments[index++]) - , keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S) - , length = keys.length - , j = 0 - , key; - while(length > j)if(isEnum.call(S, key = keys[j++]))T[key] = S[key]; - } return T; -} : $assign; + return function (_x7) { + return _ref10.apply(this, arguments); + }; +}(); /***/ }), -/* 384 */ +/* 398 */ /***/ (function(module, exports) { module.exports = {"Event":{"buyAllOutcomes":{"averageGasUsed":126726,"min":{"args":[],"gasUsed":90982},"max":{"args":[],"gasUsed":135662},"median":{"args":[],"gasUsed":135662}},"sellAllOutcomes":{"averageGasUsed":45366,"min":{"args":[],"gasUsed":41616},"max":{"args":[],"gasUsed":49116},"median":{"args":[],"gasUsed":49116}},"setOutcome":{"averageGasUsed":47842,"min":{"args":[],"gasUsed":37758},"max":{"args":[],"gasUsed":52884},"median":{"args":[],"gasUsed":52884}},"redeemWinnings":{"averageGasUsed":48526.5,"min":{"args":[{"from":"0xdb90f4031ebf90e8318921e29107585989a8efc2"}],"gasUsed":40809},"max":{"args":[{"from":"0xb1577573abcb143d5bd4141dfa6b571b2cc576e4"}],"gasUsed":56244},"median":{"args":[{"from":"0xb1577573abcb143d5bd4141dfa6b571b2cc576e4"}],"gasUsed":56244}}},"EventFactory":{"createCategoricalEvent":{"averageGasUsed":1976503.2307692308,"min":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":1976454},"max":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":1976518},"median":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":1976518}},"createScalarEvent":{"averageGasUsed":2245471,"min":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":2245471},"max":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":2245471},"median":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":2245471}}},"Token":{"approve":{"averageGasUsed":45594,"min":{"args":["0xece632f7723cf76427dfa7ff67407d85195a4154"],"gasUsed":45586},"max":{"args":["0xe13d6fd62c3d2f3ad9fb8933702851c7f4572985"],"gasUsed":45650},"median":{"args":["0xece632f7723cf76427dfa7ff67407d85195a4154"],"gasUsed":45586}}},"EtherToken":{"deposit":{"averageGasUsed":52442.28571428572,"min":{"args":[],"gasUsed":37978},"max":{"args":[],"gasUsed":67978},"median":{"args":[],"gasUsed":52978}},"approve":{"averageGasUsed":43574.4,"min":{"args":["0xde7c563d34e717ca2dd2f064e611159675f7f697"],"gasUsed":30608},"max":{"args":["0x42b6cf841b405329a4993ef1cd170374e45f2e86"],"gasUsed":45672},"median":{"args":["0xe80a318af738910cf503bb5a75b059949767e075"],"gasUsed":45288}}},"CentralizedOracle":{"setOutcome":{"averageGasUsed":61986.666666666664,"min":{"args":[],"gasUsed":48376},"max":{"args":[],"gasUsed":65424},"median":{"args":[],"gasUsed":63440}},"replaceOwner":{"averageGasUsed":29970,"min":{"args":[],"gasUsed":29970},"max":{"args":[],"gasUsed":29970},"median":{"args":[],"gasUsed":29970}}},"CentralizedOracleFactory":{"createCentralizedOracle":{"averageGasUsed":350373,"min":{"args":["QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"],"gasUsed":350373},"max":{"args":["QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"],"gasUsed":350373},"median":{"args":["QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"],"gasUsed":350373}}},"StandardMarketFactory":{"createMarket":{"averageGasUsed":1660105.5714285714,"min":{"args":["0xbfe08be596c84109a8fcacd478815c4fe6d2e4ba"],"gasUsed":1660069},"max":{"args":["0x2dd33a9189a2a8d54864ba12da6d03d757891478"],"gasUsed":1660197},"median":{"args":["0x42b6cf841b405329a4993ef1cd170374e45f2e86"],"gasUsed":1660069}}},"LMSRMarketMaker":{},"Market":{"fund":{"averageGasUsed":222766.85714285713,"min":{"args":[],"gasUsed":222584},"max":{"args":[],"gasUsed":222904},"median":{"args":[],"gasUsed":222904}},"sell":{"averageGasUsed":260341.42857142858,"min":{"args":[0],"gasUsed":243302},"max":{"args":[1],"gasUsed":288430},"median":{"args":[1],"gasUsed":258110}},"buy":{"averageGasUsed":283468.125,"min":{"args":[1],"gasUsed":271452},"max":{"args":[1],"gasUsed":323219},"median":{"args":[1],"gasUsed":277514}},"close":{"averageGasUsed":87469,"min":{"args":[],"gasUsed":87469},"max":{"args":[],"gasUsed":87469},"median":{"args":[],"gasUsed":87469}},"shortSell":{"averageGasUsed":481186,"min":{"args":[0],"gasUsed":481186},"max":{"args":[0],"gasUsed":481186},"median":{"args":[0],"gasUsed":481186}}},"Campaign":{"fund":{"averageGasUsed":71872,"min":{"args":[],"gasUsed":70124},"max":{"args":[],"gasUsed":75368},"median":{"args":[],"gasUsed":70124}},"createMarket":{"averageGasUsed":1903625,"min":{"args":[],"gasUsed":1903625},"max":{"args":[],"gasUsed":1903625},"median":{"args":[],"gasUsed":1903625}},"closeMarket":{"averageGasUsed":157749,"min":{"args":[],"gasUsed":157749},"max":{"args":[],"gasUsed":157749},"median":{"args":[],"gasUsed":157749}},"withdrawFees":{"averageGasUsed":50194,"min":{"args":[{"from":"0xb1577573abcb143d5bd4141dfa6b571b2cc576e4"}],"gasUsed":38969},"max":{"args":[{"from":"0xdb90f4031ebf90e8318921e29107585989a8efc2"}],"gasUsed":53969},"median":{"args":[{"from":"0xb1577573abcb143d5bd4141dfa6b571b2cc576e4"}],"gasUsed":53919}},"refund":{"averageGasUsed":54150,"min":{"args":[{"from":"0x63880a201a3a8aa5488f2050375aecda3180d43a"}],"gasUsed":51423},"max":{"args":[{"from":"0x63880a201a3a8aa5488f2050375aecda3180d43a"}],"gasUsed":56877},"median":{"args":[{"from":"0x63880a201a3a8aa5488f2050375aecda3180d43a"}],"gasUsed":56877}}},"CampaignFactory":{"createCampaign":{"averageGasUsed":1066303,"min":{"args":["0x42b6cf841b405329a4993ef1cd170374e45f2e86"],"gasUsed":1066303},"max":{"args":["0xa23ad3cac9f79c4df97ec10a08ac7ea3381055fe"],"gasUsed":1066303},"median":{"args":["0xa23ad3cac9f79c4df97ec10a08ac7ea3381055fe"],"gasUsed":1066303}}},"Math":{},"DifficultyOracle":{},"DifficultyOracleFactory":{"createDifficultyOracle":{"averageGasUsed":163589,"min":{"args":[117],"gasUsed":163589},"max":{"args":[117],"gasUsed":163589},"median":{"args":[117],"gasUsed":163589}}},"MajorityOracle":{},"MajorityOracleFactory":{"createMajorityOracle":{"averageGasUsed":374286,"min":{"args":[["0xf1ee3ff97c62ccf6ac72cd838704646fb7b227e7","0xa63ec704379bd79a06f83a1c0cfbce1e0c09a75c","0xff2a2f46319b5d7414321266a7ef1b68083eb449"]],"gasUsed":374286},"max":{"args":[["0xf1ee3ff97c62ccf6ac72cd838704646fb7b227e7","0xa63ec704379bd79a06f83a1c0cfbce1e0c09a75c","0xff2a2f46319b5d7414321266a7ef1b68083eb449"]],"gasUsed":374286},"median":{"args":[["0xf1ee3ff97c62ccf6ac72cd838704646fb7b227e7","0xa63ec704379bd79a06f83a1c0cfbce1e0c09a75c","0xff2a2f46319b5d7414321266a7ef1b68083eb449"]],"gasUsed":374286}}},"UltimateOracle":{"setForwardedOutcome":{"averageGasUsed":67994,"min":{"args":[],"gasUsed":67994},"max":{"args":[],"gasUsed":67994},"median":{"args":[],"gasUsed":67994}},"challengeOutcome":{"averageGasUsed":155190,"min":{"args":[],"gasUsed":155190},"max":{"args":[],"gasUsed":155190},"median":{"args":[],"gasUsed":155190}},"voteForOutcome":{"averageGasUsed":84903.66666666667,"min":{"args":[],"gasUsed":81137},"max":{"args":[],"gasUsed":92157},"median":{"args":[],"gasUsed":81417}},"withdraw":{"averageGasUsed":27354,"min":{"args":[{"from":"0xd6e281924e1540fd49d1dad33d8f19854df542c9"}],"gasUsed":27354},"max":{"args":[{"from":"0xd6e281924e1540fd49d1dad33d8f19854df542c9"}],"gasUsed":27354},"median":{"args":[{"from":"0xd6e281924e1540fd49d1dad33d8f19854df542c9"}],"gasUsed":27354}}},"UltimateOracleFactory":{"createUltimateOracle":{"averageGasUsed":914536,"min":{"args":["0x2b8344fc800509a6b2771553350fa93cec793245"],"gasUsed":914536},"max":{"args":["0xc9777c83937e38307607bdeff3061165fde975a5"],"gasUsed":914536},"median":{"args":["0xc9777c83937e38307607bdeff3061165fde975a5"],"gasUsed":914536}}},"FutarchyOracle":{"fund":{"averageGasUsed":649515,"min":{"args":[],"gasUsed":649515},"max":{"args":[],"gasUsed":649515},"median":{"args":[],"gasUsed":649515}},"setOutcome":{"averageGasUsed":74665,"min":{"args":[],"gasUsed":74665},"max":{"args":[],"gasUsed":74665},"median":{"args":[],"gasUsed":74665}},"close":{"averageGasUsed":261420,"min":{"args":[],"gasUsed":261420},"max":{"args":[],"gasUsed":261420},"median":{"args":[],"gasUsed":261420}}},"FutarchyOracleFactory":{"createFutarchyOracle":{"averageGasUsed":11074663,"min":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":11074548},"max":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":11074778},"median":{"args":["0x0ab1f296b8c260e50e950fa48904bba434dc8111"],"gasUsed":11074778}}},"StandardMarketWithPriceLogger":{"buy":{"averageGasUsed":399998,"min":{"args":[1],"gasUsed":399998},"max":{"args":[1],"gasUsed":399998},"median":{"args":[1],"gasUsed":399998}}},"CategoricalEvent":{"buyAllOutcomes":{"averageGasUsed":91046,"min":{"args":[],"gasUsed":91046},"max":{"args":[],"gasUsed":91046},"median":{"args":[],"gasUsed":91046}},"setOutcome":{"averageGasUsed":53098,"min":{"args":[],"gasUsed":53098},"max":{"args":[],"gasUsed":53098},"median":{"args":[],"gasUsed":53098}}},"ScalarEvent":{"setOutcome":{"averageGasUsed":52758,"min":{"args":[],"gasUsed":52758},"max":{"args":[],"gasUsed":52758},"median":{"args":[],"gasUsed":52758}}}} /***/ }), -/* 385 */ +/* 399 */ /***/ (function(module, exports, __webpack_require__) { var map = { - "./Campaign.json": 386, - "./CampaignFactory.json": 387, - "./CategoricalEvent.json": 388, - "./CentralizedOracle.json": 389, - "./CentralizedOracleFactory.json": 390, - "./DifficultyOracle.json": 391, - "./DifficultyOracleFactory.json": 392, - "./EtherToken.json": 393, - "./Event.json": 394, - "./EventFactory.json": 395, - "./FutarchyOracle.json": 396, - "./FutarchyOracleFactory.json": 397, - "./HumanFriendlyToken.json": 398, - "./LMSRMarketMaker.json": 399, - "./MajorityOracle.json": 400, - "./MajorityOracleFactory.json": 401, - "./Market.json": 402, - "./MarketMaker.json": 403, - "./Math.json": 404, - "./Migrations.json": 405, - "./Oracle.json": 406, - "./OutcomeToken.json": 407, - "./ScalarEvent.json": 408, - "./SignedMessageOracle.json": 409, - "./SignedMessageOracleFactory.json": 410, - "./StandardMarket.json": 411, - "./StandardMarketFactory.json": 412, - "./StandardMarketWithPriceLogger.json": 413, - "./StandardMarketWithPriceLoggerFactory.json": 414, - "./StandardToken.json": 415, - "./Token.json": 416, - "./UltimateOracle.json": 417, - "./UltimateOracleFactory.json": 418 + "./Campaign.json": 400, + "./CampaignFactory.json": 401, + "./CategoricalEvent.json": 402, + "./CentralizedOracle.json": 403, + "./CentralizedOracleFactory.json": 404, + "./DifficultyOracle.json": 405, + "./DifficultyOracleFactory.json": 406, + "./EtherToken.json": 407, + "./Event.json": 408, + "./EventFactory.json": 409, + "./FutarchyOracle.json": 410, + "./FutarchyOracleFactory.json": 411, + "./HumanFriendlyToken.json": 412, + "./LMSRMarketMaker.json": 413, + "./MajorityOracle.json": 414, + "./MajorityOracleFactory.json": 415, + "./Market.json": 416, + "./MarketMaker.json": 417, + "./Math.json": 418, + "./Migrations.json": 419, + "./Oracle.json": 420, + "./OutcomeToken.json": 421, + "./ScalarEvent.json": 422, + "./SignedMessageOracle.json": 423, + "./SignedMessageOracleFactory.json": 424, + "./StandardMarket.json": 425, + "./StandardMarketFactory.json": 426, + "./StandardMarketWithPriceLogger.json": 427, + "./StandardMarketWithPriceLoggerFactory.json": 428, + "./StandardToken.json": 429, + "./Token.json": 430, + "./UltimateOracle.json": 431, + "./UltimateOracleFactory.json": 432 }; function webpackContext(req) { return __webpack_require__(webpackContextResolve(req)); @@ -50373,211 +50666,211 @@ webpackContext.keys = function webpackContextKeys() { }; webpackContext.resolve = webpackContextResolve; module.exports = webpackContext; -webpackContext.id = 385; +webpackContext.id = 399; /***/ }), -/* 386 */ +/* 400 */ /***/ (function(module, exports) { module.exports = {"contract_name":"Campaign","abi":[{"constant":true,"inputs":[],"name":"marketFactory","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"marketMaker","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"finalBalance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"contributions","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"withdrawFees","outputs":[{"name":"fees","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"refund","outputs":[{"name":"refundAmount","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"market","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"createMarket","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"stage","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"closeMarket","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"fund","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"funding","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"eventContract","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"FEE_RANGE","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"inputs":[{"name":"_eventContract","type":"address"},{"name":"_marketFactory","type":"address"},{"name":"_marketMaker","type":"address"},{"name":"_fee","type":"uint24"},{"name":"_funding","type":"uint256"},{"name":"_deadline","type":"uint256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"funding","type":"uint256"}],"name":"CampaignFunding","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"refund","type":"uint256"}],"name":"CampaignRefund","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"market","type":"address"}],"name":"MarketCreation","type":"event"},{"anonymous":false,"inputs":[],"name":"MarketClosing","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"fees","type":"uint256"}],"name":"FeeWithdrawal","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064283} /***/ }), -/* 387 */ +/* 401 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"CampaignFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketFactory","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"funding","type":"uint256"},{"name":"deadline","type":"uint256"}],"name":"createCampaign","outputs":[{"name":"campaign","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"campaign","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketFactory","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"funding","type":"uint256"},{"indexed":false,"name":"deadline","type":"uint256"}],"name":"CampaignCreation","type":"event"}],"networks":{"3":{"address":"0xd19bce9f7693598a9fa1f94c548b20887a33f141","updated_at":1503605014193},"4":{"address":"0x800820aeb972cb886fdd89d340dbe7b3f4769401","updated_at":1503603856239},"42":{"address":"0xf51b1544362ce80a542b76c49cce564497cf1bd0","updated_at":1503602339892},"437894314312":{"address":"0x0290fb167208af455bb137780163b7b7a9a10c16","updated_at":1507361155413}},"schema_version":"0.0.5","updated_at":1513131293591} +module.exports = {"contract_name":"CampaignFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketFactory","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"funding","type":"uint256"},{"name":"deadline","type":"uint256"}],"name":"createCampaign","outputs":[{"name":"campaign","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"campaign","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketFactory","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"funding","type":"uint256"},{"indexed":false,"name":"deadline","type":"uint256"}],"name":"CampaignCreation","type":"event"}],"networks":{"3":{"address":"0xd19bce9f7693598a9fa1f94c548b20887a33f141","updated_at":1503605014193},"4":{"address":"0x800820aeb972cb886fdd89d340dbe7b3f4769401","updated_at":1503603856239},"42":{"address":"0xf51b1544362ce80a542b76c49cce564497cf1bd0","updated_at":1503602339892},"437894314312":{"address":"0x0290fb167208af455bb137780163b7b7a9a10c16","updated_at":1507361155413}},"schema_version":"0.0.5","updated_at":1513718811388} /***/ }), -/* 388 */ +/* 402 */ /***/ (function(module, exports) { module.exports = {"contract_name":"CategoricalEvent","abi":[{"constant":false,"inputs":[],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"outcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"collateralTokenCount","type":"uint256"}],"name":"buyAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"getOutcomeTokenDistribution","outputs":[{"name":"outcomeTokenDistribution","type":"uint256[]"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenCount","type":"uint256"}],"name":"sellAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"oracle","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeCount","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"outcomeTokens","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"redeemWinnings","outputs":[{"name":"winnings","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"collateralToken","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getEventHash","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeTokens","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"},{"inputs":[{"name":"_collateralToken","type":"address"},{"name":"_oracle","type":"address"},{"name":"outcomeCount","type":"uint8"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcomeToken","type":"address"},{"indexed":false,"name":"index","type":"uint8"}],"name":"OutcomeTokenCreation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"collateralTokenCount","type":"uint256"}],"name":"OutcomeTokenSetIssuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"}],"name":"OutcomeTokenSetRevocation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeAssignment","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"winnings","type":"uint256"}],"name":"WinningsRedemption","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064282} /***/ }), -/* 389 */ +/* 403 */ /***/ (function(module, exports) { module.exports = {"contract_name":"CentralizedOracle","abi":[{"constant":true,"inputs":[],"name":"outcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_outcome","type":"int256"}],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"replaceOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"ipfsHash","outputs":[{"name":"","type":"bytes"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"inputs":[{"name":"_owner","type":"address"},{"name":"_ipfsHash","type":"bytes"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnerReplacement","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeAssignment","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064284} /***/ }), -/* 390 */ +/* 404 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"CentralizedOracleFactory","abi":[{"constant":false,"inputs":[{"name":"ipfsHash","type":"bytes"}],"name":"createCentralizedOracle","outputs":[{"name":"centralizedOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"centralizedOracle","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes"}],"name":"CentralizedOracleCreation","type":"event"}],"networks":{"3":{"address":"0x472099767cc73a371c1848cbc0d17357e9bba52a","updated_at":1503605014190},"4":{"address":"0xb3289eaac0fe3ed15df177f925c6f8ceeb908b8f","updated_at":1503603856237},"42":{"address":"0xe8d7862d2ad41dd0d4dda98b47523f1238cf2155","updated_at":1503602339889},"437894314312":{"address":"0xcfeb869f69431e42cdb54a4f4f105c19c080a601","updated_at":1507361155407}},"schema_version":"0.0.5","updated_at":1513131293566} +module.exports = {"contract_name":"CentralizedOracleFactory","abi":[{"constant":false,"inputs":[{"name":"ipfsHash","type":"bytes"}],"name":"createCentralizedOracle","outputs":[{"name":"centralizedOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"centralizedOracle","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes"}],"name":"CentralizedOracleCreation","type":"event"}],"networks":{"3":{"address":"0x472099767cc73a371c1848cbc0d17357e9bba52a","updated_at":1503605014190},"4":{"address":"0xb3289eaac0fe3ed15df177f925c6f8ceeb908b8f","updated_at":1503603856237},"42":{"address":"0xe8d7862d2ad41dd0d4dda98b47523f1238cf2155","updated_at":1503602339889},"437894314312":{"address":"0xcfeb869f69431e42cdb54a4f4f105c19c080a601","updated_at":1507361155407}},"schema_version":"0.0.5","updated_at":1513718811376} /***/ }), -/* 391 */ +/* 405 */ /***/ (function(module, exports) { module.exports = {"contract_name":"DifficultyOracle","abi":[{"constant":false,"inputs":[],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"difficulty","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"blockNumber","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"inputs":[{"name":"_blockNumber","type":"uint256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"difficulty","type":"uint256"}],"name":"OutcomeAssignment","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064284} /***/ }), -/* 392 */ +/* 406 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"DifficultyOracleFactory","abi":[{"constant":false,"inputs":[{"name":"blockNumber","type":"uint256"}],"name":"createDifficultyOracle","outputs":[{"name":"difficultyOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"difficultyOracle","type":"address"},{"indexed":false,"name":"blockNumber","type":"uint256"}],"name":"DifficultyOracleCreation","type":"event"}],"networks":{"3":{"address":"0xa2f86534959e83abbade7f5a560ba735bb4de3a3","updated_at":1503605014190},"4":{"address":"0x47c70527aaa5e98ade8da8100aec805e6fda037b","updated_at":1503603856237},"42":{"address":"0x11bcc6eea4ac6415eed82db3c544e7bdb701129e","updated_at":1503602339889},"437894314312":{"address":"0xc89ce4735882c9f0f0fe26686c53074e09b0d550","updated_at":1507361155408}},"schema_version":"0.0.5","updated_at":1513131293569} +module.exports = {"contract_name":"DifficultyOracleFactory","abi":[{"constant":false,"inputs":[{"name":"blockNumber","type":"uint256"}],"name":"createDifficultyOracle","outputs":[{"name":"difficultyOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"difficultyOracle","type":"address"},{"indexed":false,"name":"blockNumber","type":"uint256"}],"name":"DifficultyOracleCreation","type":"event"}],"networks":{"3":{"address":"0xa2f86534959e83abbade7f5a560ba735bb4de3a3","updated_at":1503605014190},"4":{"address":"0x47c70527aaa5e98ade8da8100aec805e6fda037b","updated_at":1503603856237},"42":{"address":"0x11bcc6eea4ac6415eed82db3c544e7bdb701129e","updated_at":1503602339889},"437894314312":{"address":"0xc89ce4735882c9f0f0fe26686c53074e09b0d550","updated_at":1507361155408}},"schema_version":"0.0.5","updated_at":1513718811378} /***/ }), -/* 393 */ +/* 407 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"EtherToken","abi":[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"value","type":"uint256"}],"name":"withdraw","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"deposit","outputs":[],"payable":true,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Withdrawal","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{"3":{"address":"0xeaa325bacae405fd5b45e9cf695d391f1c624a2f","updated_at":1503605014187},"4":{"address":"0xd19bce9f7693598a9fa1f94c548b20887a33f141","updated_at":1503603856233},"42":{"address":"0x9326454039077bcea0705d6b68c8e9b104094a1c","updated_at":1503602339886},"437894314312":{"address":"0x59d3631c86bbe35ef041872d502f218a39fba150","updated_at":1507361155404}},"schema_version":"0.0.5","updated_at":1513131293561} +module.exports = {"contract_name":"EtherToken","abi":[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"value","type":"uint256"}],"name":"withdraw","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"deposit","outputs":[],"payable":true,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Deposit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Withdrawal","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{"3":{"address":"0xeaa325bacae405fd5b45e9cf695d391f1c624a2f","updated_at":1503605014187},"4":{"address":"0xd19bce9f7693598a9fa1f94c548b20887a33f141","updated_at":1503603856233},"42":{"address":"0x9326454039077bcea0705d6b68c8e9b104094a1c","updated_at":1503602339886},"437894314312":{"address":"0x59d3631c86bbe35ef041872d502f218a39fba150","updated_at":1507361155404}},"schema_version":"0.0.5","updated_at":1513718811371} /***/ }), -/* 394 */ +/* 408 */ /***/ (function(module, exports) { module.exports = {"contract_name":"Event","abi":[{"constant":false,"inputs":[],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"outcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"collateralTokenCount","type":"uint256"}],"name":"buyAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"getOutcomeTokenDistribution","outputs":[{"name":"outcomeTokenDistribution","type":"uint256[]"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenCount","type":"uint256"}],"name":"sellAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"oracle","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeCount","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"outcomeTokens","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"redeemWinnings","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"collateralToken","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getEventHash","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeTokens","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"},{"inputs":[{"name":"_collateralToken","type":"address"},{"name":"_oracle","type":"address"},{"name":"outcomeCount","type":"uint8"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcomeToken","type":"address"},{"indexed":false,"name":"index","type":"uint8"}],"name":"OutcomeTokenCreation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"collateralTokenCount","type":"uint256"}],"name":"OutcomeTokenSetIssuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"}],"name":"OutcomeTokenSetRevocation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeAssignment","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"winnings","type":"uint256"}],"name":"WinningsRedemption","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064282} /***/ }), -/* 395 */ +/* 409 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"EventFactory","abi":[{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"lowerBound","type":"int256"},{"name":"upperBound","type":"int256"}],"name":"createScalarEvent","outputs":[{"name":"eventContract","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"categoricalEvents","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"scalarEvents","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"outcomeCount","type":"uint8"}],"name":"createCategoricalEvent","outputs":[{"name":"eventContract","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"categoricalEvent","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"outcomeCount","type":"uint8"}],"name":"CategoricalEventCreation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"scalarEvent","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"lowerBound","type":"int256"},{"indexed":false,"name":"upperBound","type":"int256"}],"name":"ScalarEventCreation","type":"event"}],"networks":{"3":{"address":"0xc2803221bf9cb3a245a19bb46727f6d797556dfc","updated_at":1503605014183},"4":{"address":"0x0f60faf69f3ac146e1e557247583bc0c84f9f086","updated_at":1503603856229},"42":{"address":"0x5cfc2409a2d601ad3ac0912de1021ddd0cd3e1dc","updated_at":1503602339883},"437894314312":{"address":"0x67b5656d60a809915323bf2c40a8bef15a152e3e","updated_at":1507361155401}},"schema_version":"0.0.5","updated_at":1513131293567} +module.exports = {"contract_name":"EventFactory","abi":[{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"lowerBound","type":"int256"},{"name":"upperBound","type":"int256"}],"name":"createScalarEvent","outputs":[{"name":"eventContract","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"categoricalEvents","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"scalarEvents","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"outcomeCount","type":"uint8"}],"name":"createCategoricalEvent","outputs":[{"name":"eventContract","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"categoricalEvent","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"outcomeCount","type":"uint8"}],"name":"CategoricalEventCreation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"scalarEvent","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"lowerBound","type":"int256"},{"indexed":false,"name":"upperBound","type":"int256"}],"name":"ScalarEventCreation","type":"event"}],"networks":{"3":{"address":"0xc2803221bf9cb3a245a19bb46727f6d797556dfc","updated_at":1503605014183},"4":{"address":"0x0f60faf69f3ac146e1e557247583bc0c84f9f086","updated_at":1503603856229},"42":{"address":"0x5cfc2409a2d601ad3ac0912de1021ddd0cd3e1dc","updated_at":1503602339883},"437894314312":{"address":"0x67b5656d60a809915323bf2c40a8bef15a152e3e","updated_at":1507361155401}},"schema_version":"0.0.5","updated_at":1513718811369} /***/ }), -/* 396 */ +/* 410 */ /***/ (function(module, exports) { module.exports = {"contract_name":"FutarchyOracle","abi":[{"constant":false,"inputs":[],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"close","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"LONG","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"winningMarketIndex","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"markets","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"categoricalEvent","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"funding","type":"uint256"}],"name":"fund","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"tradingPeriod","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[{"name":"_creator","type":"address"},{"name":"eventFactory","type":"address"},{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"outcomeCount","type":"uint8"},{"name":"lowerBound","type":"int256"},{"name":"upperBound","type":"int256"},{"name":"marketFactory","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"_tradingPeriod","type":"uint256"},{"name":"startDate","type":"uint256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"funding","type":"uint256"}],"name":"FutarchyFunding","type":"event"},{"anonymous":false,"inputs":[],"name":"FutarchyClosing","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"winningMarketIndex","type":"uint256"}],"name":"OutcomeAssignment","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064284} /***/ }), -/* 397 */ +/* 411 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"FutarchyOracleFactory","abi":[{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"outcomeCount","type":"uint8"},{"name":"lowerBound","type":"int256"},{"name":"upperBound","type":"int256"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"tradingPeriod","type":"uint256"},{"name":"startDate","type":"uint256"}],"name":"createFutarchyOracle","outputs":[{"name":"futarchyOracle","type":"address"}],"payable":false,"type":"function"},{"inputs":[{"name":"_eventFactory","type":"address"},{"name":"_marketFactory","type":"address"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"futarchyOracle","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"outcomeCount","type":"uint8"},{"indexed":false,"name":"lowerBound","type":"int256"},{"indexed":false,"name":"upperBound","type":"int256"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"tradingPeriod","type":"uint256"},{"indexed":false,"name":"startDate","type":"uint256"}],"name":"FutarchyOracleCreation","type":"event"}],"networks":{"3":{"address":"0x0f60faf69f3ac146e1e557247583bc0c84f9f086","updated_at":1503605014191},"4":{"address":"0xd93d5174b346d5037486e40e335fd2edc353bfcc","updated_at":1503603856237},"42":{"address":"0xc55c643d9084df9372c43fc2f4f6cd3f7446d00d","updated_at":1503602339890},"437894314312":{"address":"0x2612af3a521c2df9eaf28422ca335b04adf3ac66","updated_at":1507361155409}},"schema_version":"0.0.5","updated_at":1513131293573} +module.exports = {"contract_name":"FutarchyOracleFactory","abi":[{"constant":false,"inputs":[{"name":"collateralToken","type":"address"},{"name":"oracle","type":"address"},{"name":"outcomeCount","type":"uint8"},{"name":"lowerBound","type":"int256"},{"name":"upperBound","type":"int256"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"tradingPeriod","type":"uint256"},{"name":"startDate","type":"uint256"}],"name":"createFutarchyOracle","outputs":[{"name":"futarchyOracle","type":"address"}],"payable":false,"type":"function"},{"inputs":[{"name":"_eventFactory","type":"address"},{"name":"_marketFactory","type":"address"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"futarchyOracle","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"outcomeCount","type":"uint8"},{"indexed":false,"name":"lowerBound","type":"int256"},{"indexed":false,"name":"upperBound","type":"int256"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"tradingPeriod","type":"uint256"},{"indexed":false,"name":"startDate","type":"uint256"}],"name":"FutarchyOracleCreation","type":"event"}],"networks":{"3":{"address":"0x0f60faf69f3ac146e1e557247583bc0c84f9f086","updated_at":1503605014191},"4":{"address":"0xd93d5174b346d5037486e40e335fd2edc353bfcc","updated_at":1503603856237},"42":{"address":"0xc55c643d9084df9372c43fc2f4f6cd3f7446d00d","updated_at":1503602339890},"437894314312":{"address":"0x2612af3a521c2df9eaf28422ca335b04adf3ac66","updated_at":1507361155409}},"schema_version":"0.0.5","updated_at":1513718811382} /***/ }), -/* 398 */ +/* 412 */ /***/ (function(module, exports) { module.exports = {"contract_name":"HumanFriendlyToken","abi":[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064280} /***/ }), -/* 399 */ +/* 413 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"LMSRMarketMaker","abi":[{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcProfit","outputs":[{"name":"profit","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcCost","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"}],"name":"calcMarginalPrice","outputs":[{"name":"price","type":"uint256"}],"payable":false,"type":"function"}],"networks":{"3":{"address":"0xe81424ffc847919efc5f0156e3799edc60ebf715","updated_at":1503605014192},"4":{"address":"0x11b5257396f156027b9232da7220bd7447282db6","updated_at":1503603856238},"42":{"address":"0xcc9a28a40a25be4d9b8c3134aa6fd8b38f817123","updated_at":1503602339890},"437894314312":{"address":"0x9561c133dd8580860b6b7e504bc5aa500f0f06a7","updated_at":1507361155410}},"schema_version":"0.0.5","updated_at":1513131293573} +module.exports = {"contract_name":"LMSRMarketMaker","abi":[{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcProfit","outputs":[{"name":"profit","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcCost","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"}],"name":"calcMarginalPrice","outputs":[{"name":"price","type":"uint256"}],"payable":false,"type":"function"}],"networks":{"3":{"address":"0xe81424ffc847919efc5f0156e3799edc60ebf715","updated_at":1503605014192},"4":{"address":"0x11b5257396f156027b9232da7220bd7447282db6","updated_at":1503603856238},"42":{"address":"0xcc9a28a40a25be4d9b8c3134aa6fd8b38f817123","updated_at":1503602339890},"437894314312":{"address":"0x9561c133dd8580860b6b7e504bc5aa500f0f06a7","updated_at":1507361155410}},"schema_version":"0.0.5","updated_at":1513718811384} /***/ }), -/* 400 */ +/* 414 */ /***/ (function(module, exports) { module.exports = {"contract_name":"MajorityOracle","abi":[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"oracles","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"getStatusAndOutcome","outputs":[{"name":"outcomeSet","type":"bool"},{"name":"outcome","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"inputs":[{"name":"_oracles","type":"address[]"}],"payable":false,"type":"constructor"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064285} /***/ }), -/* 401 */ +/* 415 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"MajorityOracleFactory","abi":[{"constant":false,"inputs":[{"name":"oracles","type":"address[]"}],"name":"createMajorityOracle","outputs":[{"name":"majorityOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"majorityOracle","type":"address"},{"indexed":false,"name":"oracles","type":"address[]"}],"name":"MajorityOracleCreation","type":"event"}],"networks":{"3":{"address":"0xb3289eaac0fe3ed15df177f925c6f8ceeb908b8f","updated_at":1503605014190},"4":{"address":"0xa2f86534959e83abbade7f5a560ba735bb4de3a3","updated_at":1503603856237},"42":{"address":"0x4b9d168269dda8630fb4d064dbcbbe90d0286158","updated_at":1503602339890},"437894314312":{"address":"0x254dffcd3277c0b1660f6d42efbb754edababc2b","updated_at":1507361155408}},"schema_version":"0.0.5","updated_at":1513131293568} +module.exports = {"contract_name":"MajorityOracleFactory","abi":[{"constant":false,"inputs":[{"name":"oracles","type":"address[]"}],"name":"createMajorityOracle","outputs":[{"name":"majorityOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"majorityOracle","type":"address"},{"indexed":false,"name":"oracles","type":"address[]"}],"name":"MajorityOracleCreation","type":"event"}],"networks":{"3":{"address":"0xb3289eaac0fe3ed15df177f925c6f8ceeb908b8f","updated_at":1503605014190},"4":{"address":"0xa2f86534959e83abbade7f5a560ba735bb4de3a3","updated_at":1503603856237},"42":{"address":"0x4b9d168269dda8630fb4d064dbcbbe90d0286158","updated_at":1503602339890},"437894314312":{"address":"0x254dffcd3277c0b1660f6d42efbb754edababc2b","updated_at":1507361155408}},"schema_version":"0.0.5","updated_at":1513718811377} /***/ }), -/* 402 */ +/* 416 */ /***/ (function(module, exports) { module.exports = {"contract_name":"Market","abi":[{"constant":true,"inputs":[],"name":"creator","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"marketMaker","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"shortSell","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"close","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"sell","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"withdrawFees","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"createdAtBlock","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"netOutcomeTokensSold","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"outcomeTokenCost","type":"uint256"}],"name":"calcMarketFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"stage","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_funding","type":"uint256"}],"name":"fund","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"funding","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"eventContract","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"maxCost","type":"uint256"}],"name":"buy","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"funding","type":"uint256"}],"name":"MarketFunding","type":"event"},{"anonymous":false,"inputs":[],"name":"MarketClosing","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"fees","type":"uint256"}],"name":"FeeWithdrawal","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenCost","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenProfit","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenSale","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"cost","type":"uint256"}],"name":"OutcomeTokenShortSale","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064283} /***/ }), -/* 403 */ +/* 417 */ /***/ (function(module, exports) { module.exports = {"contract_name":"MarketMaker","abi":[{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcProfit","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"calcCost","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"market","type":"address"},{"name":"outcomeTokenIndex","type":"uint8"}],"name":"calcMarginalPrice","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064283} /***/ }), -/* 404 */ +/* 418 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"Math","abi":[{"constant":true,"inputs":[],"name":"LN2","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToMul","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"LOG2_E","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"uint256"}],"name":"ln","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"uint256"}],"name":"floorLog2","outputs":[{"name":"lo","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToAdd","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"add","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToSub","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"add","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"sub","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"sub","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"mul","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"ONE","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"mul","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToMul","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"nums","type":"int256[]"}],"name":"max","outputs":[{"name":"max","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToAdd","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToSub","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"int256"}],"name":"exp","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}],"networks":{"3":{"address":"0xc55c643d9084df9372c43fc2f4f6cd3f7446d00d","updated_at":1503605014183},"4":{"address":"0x472099767cc73a371c1848cbc0d17357e9bba52a","updated_at":1503603856229},"42":{"address":"0x0dd253f644e702346ec67839088ae5954d51e76b","updated_at":1503602339882},"437894314312":{"address":"0x5b1869d9a4c187f2eaa108f3062412ecf0526b24","updated_at":1507361155400}},"schema_version":"0.0.5","updated_at":1513131293561} +module.exports = {"contract_name":"Math","abi":[{"constant":true,"inputs":[],"name":"LN2","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToMul","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"LOG2_E","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"uint256"}],"name":"ln","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"uint256"}],"name":"floorLog2","outputs":[{"name":"lo","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToAdd","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"add","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToSub","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"add","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"sub","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"sub","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"mul","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"ONE","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"mul","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToMul","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"nums","type":"int256[]"}],"name":"max","outputs":[{"name":"max","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"int256"},{"name":"b","type":"int256"}],"name":"safeToAdd","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"a","type":"uint256"},{"name":"b","type":"uint256"}],"name":"safeToSub","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"x","type":"int256"}],"name":"exp","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"}],"networks":{"3":{"address":"0xc55c643d9084df9372c43fc2f4f6cd3f7446d00d","updated_at":1503605014183},"4":{"address":"0x472099767cc73a371c1848cbc0d17357e9bba52a","updated_at":1503603856229},"42":{"address":"0x0dd253f644e702346ec67839088ae5954d51e76b","updated_at":1503602339882},"437894314312":{"address":"0x5b1869d9a4c187f2eaa108f3062412ecf0526b24","updated_at":1507361155400}},"schema_version":"0.0.5","updated_at":1513718811369} /***/ }), -/* 405 */ +/* 419 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"Migrations","abi":[{"constant":false,"inputs":[{"name":"new_address","type":"address"}],"name":"upgrade","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"last_completed_migration","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"completed","type":"uint256"}],"name":"setCompleted","outputs":[],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"}],"networks":{"3":{"updated_at":1503605014193},"4":{"updated_at":1503603856239},"42":{"updated_at":1503602339891},"437894314312":{"updated_at":1507361155414}},"schema_version":"0.0.5","updated_at":1513131293591} +module.exports = {"contract_name":"Migrations","abi":[{"constant":false,"inputs":[{"name":"new_address","type":"address"}],"name":"upgrade","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"last_completed_migration","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"completed","type":"uint256"}],"name":"setCompleted","outputs":[],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"}],"networks":{"3":{"updated_at":1503605014193},"4":{"updated_at":1503603856239},"42":{"updated_at":1503602339891},"437894314312":{"updated_at":1507361155414}},"schema_version":"0.0.5","updated_at":1513718811405} /***/ }), -/* 406 */ +/* 420 */ /***/ (function(module, exports) { module.exports = {"contract_name":"Oracle","abi":[{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064285} /***/ }), -/* 407 */ +/* 421 */ /***/ (function(module, exports) { module.exports = {"contract_name":"OutcomeToken","abi":[{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_for","type":"address"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"issue","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"eventContract","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_for","type":"address"},{"name":"outcomeTokenCount","type":"uint256"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Issuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Revocation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064286} /***/ }), -/* 408 */ +/* 422 */ /***/ (function(module, exports) { module.exports = {"contract_name":"ScalarEvent","abi":[{"constant":false,"inputs":[],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"outcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"collateralTokenCount","type":"uint256"}],"name":"buyAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"LONG","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"getOutcomeTokenDistribution","outputs":[{"name":"outcomeTokenDistribution","type":"uint256[]"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"OUTCOME_RANGE","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenCount","type":"uint256"}],"name":"sellAllOutcomes","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"oracle","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeCount","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"outcomeTokens","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"lowerBound","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"SHORT","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"redeemWinnings","outputs":[{"name":"winnings","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"upperBound","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"collateralToken","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getEventHash","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcomeTokens","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"},{"inputs":[{"name":"_collateralToken","type":"address"},{"name":"_oracle","type":"address"},{"name":"_lowerBound","type":"int256"},{"name":"_upperBound","type":"int256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcomeToken","type":"address"},{"indexed":false,"name":"index","type":"uint8"}],"name":"OutcomeTokenCreation","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"collateralTokenCount","type":"uint256"}],"name":"OutcomeTokenSetIssuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"}],"name":"OutcomeTokenSetRevocation","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeAssignment","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"receiver","type":"address"},{"indexed":false,"name":"winnings","type":"uint256"}],"name":"WinningsRedemption","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064283} /***/ }), -/* 409 */ +/* 423 */ /***/ (function(module, exports) { module.exports = {"contract_name":"SignedMessageOracle","abi":[{"constant":true,"inputs":[],"name":"signer","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"outcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"newSigner","type":"address"},{"name":"_nonce","type":"uint256"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"name":"replaceSigner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"descriptionHash","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_outcome","type":"int256"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"name":"setOutcome","outputs":[],"payable":false,"type":"function"},{"inputs":[{"name":"_descriptionHash","type":"bytes32"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"newSigner","type":"address"}],"name":"SignerReplacement","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeAssignment","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064285} /***/ }), -/* 410 */ +/* 424 */ /***/ (function(module, exports) { module.exports = {"contract_name":"SignedMessageOracleFactory","abi":[{"constant":false,"inputs":[{"name":"descriptionHash","type":"bytes32"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"name":"createSignedMessageOracle","outputs":[{"name":"signedMessageOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"signedMessageOracle","type":"address"},{"indexed":false,"name":"oracle","type":"address"}],"name":"SignedMessageOracleCreation","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064285} /***/ }), -/* 411 */ +/* 425 */ /***/ (function(module, exports) { module.exports = {"contract_name":"StandardMarket","abi":[{"constant":true,"inputs":[],"name":"creator","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"marketMaker","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"shortSell","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"close","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"sell","outputs":[{"name":"profit","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"withdrawFees","outputs":[{"name":"fees","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"createdAtBlock","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"netOutcomeTokensSold","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"outcomeTokenCost","type":"uint256"}],"name":"calcMarketFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"stage","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_funding","type":"uint256"}],"name":"fund","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"funding","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"eventContract","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"maxCost","type":"uint256"}],"name":"buy","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"FEE_RANGE","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"inputs":[{"name":"_creator","type":"address"},{"name":"_eventContract","type":"address"},{"name":"_marketMaker","type":"address"},{"name":"_fee","type":"uint24"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"funding","type":"uint256"}],"name":"MarketFunding","type":"event"},{"anonymous":false,"inputs":[],"name":"MarketClosing","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"fees","type":"uint256"}],"name":"FeeWithdrawal","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenCost","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenProfit","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenSale","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"cost","type":"uint256"}],"name":"OutcomeTokenShortSale","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064283} /***/ }), -/* 412 */ +/* 426 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"StandardMarketFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"}],"name":"createMarket","outputs":[{"name":"market","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"market","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"}],"name":"StandardMarketCreation","type":"event"}],"networks":{"3":{"address":"0x11b5257396f156027b9232da7220bd7447282db6","updated_at":1503605014192},"4":{"address":"0xeaa325bacae405fd5b45e9cf695d391f1c624a2f","updated_at":1503603856238},"42":{"address":"0x5acfa40d828f2d3a88b49ff4da31b868380ce414","updated_at":1503602339891},"437894314312":{"address":"0xe982e462b094850f12af94d21d470e21be9d0e9c","updated_at":1507361155411}},"schema_version":"0.0.5","updated_at":1513131293574} +module.exports = {"contract_name":"StandardMarketFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"}],"name":"createMarket","outputs":[{"name":"market","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"market","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"}],"name":"StandardMarketCreation","type":"event"}],"networks":{"3":{"address":"0x11b5257396f156027b9232da7220bd7447282db6","updated_at":1503605014192},"4":{"address":"0xeaa325bacae405fd5b45e9cf695d391f1c624a2f","updated_at":1503603856238},"42":{"address":"0x5acfa40d828f2d3a88b49ff4da31b868380ce414","updated_at":1503602339891},"437894314312":{"address":"0xe982e462b094850f12af94d21d470e21be9d0e9c","updated_at":1507361155411}},"schema_version":"0.0.5","updated_at":1513718811385} /***/ }), -/* 413 */ +/* 427 */ /***/ (function(module, exports) { module.exports = {"contract_name":"StandardMarketWithPriceLogger","abi":[{"constant":true,"inputs":[],"name":"creator","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"startDate","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"marketMaker","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"shortSell","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"close","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"minProfit","type":"uint256"}],"name":"sell","outputs":[{"name":"profit","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"withdrawFees","outputs":[{"name":"fees","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"LONG","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"createdAtBlock","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"lastTradeDate","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"priceIntegral","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"netOutcomeTokensSold","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"outcomeTokenCost","type":"uint256"}],"name":"calcMarketFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"stage","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"endDate","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_funding","type":"uint256"}],"name":"fund","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"funding","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"lastTradePrice","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"eventContract","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"getAvgPrice","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"outcomeTokenIndex","type":"uint8"},{"name":"outcomeTokenCount","type":"uint256"},{"name":"maxCost","type":"uint256"}],"name":"buy","outputs":[{"name":"cost","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"FEE_RANGE","outputs":[{"name":"","type":"uint24"}],"payable":false,"type":"function"},{"inputs":[{"name":"_creator","type":"address"},{"name":"_eventContract","type":"address"},{"name":"_marketMaker","type":"address"},{"name":"_fee","type":"uint24"},{"name":"_startDate","type":"uint256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"funding","type":"uint256"}],"name":"MarketFunding","type":"event"},{"anonymous":false,"inputs":[],"name":"MarketClosing","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"fees","type":"uint256"}],"name":"FeeWithdrawal","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenCost","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenPurchase","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"seller","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"outcomeTokenProfit","type":"uint256"},{"indexed":false,"name":"marketFees","type":"uint256"}],"name":"OutcomeTokenSale","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"buyer","type":"address"},{"indexed":false,"name":"outcomeTokenIndex","type":"uint8"},{"indexed":false,"name":"outcomeTokenCount","type":"uint256"},{"indexed":false,"name":"cost","type":"uint256"}],"name":"OutcomeTokenShortSale","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064284} /***/ }), -/* 414 */ +/* 428 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"StandardMarketWithPriceLoggerFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"startDate","type":"uint256"}],"name":"createMarket","outputs":[{"name":"market","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"market","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"startDate","type":"uint256"}],"name":"StandardMarketWithPriceLoggerCreation","type":"event"}],"networks":{"3":{"address":"0x800820aeb972cb886fdd89d340dbe7b3f4769401","updated_at":1503605014193},"4":{"address":"0xc2803221bf9cb3a245a19bb46727f6d797556dfc","updated_at":1503603856239},"42":{"address":"0xd5daa4b168352ea239cab95cf68a7d4002a6153d","updated_at":1503602339891},"437894314312":{"address":"0x9b1f7f645351af3631a656421ed2e40f2802e6c0","updated_at":1507361155412}},"schema_version":"0.0.5","updated_at":1513131293574} +module.exports = {"contract_name":"StandardMarketWithPriceLoggerFactory","abi":[{"constant":false,"inputs":[{"name":"eventContract","type":"address"},{"name":"marketMaker","type":"address"},{"name":"fee","type":"uint24"},{"name":"startDate","type":"uint256"}],"name":"createMarket","outputs":[{"name":"market","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"market","type":"address"},{"indexed":false,"name":"eventContract","type":"address"},{"indexed":false,"name":"marketMaker","type":"address"},{"indexed":false,"name":"fee","type":"uint24"},{"indexed":false,"name":"startDate","type":"uint256"}],"name":"StandardMarketWithPriceLoggerCreation","type":"event"}],"networks":{"3":{"address":"0x800820aeb972cb886fdd89d340dbe7b3f4769401","updated_at":1503605014193},"4":{"address":"0xc2803221bf9cb3a245a19bb46727f6d797556dfc","updated_at":1503603856239},"42":{"address":"0xd5daa4b168352ea239cab95cf68a7d4002a6153d","updated_at":1503602339891},"437894314312":{"address":"0x9b1f7f645351af3631a656421ed2e40f2802e6c0","updated_at":1507361155412}},"schema_version":"0.0.5","updated_at":1513718811386} /***/ }), -/* 415 */ +/* 429 */ /***/ (function(module, exports) { module.exports = {"contract_name":"StandardToken","abi":[{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064286} /***/ }), -/* 416 */ +/* 430 */ /***/ (function(module, exports) { module.exports = {"contract_name":"Token","abi":[{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064286} /***/ }), -/* 417 */ +/* 431 */ /***/ (function(module, exports) { module.exports = {"contract_name":"UltimateOracle","abi":[{"constant":true,"inputs":[],"name":"forwardedOracle","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"frontRunnerPeriod","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"frontRunner","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"isFrontRunnerPeriodOver","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"int256"}],"name":"totalOutcomeAmounts","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"withdraw","outputs":[{"name":"amount","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"forwardedOutcomeSetTimestamp","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"isChallengePeriodOver","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"setForwardedOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"frontRunnerSetTimestamp","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"forwardedOutcome","outputs":[{"name":"","type":"int256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"challengeAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"isChallenged","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_outcome","type":"int256"}],"name":"challengeOutcome","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"collateralToken","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"int256"}],"name":"outcomeAmounts","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"isOutcomeSet","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"spreadMultiplier","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"challengePeriod","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_outcome","type":"int256"},{"name":"amount","type":"uint256"}],"name":"voteForOutcome","outputs":[],"payable":false,"type":"function"},{"inputs":[{"name":"_forwardedOracle","type":"address"},{"name":"_collateralToken","type":"address"},{"name":"_spreadMultiplier","type":"uint8"},{"name":"_challengePeriod","type":"uint256"},{"name":"_challengeAmount","type":"uint256"},{"name":"_frontRunnerPeriod","type":"uint256"}],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"outcome","type":"int256"}],"name":"ForwardedOracleOutcomeAssignment","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"outcome","type":"int256"}],"name":"OutcomeChallenge","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"outcome","type":"int256"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"OutcomeVote","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"sender","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Withdrawal","type":"event"}],"networks":{},"schema_version":"0.0.5","updated_at":1508776064285} /***/ }), -/* 418 */ +/* 432 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"UltimateOracleFactory","abi":[{"constant":false,"inputs":[{"name":"oracle","type":"address"},{"name":"collateralToken","type":"address"},{"name":"spreadMultiplier","type":"uint8"},{"name":"challengePeriod","type":"uint256"},{"name":"challengeAmount","type":"uint256"},{"name":"frontRunnerPeriod","type":"uint256"}],"name":"createUltimateOracle","outputs":[{"name":"ultimateOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"ultimateOracle","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"spreadMultiplier","type":"uint8"},{"indexed":false,"name":"challengePeriod","type":"uint256"},{"indexed":false,"name":"challengeAmount","type":"uint256"},{"indexed":false,"name":"frontRunnerPeriod","type":"uint256"}],"name":"UltimateOracleCreation","type":"event"}],"networks":{"3":{"address":"0x47c70527aaa5e98ade8da8100aec805e6fda037b","updated_at":1503605014191},"4":{"address":"0xe81424ffc847919efc5f0156e3799edc60ebf715","updated_at":1503603856237},"42":{"address":"0x679ef161af4bb37b14a6d06d2e2a991d3650005c","updated_at":1503602339890},"437894314312":{"address":"0xd833215cbcc3f914bd1c9ece3ee7bf8b14f841bb","updated_at":1507361155410}},"schema_version":"0.0.5","updated_at":1513131293570} +module.exports = {"contract_name":"UltimateOracleFactory","abi":[{"constant":false,"inputs":[{"name":"oracle","type":"address"},{"name":"collateralToken","type":"address"},{"name":"spreadMultiplier","type":"uint8"},{"name":"challengePeriod","type":"uint256"},{"name":"challengeAmount","type":"uint256"},{"name":"frontRunnerPeriod","type":"uint256"}],"name":"createUltimateOracle","outputs":[{"name":"ultimateOracle","type":"address"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"creator","type":"address"},{"indexed":false,"name":"ultimateOracle","type":"address"},{"indexed":false,"name":"oracle","type":"address"},{"indexed":false,"name":"collateralToken","type":"address"},{"indexed":false,"name":"spreadMultiplier","type":"uint8"},{"indexed":false,"name":"challengePeriod","type":"uint256"},{"indexed":false,"name":"challengeAmount","type":"uint256"},{"indexed":false,"name":"frontRunnerPeriod","type":"uint256"}],"name":"UltimateOracleCreation","type":"event"}],"networks":{"3":{"address":"0x47c70527aaa5e98ade8da8100aec805e6fda037b","updated_at":1503605014191},"4":{"address":"0xe81424ffc847919efc5f0156e3799edc60ebf715","updated_at":1503603856237},"42":{"address":"0x679ef161af4bb37b14a6d06d2e2a991d3650005c","updated_at":1503602339890},"437894314312":{"address":"0xd833215cbcc3f914bd1c9ece3ee7bf8b14f841bb","updated_at":1507361155410}},"schema_version":"0.0.5","updated_at":1513718811383} /***/ }), -/* 419 */ +/* 433 */ /***/ (function(module, exports) { -module.exports = {"contract_name":"OlympiaToken","abi":[{"constant":true,"inputs":[],"name":"creator","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"recipients","type":"address[]"},{"name":"amount","type":"uint256"}],"name":"issue","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Issuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{"4":{"address":"0xa0c107db0e9194c18359d3265289239453b56cf2","updated_at":1513554550706}},"schema_version":"0.0.5","updated_at":1513573231641} +module.exports = {"contract_name":"OlympiaToken","abi":[{"constant":true,"inputs":[],"name":"creator","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"recipients","type":"address[]"},{"name":"amount","type":"uint256"}],"name":"issue","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"inputs":[],"payable":false,"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Issuance","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"}],"networks":{"4":{"address":"0xa0c107db0e9194c18359d3265289239453b56cf2","updated_at":1513554550706}},"schema_version":"0.0.5","updated_at":1513718813706} /***/ }) /******/ ]); diff --git a/docs/Gnosis.html b/docs/Gnosis.html index 63d1d7e..e54c98c 100644 --- a/docs/Gnosis.html +++ b/docs/Gnosis.html @@ -220,7 +220,7 @@

contractsSource:
@@ -294,7 +294,7 @@

default
Source:
@@ -368,7 +368,7 @@

etherToken<
Source:
@@ -442,7 +442,7 @@

lmsrMa
Source:
@@ -516,7 +516,7 @@

olympiaTo
Source:
@@ -590,7 +590,7 @@

Source:
@@ -1755,7 +1755,7 @@

(static) creat
Source:
@@ -2064,6 +2064,42 @@

Parameters:
+ + + + opts.logger + + + + + +function + + + + + + + + + <optional>
+ + + + + + + + + + + +

A callback for logging. Can also provide 'console' to use console.log.

+ + + + + @@ -2347,7 +2383,7 @@

buyOu
Source:
@@ -3267,7 +3303,7 @@

createMar
Source:
@@ -4155,7 +4191,7 @@

l
Source:
@@ -4606,7 +4642,7 @@

resolveEv
Source:
@@ -4779,7 +4815,7 @@

sell
Source:
@@ -5313,7 +5349,7 @@

setWeb
Source:
@@ -5468,7 +5504,7 @@

Parameters:

- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/events.js.html b/docs/events.js.html index 82276b4..e2ecd5b 100644 --- a/docs/events.js.html +++ b/docs/events.js.html @@ -99,7 +99,9 @@

events.js

* @alias Gnosis#publishEventDescription */ export async function publishEventDescription (description) { - return await this.ipfs.addJSONAsync(description) + const resultHash = await this.ipfs.addJSONAsync(description) + this.log(`published event description on IPFS at ${resultHash}`) + return resultHash } /** @@ -159,7 +161,7 @@

events.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/index.html b/docs/index.html index 17fbe8b..07883d0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -96,7 +96,7 @@

Gas estimations

Many of the methods on the gnosis API also have an as

- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/index.js.html b/docs/index.js.html index 4cb556f..c2ac786 100644 --- a/docs/index.js.html +++ b/docs/index.js.html @@ -111,6 +111,7 @@

index.js

* @param {string} [opts.ipfs.host='ipfs.infura.io'] - IPFS node address * @param {Number} [opts.ipfs.port=5001] - IPFS protocol port * @param {string} [opts.ipfs.protocol='https'] - IPFS protocol name + * @param {Function} [opts.logger] - A callback for logging. Can also provide 'console' to use `console.log`. * @returns {Gnosis} An instance of the gnosis.js API */ static async create (opts) { @@ -132,6 +133,10 @@

index.js

* @constructor */ constructor (opts) { + // Logger setup + const { logger } = opts + this.log = logger == null ? () => {} : logger === 'console' ? console.log : logger + // IPFS instantiation this.ipfs = utils.promisifyAll(new IPFS(opts.ipfs)) @@ -321,7 +326,7 @@

index.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/lmsr.js.html b/docs/lmsr.js.html index ad997b9..a10a781 100644 --- a/docs/lmsr.js.html +++ b/docs/lmsr.js.html @@ -229,7 +229,7 @@

lmsr.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/markets.js.html b/docs/markets.js.html index 80bae73..8ef2338 100644 --- a/docs/markets.js.html +++ b/docs/markets.js.html @@ -46,6 +46,8 @@

markets.js

normalizeWeb3Args, wrapWeb3Function, requireEventFromTXResult, + formatCallSignature, + TransactionError, } from './utils' /** @@ -73,6 +75,34 @@

markets.js

} })) +const pushDescribedTransaction = async (txInfo, log, opts) => { + const { caller, methodName, methodArgs } = opts + let txHash + try { + txHash = await caller[methodName].sendTransaction(...methodArgs) + log(`got tx hash ${txHash} for call ${ + formatCallSignature(opts) + }`) + txInfo.push(Object.assign({ txHash }, opts)) + } catch(subError) { + throw new TransactionError(Object.assign({ txHash, subError }, opts)) + } +} + +const syncDescribedTransactions = async (txInfo, log) => + (await Promise.all( + txInfo.map(opts => opts.caller.constructor + .syncTransaction(opts.txHash) + .then(res => { + log(`tx ${opts.txHash} synced`) + return res + }) + .catch(err => + new TransactionError(Object.assign({ subError: err }, opts)) + ) + ) + )).map((res, i) => requireEventFromTXResult(res, txInfo[i].requiredEventName)) + /** * Buys outcome tokens. If you have ether and plan on transacting with a market on an event which * uses EtherToken as collateral, be sure to convert the ether into EtherToken by sending ether to @@ -137,28 +167,30 @@

markets.js

const marketAllowance = await collateralToken.allowance(buyer, marketAddress, opts) if(marketAllowance.lt(cost)) { - txInfo.push({ - tx: await collateralToken.approve.sendTransaction(marketAddress, approvalResetAmount, approveTxOpts), - contract: this.contracts.Token, + await pushDescribedTransaction(txInfo, this.log, { + caller: collateralToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalResetAmount, approveTxOpts], requiredEventName: 'Approval', }) } } else if(this.web3.toBigNumber(0).lt(approvalAmount)) { - txInfo.push({ - tx: await collateralToken.approve.sendTransaction(marketAddress, approvalAmount, approveTxOpts), - contract: this.contracts.Token, + await pushDescribedTransaction(txInfo, this.log, { + caller: collateralToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalAmount, approveTxOpts], requiredEventName: 'Approval', }) } - txInfo.push({ - tx: await market.buy.sendTransaction(outcomeTokenIndex, outcomeTokenCount, cost, buyTxOpts), - contract: this.contracts.Market, + await pushDescribedTransaction(txInfo, this.log, { + caller: market, + methodName: 'buy', + methodArgs: [outcomeTokenIndex, outcomeTokenCount, cost, buyTxOpts], requiredEventName: 'OutcomeTokenPurchase', }) - const txRequiredEvents = (await Promise.all(txInfo.map(({ tx, contract }, i) => contract.syncTransaction(tx)))) - .map((res, i) => requireEventFromTXResult(res, txInfo[i].requiredEventName)) + const txRequiredEvents = await syncDescribedTransactions(txInfo, this.log) const purchaseEvent = txRequiredEvents[txRequiredEvents.length - 1] return purchaseEvent.args.outcomeTokenCost.plus(purchaseEvent.args.marketFees) @@ -236,28 +268,30 @@

markets.js

const marketAllowance = await outcomeToken.allowance(seller, marketAddress, opts) if(marketAllowance.lt(outcomeTokenCount)) { - txInfo.push({ - tx: await outcomeToken.approve.sendTransaction(marketAddress, approvalResetAmount, approveTxOpts), - contract: this.contracts.Token, + await pushDescribedTransaction(txInfo, this.log, { + caller: outcomeToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalResetAmount, approveTxOpts], requiredEventName: 'Approval', }) } } else if(this.web3.toBigNumber(0).lt(approvalAmount)) { - txInfo.push({ - tx: await outcomeToken.approve.sendTransaction(marketAddress, approvalAmount, approveTxOpts), - contract: this.contracts.Token, + await pushDescribedTransaction(txInfo, this.log, { + caller: outcomeToken, + methodName: 'approve', + methodArgs: [marketAddress, approvalAmount, approveTxOpts], requiredEventName: 'Approval', }) } - txInfo.push({ - tx: await market.sell.sendTransaction(outcomeTokenIndex, outcomeTokenCount, minProfit, sellTxOpts), - contract: this.contracts.Market, + await pushDescribedTransaction(txInfo, this.log, { + caller: market, + methodName: 'sell', + methodArgs: [outcomeTokenIndex, outcomeTokenCount, minProfit, sellTxOpts], requiredEventName: 'OutcomeTokenSale', }) - const txRequiredEvents = (await Promise.all(txInfo.map(({ tx, contract }, i) => contract.syncTransaction(tx)))) - .map((res, i) => requireEventFromTXResult(res, txInfo[i].requiredEventName)) + const txRequiredEvents = await syncDescribedTransactions(txInfo, this.log) const saleEvent = txRequiredEvents[txRequiredEvents.length - 1] return saleEvent.args.outcomeTokenProfit.minus(saleEvent.args.marketFees) @@ -282,7 +316,7 @@

markets.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/oracles.js.html b/docs/oracles.js.html index 6437558..d94a5c5 100644 --- a/docs/oracles.js.html +++ b/docs/oracles.js.html @@ -106,7 +106,7 @@

oracles.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/tutorial-api-overview.html b/docs/tutorial-api-overview.html index a630c94..8bb84fb 100644 --- a/docs/tutorial-api-overview.html +++ b/docs/tutorial-api-overview.html @@ -69,7 +69,7 @@

API Overview


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/tutorial-developer-guide.html b/docs/tutorial-developer-guide.html index 1518f73..0784667 100644 --- a/docs/tutorial-developer-guide.html +++ b/docs/tutorial-developer-guide.html @@ -61,7 +61,7 @@

Developer Guide


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/tutorial-events-oracles-and-markets.html b/docs/tutorial-events-oracles-and-markets.html index bdb020e..cf8d408 100644 --- a/docs/tutorial-events-oracles-and-markets.html +++ b/docs/tutorial-events-oracles-and-markets.html @@ -175,7 +175,7 @@

Events and Collateral

Once an oracle is created, an event contract ma

- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/tutorial-installation.html b/docs/tutorial-installation.html index 922664d..238827f 100644 --- a/docs/tutorial-installation.html +++ b/docs/tutorial-installation.html @@ -80,7 +80,7 @@

MetaMask

MetaMask is a Chrome brow

- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/docs/tutorial-lmsr-primer.html b/docs/tutorial-lmsr-primer.html index 37516e7..a6a5980 100644 --- a/docs/tutorial-lmsr-primer.html +++ b/docs/tutorial-lmsr-primer.html @@ -81,7 +81,7 @@

LMSR Calculation Functions

The functions

diff --git a/docs/utils.js.html b/docs/utils.js.html index 330a92b..c06f360 100644 --- a/docs/utils.js.html +++ b/docs/utils.js.html @@ -260,10 +260,10 @@

utils.js

const wrappedFn = async function() { const opts = getOptsFromArgs(arguments) const speccedOpts = spec(this, opts) + const callMetadata = getWeb3CallMetadata(arguments, opts, speccedOpts) + callMetadata.log = this.log - return await sendTransactionAndGetResult( - getWeb3CallMetadata(arguments, opts, speccedOpts) - ) + return await sendTransactionAndGetResult(callMetadata) } wrappedFn.estimateGas = async function() { @@ -312,21 +312,61 @@

utils.js

return matchingLogs[0] } +export function formatCallSignature(opts) { + return `${ + opts.caller.constructor.contractName + }(${opts.caller.address.slice(0, 6)}..${opts.caller.address.slice(-4)}).${opts.methodName}(${ + opts.methodArgs.map(v => JSON.stringify(v)).join(', ') + })` +} + +export class TransactionError extends Error { + constructor(opts) { + super(`${formatCallSignature(opts)}${opts.txHash == null ? '' : ` + + with transaction hash ${opts.txHash}`} + + failed with ${opts.subError}`) + + Object.assign(this, opts) + + this.name = 'TransactionError' + } +} + export async function sendTransactionAndGetResult (opts) { opts = opts || {} + let caller, txHash, txResult, matchingLog - let caller = opts.callerContract - if (_.has(caller, 'deployed')) { - caller = await caller.deployed() - } + try { + caller = opts.callerContract + if (_.has(caller, 'deployed')) { + caller = await caller.deployed() + } + + txHash = await caller[opts.methodName].sendTransaction(...opts.methodArgs) + + if(opts.log != null) { + opts.log(`got tx hash ${txHash} for call ${ + formatCallSignature({ caller, methodName: opts.methodName, methodArgs: opts.methodArgs }) + }`) + } - let result = await caller[opts.methodName](...opts.methodArgs) - let matchingLog = requireEventFromTXResult(result, opts.eventName) + txResult = await caller.constructor.syncTransaction(txHash) + matchingLog = requireEventFromTXResult(txResult, opts.eventName) - if(opts.resultContract == null) - return matchingLog.args[opts.eventArgName] - else - return await opts.resultContract.at(matchingLog.args[opts.eventArgName]) + if(opts.resultContract == null) { + return matchingLog.args[opts.eventArgName] + } else { + opts.log(`tx hash ${txHash.slice(0, 6)}..${txHash.slice(-4)} returned ${opts.resultContract.contractName}(${matchingLog.args[opts.eventArgName]})`) + return await opts.resultContract.at(matchingLog.args[opts.eventArgName]) + } + } catch(err) { + throw new TransactionError(Object.assign({ + caller, txHash, txResult, matchingLog, + subError: err, + }, opts)) + } } // I know bluebird does this, but it's heavy @@ -370,7 +410,7 @@

utils.js


- Generated by JSDoc 3.5.5 on Sun Dec 17 2017 23:32:58 GMT-0600 (CST) using the Minami theme. + Generated by JSDoc 3.5.5 on Tue Dec 19 2017 15:29:49 GMT-0600 (CST) using the Minami theme.
diff --git a/package-lock.json b/package-lock.json index 2fbe513..2cb1e75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@gnosis.pm/gnosisjs", - "version": "0.7.0-rc4", + "version": "0.7.0-rc5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index caac533..dfbbcc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gnosis.pm/gnosisjs", - "version": "0.7.0-rc4", + "version": "0.7.0-rc5", "description": "A javascript library for building applications on top of Gnosis, the Ethereum prediction market platform", "scripts": { "lint": "eslint ./",