diff --git a/.surgeignore b/.surgeignore
new file mode 100644
index 000000000..4d09eb202
--- /dev/null
+++ b/.surgeignore
@@ -0,0 +1,11 @@
+.git
+.DS_Store
+node_modules
+.node*
+storage_*
+report*
+.project
+.pydevproject
+.vscode
+*.ai
+*.psd
diff --git a/DONATIONS.txt b/DONATIONS.txt
new file mode 100644
index 000000000..fd748bd93
--- /dev/null
+++ b/DONATIONS.txt
@@ -0,0 +1,2 @@
+Support continued operation of ForkDelta:
+0x4489F77FB33E194995142a872EcD85CbD6F0f193
diff --git a/README.md b/README.md
index 08f507e12..083b2e24f 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,11 @@ ForkDelta currently interfaces with EtherDelta's original smart contract (descri
# What is the Roadmap for ForkDelta?
-The ForkDelta Roadmap is maintained at https://forkdelta.github.io/about/
+The ForkDelta Roadmap is maintained at https://forkdelta.app/about/
# Contribute
We welcome contributions from the community. You can contribute by improving the code, documentation, or by donating.
-ForkDelta currently interfaces with EtherDelta's original smart contract which allows ForkDelta users to trade utilizing EtherDelta's volume. However, this means that the trading fees still go to EtherDelta and ForkDelta development costs come entirely out of our pockets. If you are interested in the ForkDelta project and would like to contribute to its future, please consider donating to the following Ethereum address: 0x3a2aEdc3B54A99e429ae36637681d4560cE5C05b
+ForkDelta currently interfaces with EtherDelta's original smart contract which allows ForkDelta users to trade utilizing EtherDelta's volume. However, this means that the trading fees still go to EtherDelta and ForkDelta development costs come entirely out of our pockets. If you are interested in the ForkDelta project and would like to contribute to its future, please consider donating to the following Ethereum address: 0x4489F77FB33E194995142a872EcD85CbD6F0f193
As this is a project by the community, for the community, transactions to and from the donations address will be public and can be viewed on the blockchain. We will also keep a public ledger of how the donations are distributed. That way, donors can see exactly how their donations are helping!
diff --git a/about/index.html b/about/index.html
index 1cba2d4bb..a2f055aea 100644
--- a/about/index.html
+++ b/about/index.html
@@ -4,10 +4,10 @@
About ForkDelta | Roadmap, FAQs, and more!
-
+
-
+
-
+
+
+
'),
- (a = a.removeChild(a.firstChild)))
- : (a =
- 'string' == typeof b.is
- ? c.createElement(a, { is: b.is })
- : c.createElement(a))
+ ? ((a = c.createElement('div')),
+ (a.innerHTML = ''),
+ (a = a.removeChild(a.firstChild)))
+ : (a =
+ 'string' == typeof b.is
+ ? c.createElement(a, { is: b.is })
+ : c.createElement(a))
: (a = c.createElementNS(d, a)),
a
);
@@ -78304,18 +78549,18 @@
'style' === h
? bc.setValueForStyles(a, k)
: 'dangerouslySetInnerHTML' === h
- ? null != (k = k ? k.__html : void 0) && Fc(a, k)
- : 'children' === h
- ? 'string' == typeof k
- ? Jc(a, k)
- : 'number' == typeof k && Jc(a, '' + k)
- : 'suppressContentEditableWarning' !== h &&
- (Oc.hasOwnProperty(h)
- ? null != k && Rc(d, h)
- : e
- ? hc.setValueForAttribute(a, h, k)
- : null != k &&
- hc.setValueForProperty(a, h, k));
+ ? null != (k = k ? k.__html : void 0) && Fc(a, k)
+ : 'children' === h
+ ? 'string' == typeof k
+ ? Jc(a, k)
+ : 'number' == typeof k && Jc(a, '' + k)
+ : 'suppressContentEditableWarning' !== h &&
+ (Oc.hasOwnProperty(h)
+ ? null != k && Rc(d, h)
+ : e
+ ? hc.setValueForAttribute(a, h, k)
+ : null != k &&
+ hc.setValueForProperty(a, h, k));
}
switch (b) {
case 'input':
@@ -78402,15 +78647,15 @@
b !== k &&
(f = f || []).push(g, '' + k))
: 'children' === g
- ? b === k ||
- ('string' != typeof k &&
- 'number' != typeof k) ||
- (f = f || []).push(g, '' + k)
- : 'suppressContentEditableWarning' !== g &&
- (Oc.hasOwnProperty(g)
- ? (null != k && Rc(e, g),
- f || b === k || (f = []))
- : (f = f || []).push(g, k));
+ ? b === k ||
+ ('string' != typeof k &&
+ 'number' != typeof k) ||
+ (f = f || []).push(g, '' + k)
+ : 'suppressContentEditableWarning' !== g &&
+ (Oc.hasOwnProperty(g)
+ ? (null != k && Rc(e, g),
+ f || b === k || (f = []))
+ : (f = f || []).push(g, k));
}
return a && (f = f || []).push('style', a), f;
},
@@ -78422,16 +78667,16 @@
'style' === g
? bc.setValueForStyles(a, h)
: 'dangerouslySetInnerHTML' === g
- ? Fc(a, h)
- : 'children' === g
- ? Jc(a, h)
- : d
- ? null != h
- ? hc.setValueForAttribute(a, g, h)
- : hc.deleteValueForAttribute(a, g)
- : null != h
- ? hc.setValueForProperty(a, g, h)
- : hc.deleteValueForProperty(a, g);
+ ? Fc(a, h)
+ : 'children' === g
+ ? Jc(a, h)
+ : d
+ ? null != h
+ ? hc.setValueForAttribute(a, g, h)
+ : hc.deleteValueForAttribute(a, g)
+ : null != h
+ ? hc.setValueForProperty(a, g, h)
+ : hc.deleteValueForProperty(a, g);
}
switch (c) {
case 'input':
@@ -78494,10 +78739,10 @@
((f = c[g]),
'children' === g
? 'string' == typeof f
- ? a.textContent !== f && (d = ['children', f])
- : 'number' == typeof f &&
- a.textContent !== '' + f &&
- (d = ['children', '' + f])
+ ? a.textContent !== f && (d = ['children', f])
+ : 'number' == typeof f &&
+ a.textContent !== '' + f &&
+ (d = ['children', '' + f])
: Oc.hasOwnProperty(g) && null != f && Rc(e, g));
switch (b) {
case 'input':
@@ -78656,7 +78901,9 @@
var b = a.updateQueue;
return null === b || (a.tag !== jd && a.tag !== kd)
? gd
- : null !== b.first ? b.first.priorityLevel : gd;
+ : null !== b.first
+ ? b.first.priorityLevel
+ : gd;
},
addTopLevelUpdate: function(a, b, c, d) {
var e = null === b.element;
@@ -79610,10 +79857,10 @@
return a.view
? a.view
: (a = ub(a)).window === a
- ? a
- : (a = a.ownerDocument)
- ? a.defaultView || a.parentWindow
- : window;
+ ? a
+ : (a = a.ownerDocument)
+ ? a.defaultView || a.parentWindow
+ : window;
},
detail: function(a) {
return a.detail || 0;
@@ -79668,8 +79915,8 @@
d.window === d
? d
: (e = d.ownerDocument)
- ? e.defaultView || e.parentWindow
- : window;
+ ? e.defaultView || e.parentWindow
+ : window;
if (
('topMouseOut' === a
? ((a = b),
@@ -79723,7 +79970,9 @@
var e =
d.window === d
? d.document
- : d.nodeType === Qi ? d : d.ownerDocument;
+ : d.nodeType === Qi
+ ? d
+ : d.ownerDocument;
if (!e || !bj('onSelect', e)) return null;
switch (((e = b ? G.getNodeFromInstance(b) : window), a)) {
case 'topFocus':
@@ -79820,10 +80069,12 @@
if ('Unidentified' !== b) return b;
}
return 'keypress' === a.type
- ? 13 === (a = hj(a)) ? 'Enter' : String.fromCharCode(a)
+ ? 13 === (a = hj(a))
+ ? 'Enter'
+ : String.fromCharCode(a)
: 'keydown' === a.type || 'keyup' === a.type
- ? jj[a.keyCode] || 'Unidentified'
- : '';
+ ? jj[a.keyCode] || 'Unidentified'
+ : '';
},
location: null,
ctrlKey: null,
@@ -79842,7 +80093,9 @@
which: function(a) {
return 'keypress' === a.type
? hj(a)
- : 'keydown' === a.type || 'keyup' === a.type ? a.keyCode : 0;
+ : 'keydown' === a.type || 'keyup' === a.type
+ ? a.keyCode
+ : 0;
},
}),
Ni.augmentClass(lj, { dataTransfer: null }),
@@ -79865,14 +80118,18 @@
deltaX: function(a) {
return 'deltaX' in a
? a.deltaX
- : 'wheelDeltaX' in a ? -a.wheelDeltaX : 0;
+ : 'wheelDeltaX' in a
+ ? -a.wheelDeltaX
+ : 0;
},
deltaY: function(a) {
return 'deltaY' in a
? a.deltaY
: 'wheelDeltaY' in a
- ? -a.wheelDeltaY
- : 'wheelDelta' in a ? -a.wheelDelta : 0;
+ ? -a.wheelDeltaY
+ : 'wheelDelta' in a
+ ? -a.wheelDelta
+ : 0;
},
deltaZ: null,
deltaMode: null,
@@ -80540,13 +80797,13 @@
debug('componentDidUpdate'),
this.props.loadCharts
? _GoogleChartLoader2.default.isLoading
- ? _GoogleChartLoader2.default.initPromise.then(
- function() {
- _this3.drawChart();
- }
- )
- : _GoogleChartLoader2.default.isLoaded &&
- this.drawChart()
+ ? _GoogleChartLoader2.default.initPromise.then(
+ function() {
+ _this3.drawChart();
+ }
+ )
+ : _GoogleChartLoader2.default.isLoaded &&
+ this.drawChart()
: this.drawChart();
}),
(Chart.prototype.componentWillUnmount = function() {
@@ -80868,16 +81125,16 @@
0 === i
? this.addSourceColumnTo(columns, i)
: i === column
- ? this.isHidden(i)
- ? (this.addSourceColumnTo(columns, i),
- this.restoreColorTo(colors, i))
- : (this.addEmptyColumnTo(columns, i),
- this.hideColumn(colors, i))
- : this.isHidden(i)
- ? (this.addEmptyColumnTo(columns, i),
- this.hideColumn(colors, i))
- : (this.addSourceColumnTo(columns, i),
- this.restoreColorTo(colors, i));
+ ? this.isHidden(i)
+ ? (this.addSourceColumnTo(columns, i),
+ this.restoreColorTo(colors, i))
+ : (this.addEmptyColumnTo(columns, i),
+ this.hideColumn(colors, i))
+ : this.isHidden(i)
+ ? (this.addEmptyColumnTo(columns, i),
+ this.hideColumn(colors, i))
+ : (this.addSourceColumnTo(columns, i),
+ this.restoreColorTo(colors, i));
view.setColumns(columns),
(this.props.options.colors = colors),
this.chart.draw(view, this.props.options);
@@ -81467,17 +81724,19 @@
':' +
source.lineNumber +
')'
- : ownerName ? ' (created by ' + ownerName + ')' : '')
+ : ownerName
+ ? ' (created by ' + ownerName + ')'
+ : '')
);
}
function getDisplayName(element) {
return null == element
? '#empty'
: 'string' == typeof element || 'number' == typeof element
- ? '#text'
- : 'string' == typeof element.type
- ? element.type
- : element.type.displayName || element.type.name || 'Unknown';
+ ? '#text'
+ : 'string' == typeof element.type
+ ? element.type
+ : element.type.displayName || element.type.name || 'Unknown';
}
function describeID(id) {
var ownerName,
@@ -81686,7 +81945,9 @@
var element = ReactComponentTreeHook.getElement(id);
return 'string' == typeof element
? element
- : 'number' == typeof element ? '' + element : null;
+ : 'number' == typeof element
+ ? '' + element
+ : null;
},
getUpdateCount: function(id) {
var item = getItem(id);
@@ -84138,12 +84399,12 @@
return arg;
}
: 1 === funcs.length
- ? funcs[0]
- : funcs.reduce(function(a, b) {
- return function() {
- return a(b.apply(void 0, arguments));
- };
- });
+ ? funcs[0]
+ : funcs.reduce(function(a, b) {
+ return function() {
+ return a(b.apply(void 0, arguments));
+ };
+ });
});
},
{},
@@ -84329,8 +84590,8 @@
'object' == typeof options
? extend(params, options, { uri: uri })
: 'string' == typeof uri
- ? extend(params, { uri: uri })
- : extend(params, uri),
+ ? extend(params, { uri: uri })
+ : extend(params, uri),
(params.callback = callback || params.callback),
params
);
@@ -84638,16 +84899,16 @@
return '*' === noProxy
? null
: '' !== noProxy && uriInNoProxy(uri, noProxy)
- ? null
- : 'http:' === uri.protocol
- ? process.env.HTTP_PROXY || process.env.http_proxy || null
- : 'https:' === uri.protocol
- ? process.env.HTTPS_PROXY ||
- process.env.https_proxy ||
- process.env.HTTP_PROXY ||
- process.env.http_proxy ||
- null
- : null;
+ ? null
+ : 'http:' === uri.protocol
+ ? process.env.HTTP_PROXY || process.env.http_proxy || null
+ : 'https:' === uri.protocol
+ ? process.env.HTTPS_PROXY ||
+ process.env.https_proxy ||
+ process.env.HTTP_PROXY ||
+ process.env.http_proxy ||
+ null
+ : null;
};
}.call(this, require('_process')));
},
@@ -84769,30 +85030,35 @@
test('application/x-www-form-urlencoded')
? (options.form = req.postData.paramsObj)
: test('application/json')
- ? req.postData.jsonObj &&
- ((options.body = req.postData.jsonObj), (options.json = !0))
- : test('multipart/form-data')
- ? ((options.formData = {}),
- req.postData.params.forEach(function(param) {
- var attachment = {};
- param.fileName || param.fileName || param.contentType
- ? (param.fileName && !param.value
- ? (attachment.value = fs.createReadStream(
- param.fileName
- ))
- : param.value &&
- (attachment.value = param.value),
- param.fileName &&
- (attachment.options = {
- filename: param.fileName,
- contentType: param.contentType
- ? param.contentType
- : null,
- }),
- (options.formData[param.name] = attachment))
- : (options.formData[param.name] = param.value);
- }))
- : req.postData.text && (options.body = req.postData.text),
+ ? req.postData.jsonObj &&
+ ((options.body = req.postData.jsonObj),
+ (options.json = !0))
+ : test('multipart/form-data')
+ ? ((options.formData = {}),
+ req.postData.params.forEach(function(param) {
+ var attachment = {};
+ param.fileName ||
+ param.fileName ||
+ param.contentType
+ ? (param.fileName && !param.value
+ ? (attachment.value = fs.createReadStream(
+ param.fileName
+ ))
+ : param.value &&
+ (attachment.value = param.value),
+ param.fileName &&
+ (attachment.options = {
+ filename: param.fileName,
+ contentType: param.contentType
+ ? param.contentType
+ : null,
+ }),
+ (options.formData[param.name] = attachment))
+ : (options.formData[param.name] =
+ param.value);
+ }))
+ : req.postData.text &&
+ (options.body = req.postData.text),
options
);
}),
@@ -84908,11 +85174,14 @@
var header = self.request.getHeader('content-type');
header && -1 !== header.indexOf('multipart')
? -1 !== header.indexOf('boundary')
- ? (self.boundary = header.replace(/.*boundary=([^\s;]+).*/, '$1'))
- : self.request.setHeader(
- 'content-type',
- header + '; boundary=' + self.boundary
- )
+ ? (self.boundary = header.replace(
+ /.*boundary=([^\s;]+).*/,
+ '$1'
+ ))
+ : self.request.setHeader(
+ 'content-type',
+ header + '; boundary=' + self.boundary
+ )
: self.request.setHeader(
'content-type',
'multipart/related; boundary=' + self.boundary
@@ -85537,10 +85806,10 @@
'string' == typeof self.body
? Buffer.byteLength(self.body)
: Array.isArray(self.body)
- ? self.body.reduce(function(a, b) {
- return a + b.length;
- }, 0)
- : self.body.length)
+ ? self.body.reduce(function(a, b) {
+ return a + b.length;
+ }, 0)
+ : self.body.length)
? self.setHeader('content-length', length)
: self.emit(
'error',
@@ -85607,10 +85876,10 @@
baseUrlEndsWithSlash && uriStartsWithSlash
? (self.uri = self.baseUrl + self.uri.slice(1))
: baseUrlEndsWithSlash || uriStartsWithSlash
- ? (self.uri = self.baseUrl + self.uri)
- : '' === self.uri
- ? (self.uri = self.baseUrl)
- : (self.uri = self.baseUrl + '/' + self.uri),
+ ? (self.uri = self.baseUrl + self.uri)
+ : '' === self.uri
+ ? (self.uri = self.baseUrl)
+ : (self.uri = self.baseUrl + '/' + self.uri),
delete self.baseUrl;
}
if (!self.uri)
@@ -86206,16 +86475,16 @@
)),
response.pipe(responseContent))
: 'deflate' === contentEncoding
- ? ((responseContent = zlib.createInflate(
- zlibOptions
- )),
- response.pipe(responseContent))
- : ('identity' !== contentEncoding &&
- debug(
- 'ignoring unrecognized Content-Encoding ' +
- contentEncoding
- ),
- (responseContent = response));
+ ? ((responseContent = zlib.createInflate(
+ zlibOptions
+ )),
+ response.pipe(responseContent))
+ : ('identity' !== contentEncoding &&
+ debug(
+ 'ignoring unrecognized Content-Encoding ' +
+ contentEncoding
+ ),
+ (responseContent = response));
} else responseContent = response;
self.encoding &&
(0 !== self.dests.length
@@ -86223,10 +86492,10 @@
'Ignoring encoding parameter as this stream is being piped to another stream which makes the encoding option invalid.'
)
: responseContent.setEncoding
- ? responseContent.setEncoding(self.encoding)
- : (responseContent = responseContent.pipe(
- stringstream(self.encoding)
- ))),
+ ? responseContent.setEncoding(self.encoding)
+ : (responseContent = responseContent.pipe(
+ stringstream(self.encoding)
+ ))),
self._paused && responseContent.pause(),
(self.responseContent = responseContent),
self.emit('response', response),
@@ -86514,10 +86783,10 @@
opts.bucket && path
? (auth.resource = '/' + opts.bucket + path)
: opts.bucket && !path
- ? (auth.resource = '/' + opts.bucket)
- : !opts.bucket && path
- ? (auth.resource = path)
- : opts.bucket || path || (auth.resource = '/'),
+ ? (auth.resource = '/' + opts.bucket)
+ : !opts.bucket && path
+ ? (auth.resource = path)
+ : opts.bucket || path || (auth.resource = '/'),
(auth.resource = aws2.canonicalizeResource(auth.resource)),
self.setHeader('authorization', aws2.authorization(auth));
}
@@ -87864,7 +88133,9 @@
function stripHexPrefix(str) {
return 'string' != typeof str
? str
- : isHexPrefixed(str) ? str.slice(2) : str;
+ : isHexPrefixed(str)
+ ? str.slice(2)
+ : str;
}
function intToHex(i) {
var hex = i.toString(16);
@@ -88893,29 +89164,29 @@
(m = /^([-\w:]+)[^\'\"]*/.exec(next))
? m[0].length === next.length &&
'>' === parts[pos + 1]
- ? ((pos += 2),
- (tagName = m[1].toLowerCase()),
- h.endTag &&
- h.endTag(
- tagName,
- param,
- continuationMarker,
- continuationMaker(
- h,
- parts,
- pos,
- state,
- param
- )
- ))
- : (pos = parseEndTag(
- parts,
- pos,
- h,
- param,
- continuationMarker,
- state
- ))
+ ? ((pos += 2),
+ (tagName = m[1].toLowerCase()),
+ h.endTag &&
+ h.endTag(
+ tagName,
+ param,
+ continuationMarker,
+ continuationMaker(
+ h,
+ parts,
+ pos,
+ state,
+ param
+ )
+ ))
+ : (pos = parseEndTag(
+ parts,
+ pos,
+ h,
+ param,
+ continuationMarker,
+ state
+ ))
: h.pcdata &&
h.pcdata(
'</',
@@ -91223,13 +91494,13 @@
var ch =
Math.min(
data.length,
- f + this._blockSize - s % this._blockSize
+ f + this._blockSize - (s % this._blockSize)
) - f,
i = 0;
i < ch;
i++
)
- buffer[s % this._blockSize + i] = data[i + f];
+ buffer[(s % this._blockSize) + i] = data[i + f];
(f += ch), (s += ch) % this._blockSize == 0 && this._update(buffer);
}
return (this._s = s), this;
@@ -91237,7 +91508,7 @@
(Hash.prototype.digest = function(enc) {
var l = 8 * this._len;
(this._block[this._len % this._blockSize] = 128),
- this._block.fill(0, this._len % this._blockSize + 1),
+ this._block.fill(0, (this._len % this._blockSize) + 1),
l % (8 * this._blockSize) >= 8 * this._finalSize &&
(this._update(this._block), this._block.fill(0)),
this._block.writeInt32BE(l, this._blockSize - 4);
@@ -91293,7 +91564,9 @@
function ft(s, b, c, d) {
return 0 === s
? (b & c) | (~b & d)
- : 2 === s ? (b & c) | (b & d) | (c & d) : b ^ c ^ d;
+ : 2 === s
+ ? (b & c) | (b & d) | (c & d)
+ : b ^ c ^ d;
}
var inherits = require('inherits'),
Hash = require('./hash'),
@@ -91370,7 +91643,9 @@
function ft(s, b, c, d) {
return 0 === s
? (b & c) | (~b & d)
- : 2 === s ? (b & c) | (b & d) | (c & d) : b ^ c ^ d;
+ : 2 === s
+ ? (b & c) | (b & d) | (c & d)
+ : b ^ c ^ d;
}
var inherits = require('inherits'),
Hash = require('./hash'),
@@ -92675,8 +92950,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ debug: 414, parseuri: 311 },
@@ -92793,8 +93070,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ './is-buffer': 419, isarray: 422 },
@@ -92979,8 +93258,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -93748,18 +94029,18 @@
? (this._dh.setPrivateKey(pk.part.x.data),
this._dh.setPublicKey(pk.part.y.data))
: 'ecdsa' === pk.type
- ? CRYPTO_HAVE_ECDH
- ? (this._dh.setPrivateKey(pk.part.d.data),
- this._dh.setPublicKey(pk.part.Q.data))
- : (this._priv = new ECPrivate(
- this._ecParams,
- pk.part.d.data
- ))
- : 'curve25519' === pk.type &&
- ((this._priv = pk.part.r.data),
- 0 === this._priv[0] &&
- (this._priv = this._priv.slice(1)),
- (this._priv = this._priv.slice(0, 32))),
+ ? CRYPTO_HAVE_ECDH
+ ? (this._dh.setPrivateKey(pk.part.d.data),
+ this._dh.setPublicKey(pk.part.Q.data))
+ : (this._priv = new ECPrivate(
+ this._ecParams,
+ pk.part.d.data
+ ))
+ : 'curve25519' === pk.type &&
+ ((this._priv = pk.part.r.data),
+ 0 === this._priv[0] &&
+ (this._priv = this._priv.slice(1)),
+ (this._priv = this._priv.slice(0, 32))),
(this._key = pk),
(this._isPriv = !0);
}),
@@ -94135,10 +94416,12 @@
FingerprintFormatError = errs.FingerprintFormatError,
InvalidAlgorithmError = errs.InvalidAlgorithmError;
(Fingerprint.prototype.toString = function(format) {
- switch ((void 0 === format &&
- (format = 'md5' === this.algorithm ? 'hex' : 'base64'),
- assert.string(format),
- format)) {
+ switch (
+ (void 0 === format &&
+ (format = 'md5' === this.algorithm ? 'hex' : 'base64'),
+ assert.string(format),
+ format)
+ ) {
case 'hex':
return addColons(this.hash.toString('hex'));
case 'base64':
@@ -95982,9 +96265,10 @@
sig = cert.signatures.x509;
sig.extras.exts = [];
var critical;
- switch ((der.peek() === asn1.Ber.Boolean &&
- (critical = der.readBoolean()),
- extId)) {
+ switch (
+ (der.peek() === asn1.Ber.Boolean && (critical = der.readBoolean()),
+ extId)
+ ) {
case EXTS.basicConstraints:
der.readSequence(asn1.Ber.OctetString), der.readSequence();
var bcEnd = der.offset + der.length,
@@ -96195,13 +96479,13 @@
ALTNAME.DNSName
)
: 'email' === altNames[j].type
- ? der.writeString(
- altNames[j].email,
- ALTNAME.RFC822Name
- )
- : (der.startSequence(ALTNAME.DirectoryName),
- altNames[j].toAsn1(der),
- der.endSequence());
+ ? der.writeString(
+ altNames[j].email,
+ ALTNAME.RFC822Name
+ )
+ : (der.startSequence(ALTNAME.DirectoryName),
+ altNames[j].toAsn1(der),
+ der.endSequence());
der.endSequence(), der.endSequence();
} else if (exts[i].oid === EXTS.basicConstraints) {
der.startSequence(asn1.Ber.OctetString),
@@ -96252,7 +96536,7 @@
i < bitLen;
++i
) {
- var mask = 1 << (7 - i % 8),
+ var mask = 1 << (7 - (i % 8)),
bitVal = 0 != (bits[1 + Math.floor(i / 8)] & mask),
name = bitIndex[i];
bitVal && 'string' == typeof name && (setBits[name] = !0);
@@ -96267,7 +96551,7 @@
bits.fill(0), (bits[0] = unused);
for (var i = 0; i < bitLen; ++i) {
var byteN = 1 + Math.floor(i / 8),
- mask = 1 << (7 - i % 8),
+ mask = 1 << (7 - (i % 8)),
name = bitIndex[i];
void 0 !== name &&
(-1 !== setBits.indexOf(name) && (bits[byteN] |= mask));
@@ -96553,34 +96837,34 @@
(this.hostname = this.componentLookup.cn[0].value))
: this.componentLookup.dc &&
this.components.length === this.componentLookup.dc.length
- ? ((this.type = 'host'),
- (this.hostname = this.componentLookup.dc
- .map(function(c) {
- return c.value;
- })
- .join('.')))
- : this.componentLookup.uid &&
- this.components.length === this.componentLookup.uid.length
- ? ((this.type = 'user'),
- (this.uid = this.componentLookup.uid[0].value))
- : this.componentLookup.cn &&
- 1 === this.componentLookup.cn.length &&
- this.componentLookup.cn[0].value.match(DNS_NAME_RE)
- ? ((this.type = 'host'),
- (this.hostname = this.componentLookup.cn[0].value))
- : this.componentLookup.uid &&
- 1 === this.componentLookup.uid.length
+ ? ((this.type = 'host'),
+ (this.hostname = this.componentLookup.dc
+ .map(function(c) {
+ return c.value;
+ })
+ .join('.')))
+ : this.componentLookup.uid &&
+ this.components.length === this.componentLookup.uid.length
? ((this.type = 'user'),
(this.uid = this.componentLookup.uid[0].value))
- : this.componentLookup.mail &&
- 1 === this.componentLookup.mail.length
- ? ((this.type = 'email'),
- (this.email = this.componentLookup.mail[0].value))
- : this.componentLookup.cn &&
- 1 === this.componentLookup.cn.length
- ? ((this.type = 'user'),
- (this.uid = this.componentLookup.cn[0].value))
- : (this.type = 'unknown');
+ : this.componentLookup.cn &&
+ 1 === this.componentLookup.cn.length &&
+ this.componentLookup.cn[0].value.match(DNS_NAME_RE)
+ ? ((this.type = 'host'),
+ (this.hostname = this.componentLookup.cn[0].value))
+ : this.componentLookup.uid &&
+ 1 === this.componentLookup.uid.length
+ ? ((this.type = 'user'),
+ (this.uid = this.componentLookup.uid[0].value))
+ : this.componentLookup.mail &&
+ 1 === this.componentLookup.mail.length
+ ? ((this.type = 'email'),
+ (this.email = this.componentLookup.mail[0].value))
+ : this.componentLookup.cn &&
+ 1 === this.componentLookup.cn.length
+ ? ((this.type = 'user'),
+ (this.uid = this.componentLookup.cn[0].value))
+ : (this.type = 'unknown');
else if (((this.type = opts.type), 'host' === this.type))
this.hostname = opts.hostname;
else if ('user' === this.type) this.uid = opts.uid;
@@ -96929,7 +97213,9 @@
(hashAlgo =
this.size <= 256
? 'sha256'
- : this.size <= 384 ? 'sha384' : 'sha512'),
+ : this.size <= 384
+ ? 'sha384'
+ : 'sha512'),
hashAlgo
);
}),
@@ -97029,10 +97315,12 @@
obj.createDH
? [1, 4]
: obj.defaultHashAlgorithm
- ? [1, 3]
- : obj.formats.auto
- ? [1, 2]
- : obj.formats.pkcs1 ? [1, 1] : [1, 0]
+ ? [1, 3]
+ : obj.formats.auto
+ ? [1, 2]
+ : obj.formats.pkcs1
+ ? [1, 1]
+ : [1, 0]
);
});
}.call(this, {
@@ -97251,9 +97539,11 @@
return utils.isCompatible(obj, PrivateKey, ver);
}),
(PrivateKey.generate = function(type, options) {
- switch ((void 0 === options && (options = {}),
- assert.object(options, 'options'),
- type)) {
+ switch (
+ (void 0 === options && (options = {}),
+ assert.object(options, 'options'),
+ type)
+ ) {
case 'ecdsa':
return (
void 0 === options.curve &&
@@ -97279,8 +97569,10 @@
obj.derive
? [1, 3]
: obj.defaultHashAlgorithm
- ? [1, 2]
- : obj.formats.auto ? [1, 1] : [1, 0]
+ ? [1, 2]
+ : obj.formats.auto
+ ? [1, 1]
+ : [1, 0]
);
});
}.call(this, require('buffer').Buffer));
@@ -97404,10 +97696,12 @@
stype = inner.toString('ascii');
if ('ecdsa-' === stype.slice(0, 6)) {
var parts = stype.split('-');
- switch ((assert.strictEqual(parts[0], 'ecdsa'),
- assert.strictEqual(parts[1], 'sha2'),
- (opts.curve = parts[2]),
- opts.curve)) {
+ switch (
+ (assert.strictEqual(parts[0], 'ecdsa'),
+ assert.strictEqual(parts[1], 'sha2'),
+ (opts.curve = parts[2]),
+ opts.curve)
+ ) {
case 'nistp256':
opts.hashAlgo = 'sha256';
break;
@@ -97522,8 +97816,8 @@
256 === sz
? (curve = 'nistp256')
: 384 === sz
- ? (curve = 'nistp384')
- : 528 === sz && (curve = 'nistp521'),
+ ? (curve = 'nistp384')
+ : 528 === sz && (curve = 'nistp521'),
buf.writeString('ecdsa-sha2-' + curve),
buf.writeBuffer(inner.toBuffer()),
buf.toBuffer()
@@ -97548,11 +97842,10 @@
var opts = {};
(opts.type = type.toLowerCase()), (opts.parts = []);
try {
- switch ((assert.ok(
- data.length > 0,
- 'signature must not be empty'
- ),
- opts.type)) {
+ switch (
+ (assert.ok(data.length > 0, 'signature must not be empty'),
+ opts.type)
+ ) {
case 'rsa':
case 'ed25519':
return parseOneNum(data, type, format, opts);
@@ -97561,8 +97854,8 @@
return 'asn1' === format
? parseDSAasn1(data, 0, 0, opts)
: 'dsa' === opts.type
- ? parseDSA(data, 0, 0, opts)
- : parseECDSA(data, 0, 0, opts);
+ ? parseDSA(data, 0, 0, opts)
+ : parseECDSA(data, 0, 0, opts);
default:
throw new InvalidAlgorithmError(type);
}
@@ -98191,7 +98484,9 @@
module.exports = function(str) {
return 'string' != typeof str
? str
- : isHexPrefixed(str) ? str.slice(2) : str;
+ : isHexPrefixed(str)
+ ? str.slice(2)
+ : str;
};
},
{ 'is-hex-prefixed': 241 },
@@ -98215,10 +98510,12 @@
'undefined' != typeof self
? self
: 'undefined' != typeof window
- ? window
- : void 0 !== global
- ? global
- : void 0 !== module ? module : Function('return this')();
+ ? window
+ : void 0 !== global
+ ? global
+ : void 0 !== module
+ ? module
+ : Function('return this')();
var result = (0, _ponyfill2.default)(root);
exports.default = result;
}.call(
@@ -98226,8 +98523,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ './ponyfill': 453 },
@@ -98242,9 +98541,9 @@
return (
'function' == typeof _Symbol
? _Symbol.observable
- ? (result = _Symbol.observable)
- : ((result = _Symbol('observable')),
- (_Symbol.observable = result))
+ ? (result = _Symbol.observable)
+ : ((result = _Symbol('observable')),
+ (_Symbol.observable = result))
: (result = '@@observable'),
result
);
@@ -98400,13 +98699,15 @@
var av_key,
av_value,
av_sep = av.indexOf('=');
- switch ((-1 === av_sep
- ? ((av_key = av), (av_value = null))
- : ((av_key = av.substr(0, av_sep)),
- (av_value = av.substr(av_sep + 1))),
- (av_key = av_key.trim().toLowerCase()),
- av_value && (av_value = av_value.trim()),
- av_key)) {
+ switch (
+ (-1 === av_sep
+ ? ((av_key = av), (av_value = null))
+ : ((av_key = av.substr(0, av_sep)),
+ (av_value = av.substr(av_sep + 1))),
+ (av_key = av_key.trim().toLowerCase()),
+ av_value && (av_value = av_value.trim()),
+ av_key)
+ ) {
case 'expires':
if (av_value) {
var exp = parseDate(av_value);
@@ -98474,11 +98775,11 @@
'creation' === prop ||
'lastAccessed' === prop
? null === obj[prop]
- ? (c[prop] = null)
- : (c[prop] =
- 'Infinity' == obj[prop]
- ? 'Infinity'
- : new Date(obj[prop]))
+ ? (c[prop] = null)
+ : (c[prop] =
+ 'Infinity' == obj[prop]
+ ? 'Infinity'
+ : new Date(obj[prop]))
: (c[prop] = obj[prop]));
}
return c;
@@ -98492,8 +98793,8 @@
(cmp =
(a.creation ? a.creation.getTime() : MAX_TIME) -
(b.creation ? b.creation.getTime() : MAX_TIME))
- ? cmp
- : (cmp = a.creationIndex - b.creationIndex);
+ ? cmp
+ : (cmp = a.creationIndex - b.creationIndex);
}
function getCookieContext(url) {
if (url instanceof Object) return url;
@@ -98663,19 +98964,19 @@
'creation' === prop ||
'lastAccessed' === prop
? null === this[prop]
- ? (obj[prop] = null)
- : (obj[prop] =
- 'Infinity' == this[prop]
- ? 'Infinity'
- : this[prop].toISOString())
+ ? (obj[prop] = null)
+ : (obj[prop] =
+ 'Infinity' == this[prop]
+ ? 'Infinity'
+ : this[prop].toISOString())
: 'maxAge' === prop
- ? null !== this[prop] &&
- (obj[prop] =
- this[prop] == 1 / 0 || this[prop] == -1 / 0
- ? this[prop].toString()
- : this[prop])
- : this[prop] !== Cookie.prototype[prop] &&
- (obj[prop] = this[prop]));
+ ? null !== this[prop] &&
+ (obj[prop] =
+ this[prop] == 1 / 0 || this[prop] == -1 / 0
+ ? this[prop].toString()
+ : this[prop])
+ : this[prop] !== Cookie.prototype[prop] &&
+ (obj[prop] = this[prop]));
}
return obj;
}),
@@ -98761,7 +99062,9 @@
var millisec = this.expiryTime(now);
return millisec == 1 / 0
? new Date(MAX_TIME)
- : millisec == -1 / 0 ? new Date(0) : new Date(millisec);
+ : millisec == -1 / 0
+ ? new Date(0)
+ : new Date(millisec);
}),
(Cookie.prototype.isPersistent = function() {
return null != this.maxAge || this.expires != 1 / 0;
@@ -109719,7 +110022,7 @@
}
if (
(bytes >= 16 &&
- ((want = bytes - bytes % 16),
+ ((want = bytes - (bytes % 16)),
this.blocks(m, mpos, want),
(mpos += want),
(bytes -= want)),
@@ -110233,10 +110536,10 @@
value <= 56319 &&
counter < length
? 56320 == (64512 & (extra = string.charCodeAt(counter++)))
- ? output.push(
- ((1023 & value) << 10) + (1023 & extra) + 65536
- )
- : (output.push(value), counter--)
+ ? output.push(
+ ((1023 & value) << 10) + (1023 & extra) + 65536
+ )
+ : (output.push(value), counter--)
: output.push(value);
return output;
}
@@ -110275,17 +110578,17 @@
((codePoint >> 6) & 31) | 192
))
: 0 == (4294901760 & codePoint)
- ? (checkScalarValue(codePoint),
- (symbol = stringFromCharCode(
- ((codePoint >> 12) & 15) | 224
- )),
- (symbol += createByte(codePoint, 6)))
- : 0 == (4292870144 & codePoint) &&
- ((symbol = stringFromCharCode(
- ((codePoint >> 18) & 7) | 240
- )),
- (symbol += createByte(codePoint, 12)),
- (symbol += createByte(codePoint, 6))),
+ ? (checkScalarValue(codePoint),
+ (symbol = stringFromCharCode(
+ ((codePoint >> 12) & 15) | 224
+ )),
+ (symbol += createByte(codePoint, 6)))
+ : 0 == (4292870144 & codePoint) &&
+ ((symbol = stringFromCharCode(
+ ((codePoint >> 18) & 7) | 240
+ )),
+ (symbol += createByte(codePoint, 12)),
+ (symbol += createByte(codePoint, 6))),
(symbol += stringFromCharCode((63 & codePoint) | 128))
);
}
@@ -110402,8 +110705,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -110476,8 +110781,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -110524,7 +110831,7 @@
(b[i++] = (tl >>> 16) & 255),
(b[i++] = (tl >>> 8) & 255),
(b[i++] = 255 & tl);
- var tmh = (msecs / 4294967296 * 1e4) & 268435455;
+ var tmh = ((msecs / 4294967296) * 1e4) & 268435455;
(b[i++] = (tmh >>> 8) & 255),
(b[i++] = 255 & tmh),
(b[i++] = ((tmh >>> 24) & 15) | 16),
@@ -110596,10 +110903,10 @@
void 0 !== exports && void 0 !== module
? (module.exports = definition())
: 'function' == typeof define && 'object' == typeof define.amd
- ? define(definition)
- : 'function' == typeof define && 'object' == typeof define.petal
- ? define('validator', [], definition)
- : (this.validator = definition());
+ ? define(definition)
+ : 'function' == typeof define && 'object' == typeof define.petal
+ ? define('validator', [], definition)
+ : (this.validator = definition());
})(0, function(validator) {
'use strict';
function getTimezoneOffset(str) {
@@ -110668,9 +110975,9 @@
options.allow_negative_sign_placeholder
? (pattern = '( (?!\\-))?' + pattern)
: options.allow_space_after_symbol
- ? (pattern = ' ?' + pattern)
- : options.allow_space_after_digits &&
- (pattern += '( (?!$))?'),
+ ? (pattern = ' ?' + pattern)
+ : options.allow_space_after_digits &&
+ (pattern += '( (?!$))?'),
options.symbol_after_digits
? (pattern += symbol)
: (pattern = symbol + pattern),
@@ -111201,7 +111508,7 @@
(tmpNum = parseInt(digit, 10)),
(sum +=
shouldDouble && (tmpNum *= 2) >= 10
- ? tmpNum % 10 + 1
+ ? (tmpNum % 10) + 1
: tmpNum),
(shouldDouble = !shouldDouble);
return !(sum % 10 != 0 || !sanitized);
@@ -111258,7 +111565,10 @@
var factor = [1, 3];
for (i = 0; i < 12; i++)
checksum += factor[i % 2] * sanitized.charAt(i);
- if (sanitized.charAt(12) - (10 - checksum % 10) % 10 == 0)
+ if (
+ sanitized.charAt(12) - ((10 - (checksum % 10)) % 10) ==
+ 0
+ )
return !!sanitized;
}
return !1;
@@ -111979,45 +112289,46 @@
);
})()
: solidityType.isStaticArray(type)
- ? (function() {
- var nestedName = solidityType.nestedName(type),
- nestedStaticPartLength = solidityType.staticPartLength(
- nestedName
- ),
- result = '';
- return (
- solidityType.isDynamicArray(nestedName) &&
- (function() {
- for (
- var previousLength = 0, i = 0;
- i < encoded.length;
- i++
- )
- (previousLength +=
- +(encoded[i - 1] || [])[0] || 0),
- (result += f
- .formatInputInt(
- offset +
- i * nestedStaticPartLength +
- 32 * previousLength
- )
- .encode());
- })(),
- (function() {
- for (var i = 0; i < encoded.length; i++) {
- var additionalOffset = result / 2;
- result += self.encodeWithOffset(
- nestedName,
- solidityType,
- encoded[i],
- offset + additionalOffset
- );
- }
- })(),
- result
- );
- })()
- : encoded;
+ ? (function() {
+ var nestedName = solidityType.nestedName(type),
+ nestedStaticPartLength = solidityType.staticPartLength(
+ nestedName
+ ),
+ result = '';
+ return (
+ solidityType.isDynamicArray(nestedName) &&
+ (function() {
+ for (
+ var previousLength = 0, i = 0;
+ i < encoded.length;
+ i++
+ )
+ (previousLength +=
+ +(encoded[i - 1] || [])[0] || 0),
+ (result += f
+ .formatInputInt(
+ offset +
+ i *
+ nestedStaticPartLength +
+ 32 * previousLength
+ )
+ .encode());
+ })(),
+ (function() {
+ for (var i = 0; i < encoded.length; i++) {
+ var additionalOffset = result / 2;
+ result += self.encodeWithOffset(
+ nestedName,
+ solidityType,
+ encoded[i],
+ offset + additionalOffset
+ );
+ }
+ })(),
+ result
+ );
+ })()
+ : encoded;
}),
(SolidityCoder.prototype.decodeParam = function(type, bytes) {
return this.decodeParams([type], bytes)[0];
@@ -112413,19 +112724,19 @@
);
})()
: this.isStaticArray(name)
- ? (function() {
- for (
- var length = self.staticArrayLength(name),
- nestedName = self.nestedName(name),
- result = [],
- i = 0;
- i < length;
- i++
- )
- result.push(self.encode(value[i], nestedName));
- return result;
- })()
- : this._inputFormatter(value, name).encode();
+ ? (function() {
+ for (
+ var length = self.staticArrayLength(name),
+ nestedName = self.nestedName(name),
+ result = [],
+ i = 0;
+ i < length;
+ i++
+ )
+ result.push(self.encode(value[i], nestedName));
+ return result;
+ })()
+ : this._inputFormatter(value, name).encode();
}),
(SolidityType.prototype.decode = function(bytes, offset, name) {
var self = this;
@@ -112700,8 +113011,8 @@
? number
: !isString(number) ||
(0 !== number.indexOf('0x') && 0 !== number.indexOf('-0x'))
- ? new BigNumber(number.toString(10), 10)
- : new BigNumber(number.replace('0x', ''), 16)
+ ? new BigNumber(number.toString(10), 10)
+ : new BigNumber(number.replace('0x', ''), 16)
);
},
isStrictAddress = function(address) {
@@ -112819,8 +113130,8 @@
return isStrictAddress(address)
? address
: /^[0-9a-f]{40}$/.test(address)
- ? '0x' + address
- : '0x' + padLeft(toHex(address).substr(2), 40);
+ ? '0x' + address
+ : '0x' + padLeft(toHex(address).substr(2), 40);
},
isBigNumber: isBigNumber,
isStrictAddress: isStrictAddress,
@@ -113366,10 +113677,10 @@
return void 0 === value || null === value
? null
: utils.isArray(value)
- ? value.map(function(v) {
- return '0x' + coder.encodeParam(i.type, v);
- })
- : '0x' + coder.encodeParam(i.type, value);
+ ? value.map(function(v) {
+ return '0x' + coder.encodeParam(i.type, v);
+ })
+ : '0x' + coder.encodeParam(i.type, value);
});
return (result.topics = result.topics.concat(indexedTopics)), result;
}),
@@ -113486,8 +113797,8 @@
return null === value || void 0 === value
? null
: 0 === (value = String(value)).indexOf('0x')
- ? value
- : utils.fromUtf8(value);
+ ? value
+ : utils.fromUtf8(value);
},
getOptions = function(options) {
return utils.isString(options)
@@ -113945,8 +114256,8 @@
'undefined' != typeof Meteor && Meteor.isServer
? Npm.require('xmlhttprequest').XMLHttpRequest
: 'undefined' != typeof window && window.XMLHttpRequest
- ? window.XMLHttpRequest
- : require('xmlhttprequest').XMLHttpRequest;
+ ? window.XMLHttpRequest
+ : require('xmlhttprequest').XMLHttpRequest;
var HttpProvider = function(host) {
this.host = host || 'http://localhost:8545';
};
@@ -114038,7 +114349,7 @@
for (var block, remainder = iban; remainder.length > 2; )
(block = remainder.slice(0, 9)),
(remainder =
- parseInt(block, 10) % 97 + remainder.slice(block.length));
+ (parseInt(block, 10) % 97) + remainder.slice(block.length));
return parseInt(remainder, 10) % 97;
},
Iban = function(iban) {
@@ -114966,8 +115277,8 @@
return err
? callback(err)
: Jsonrpc.getInstance().isValidResponse(result)
- ? void callback(null, result.result)
- : callback(errors.InvalidResponse(result));
+ ? void callback(null, result.result)
+ : callback(errors.InvalidResponse(result));
});
}),
(RequestManager.prototype.sendBatch = function(data, callback) {
@@ -114977,8 +115288,8 @@
return err
? callback(err)
: utils.isArray(results)
- ? void callback(err, results)
- : callback(errors.InvalidResponse(results));
+ ? void callback(err, results)
+ : callback(errors.InvalidResponse(results));
});
}),
(RequestManager.prototype.setProvider = function(p) {
@@ -115424,8 +115735,8 @@
(e = i + e * LOG_BASE - 1) > MAX_EXP
? (n.c = n.e = null)
: e < MIN_EXP
- ? (n.c = [(n.e = 0)])
- : ((n.e = e), (n.c = c)),
+ ? (n.c = [(n.e = 0)])
+ : ((n.e = e), (n.c = c)),
n
);
}
@@ -115484,8 +115795,8 @@
(i += LOG_BASE),
(j = sd),
(rd =
- (((n = xc[(ni = 0)]) / pows10[d - j - 1]) %
- 10) |
+ ((n = xc[(ni = 0)]) / pows10[d - j - 1]) %
+ 10 |
0);
else if ((ni = mathceil((i + 1) / LOG_BASE)) >= xc.length) {
if (!r) break out;
@@ -115498,7 +115809,7 @@
rd =
(j = (i %= LOG_BASE) - LOG_BASE + d) < 0
? 0
- : ((n / pows10[d - j - 1]) % 10) | 0;
+ : (n / pows10[d - j - 1]) % 10 | 0;
}
if (
((r =
@@ -115515,12 +115826,12 @@
(4 == rm ||
r ||
(6 == rm &&
- ((i > 0
+ (i > 0
? j > 0
- ? n / pows10[d - j]
- : 0
+ ? n / pows10[d - j]
+ : 0
: xc[ni - 1]) %
- 10) &
+ 10 &
1) ||
rm == (x.s < 0 ? 8 : 7)))),
sd < 1 || !xc[0])
@@ -115847,7 +116158,9 @@
if (!(xc && xc[0] && yc && yc[0]))
return new BigNumber(
x.s && y.s && (xc ? !yc || xc[0] != yc[0] : yc)
- ? (xc && 0 == xc[0]) || !yc ? 0 * s : s / 0
+ ? (xc && 0 == xc[0]) || !yc
+ ? 0 * s
+ : s / 0
: NaN
);
for (
@@ -115972,7 +116285,9 @@
(base =
'x' == (p2 = p2.toLowerCase())
? 16
- : 'b' == p2 ? 2 : 8),
+ : 'b' == p2
+ ? 2
+ : 8),
b && b != base ? m : p1
);
})),
@@ -116156,15 +116471,15 @@
!x.c || !y.s || (y.c && !y.c[0])
? new BigNumber(NaN)
: !y.c || (x.c && !x.c[0])
- ? new BigNumber(x)
- : (9 == MODULO_MODE
- ? ((s = y.s),
- (y.s = 1),
- (q = div(x, y, 0, 3)),
- (y.s = s),
- (q.s *= s))
- : (q = div(x, y, 0, MODULO_MODE)),
- x.minus(q.times(y)))
+ ? new BigNumber(x)
+ : (9 == MODULO_MODE
+ ? ((s = y.s),
+ (y.s = 1),
+ (q = div(x, y, 0, 3)),
+ (y.s = s),
+ (q.s *= s))
+ : (q = div(x, y, 0, MODULO_MODE)),
+ x.minus(q.times(y)))
);
}),
(P.negated = P.neg = function() {
@@ -116623,8 +116938,8 @@
return (
null === e
? s
- ? ((str = 'Infinity'), s < 0 && (str = '-' + str))
- : (str = 'NaN')
+ ? ((str = 'Infinity'), s < 0 && (str = '-' + str))
+ : (str = 'NaN')
: ((str = coeffToString(n.c)),
(str =
null != b && isValidInt(b, 2, 64, 25, 'base')
@@ -116635,8 +116950,8 @@
s
)
: e <= TO_EXP_NEG || e >= TO_EXP_POS
- ? toExponential(str, e)
- : toFixedPoint(str, e)),
+ ? toExponential(str, e)
+ : toFixedPoint(str, e)),
s < 0 && n.c[0] && (str = '-' + str)),
str
);
@@ -117391,24 +117706,24 @@
ret = onTagAttr(tag, name, value, isWhiteAttr);
return isNull(ret)
? isWhiteAttr
- ? (value = safeAttrValue(
- tag,
- name,
- value,
- cssFilter
- ))
- ? name + '="' + value + '"'
- : name
- : isNull(
- (ret = onIgnoreTagAttr(
- tag,
- name,
- value,
- isWhiteAttr
- ))
- )
- ? void 0
- : ret
+ ? (value = safeAttrValue(
+ tag,
+ name,
+ value,
+ cssFilter
+ ))
+ ? name + '="' + value + '"'
+ : name
+ : isNull(
+ (ret = onIgnoreTagAttr(
+ tag,
+ name,
+ value,
+ isWhiteAttr
+ ))
+ )
+ ? void 0
+ : ret
: ret;
}),
html = '<' + tag;
@@ -118363,51 +118678,32 @@
'0x' !== msgToSignIn.substring(0, 2)
? '0x' + msgToSignIn
: msgToSignIn;
- if (web3.currentProvider && 'MetaMask' === addrKind)
- web3.version.getNode(function(error, node) {
- node &&
- (node.match('TestRPC') || node.match('MetaMask')) &&
- (msgToSign = prefixMessage(msgToSign)),
- web3.eth.sign(address, msgToSign, function(
- err,
- sigResult
- ) {
- if (err)
- callback('Failed to sign message', void 0);
- else {
- var sigHash = sigResult,
- sig = ethUtil.fromRpcSig(sigHash),
- msg = void 0;
- if (
- ((msg =
- node &&
- (node.match('TestRPC') ||
- node.match('MetaMask'))
- ? new Buffer(
- msgToSign.slice(2),
- 'hex'
- )
- : new Buffer(
- prefixMessage(
- msgToSign
- ).slice(2),
- 'hex'
- )),
- testSig(msg, sig))
- ) {
- var r = '0x' + sig.r.toString('hex'),
- s = '0x' + sig.s.toString('hex'),
- v = sig.v;
- callback(void 0, { r: r, s: s, v: v });
- } else
- callback(
- 'Failed to sign message',
- void 0
- );
- }
- });
+ if (web3.currentProvider && 'MetaMask' === addrKind) {
+ // MetaMask 8.0.4 patch, https://github.com/forkdelta/classic-frontend/issues/197
+ msgToSign = prefixMessage(msgToSign);
+ web3.eth.sign(address, msgToSign, function(
+ err,
+ sigResult
+ ) {
+ if (err)
+ callback('Failed to sign message', void 0);
+ else {
+ var sigHash = sigResult,
+ sig = ethUtil.fromRpcSig(sigHash),
+ msg = new Buffer(msgToSign.slice(2),'hex');
+ if (testSig(msg, sig)){
+ var r = '0x' + sig.r.toString('hex'),
+ s = '0x' + sig.s.toString('hex'),
+ v = sig.v;
+ callback(void 0, { r: r, s: s, v: v });
+ } else
+ callback(
+ 'Failed to sign message',
+ void 0
+ );
+ }
});
- else if (ledgerEth && 'Ledger' === addrKind) {
+ } else if (ledgerEth && 'Ledger' === addrKind) {
var msg = new Buffer(msgToSign.slice(2), 'hex');
ledgerEth
.signPersonalMessage_async(
@@ -118649,16 +118945,16 @@
: 'number' == typeof data[i] ||
data[i] instanceof BigNumber ||
!/[a-f]/.test(data[i])
- ? (packed += utility.zeroPad(
- utility.decToHex(data[i], lengths[i]),
- lengths[i] / 4
- ))
- : ('0x' === data[i].substring(0, 2) &&
- (data[i] = data[i].substring(2)),
- (packed += utility.zeroPad(
- data[i],
- lengths[i] / 4
- )));
+ ? (packed += utility.zeroPad(
+ utility.decToHex(data[i], lengths[i]),
+ lengths[i] / 4
+ ))
+ : ('0x' === data[i].substring(0, 2) &&
+ (data[i] = data[i].substring(2)),
+ (packed += utility.zeroPad(
+ data[i],
+ lengths[i] / 4
+ )));
return packed;
}),
(utility.unpack = function(str, lengths) {
@@ -118796,26 +119092,6 @@
}
return output;
}),
- (Array.prototype.getUnique = function() {
- for (var u = {}, a = [], i = 0, l = this.length; i < l; ++i)
- u.hasOwnProperty(this[i]) ||
- (a.push(this[i]), (u[this[i]] = 1));
- return a;
- }),
- (Array.prototype.max = function() {
- return Math.max.apply(null, this);
- }),
- (Array.prototype.min = function() {
- return Math.min.apply(null, this);
- }),
- (Array.prototype.equals = function(b) {
- if (this === b) return !0;
- if (null == this || null == b) return !1;
- if (this.length != b.length) return !1;
- for (var i = 0; i < this.length; ++i)
- if (this[i] !== b[i]) return !1;
- return !0;
- }),
(Math.sign =
Math.sign ||
function(x) {
@@ -118958,48 +119234,49 @@
'MetaMask'
)
: 'Ledger' === account.kind
- ? React.createElement(
- 'span',
- {
- className:
- 'label label-success',
- },
- 'Ledger'
- )
- : account.pk
? React.createElement(
'span',
{
className:
- 'label ' +
+ 'label label-success',
+ },
+ 'Ledger'
+ )
+ : account.pk
+ ? React.createElement(
+ 'span',
+ {
+ className:
+ 'label ' +
+ ('PublicRPC' ===
+ _this2.state
+ .connection
+ .connection
+ ? 'label-success'
+ : 'label-warning'),
+ },
+ 'ForkDelta ' +
('PublicRPC' ===
_this2.state.connection
.connection
- ? 'label-success'
- : 'label-warning'),
- },
- 'ForkDelta ' +
- ('PublicRPC' ===
- _this2.state.connection
- .connection
- ? 'via MyEtherAPI'
- : '') +
- ' (Private Key)'
- )
- : React.createElement(
- 'span',
- {
- className:
- 'label label-danger',
- },
- 'ForkDelta ' +
- ('PublicRPC' ===
- _this2.state.connection
- .connection
- ? 'via MyEtherAPI'
- : '') +
- ' (No Private Key)'
- );
+ ? 'via MEW API'
+ : '') +
+ ' (Private Key)'
+ )
+ : React.createElement(
+ 'span',
+ {
+ className:
+ 'label label-danger',
+ },
+ 'ForkDelta ' +
+ ('PublicRPC' ===
+ _this2.state.connection
+ .connection
+ ? 'via MEW API'
+ : '') +
+ ' (No Private Key)'
+ );
},
dropdown =
this.state.accounts.length > 0 &&
@@ -120655,6 +120932,22 @@
.feeAmount,
readOnly: !0,
})
+ ),
+ React.createElement(
+ 'div',
+ {
+ className:
+ 'help-block small text-muted',
+ },
+ 'Order ID: ',
+ this.state.order.id,
+ React.createElement('br'),
+ 'Offered by: ',
+ this.state.order.user,
+ React.createElement('br'),
+ 'Last updated: ',
+ this.state.order.updated ||
+ this.state.order.created
)
)
),
@@ -125086,7 +125379,25 @@
value: this.state
.feeAmount,
readOnly: !0,
- })
+ }),
+ React.createElement(
+ 'div',
+ {
+ className:
+ 'help-block small text-muted',
+ },
+ 'Order ID: ',
+ this.state.order.id,
+ React.createElement('br'),
+ 'Offered by: ',
+ this.state.order.user,
+ React.createElement('br'),
+ 'Last updated: ',
+ this.state.order
+ .updated ||
+ this.state.order
+ .created
+ )
)
)
),
@@ -125526,7 +125837,21 @@
);
},
},
- token.name
+ React.createElement(
+ 'span',
+ null,
+ React.createElement(
+ 'span',
+ { className: 'symbol' },
+ token.name
+ ),
+ ' ',
+ React.createElement(
+ 'span',
+ { className: 'name' },
+ token.fullName
+ )
+ )
)
);
});
@@ -125541,7 +125866,7 @@
role: 'button',
'aria-haspopup': 'true',
'aria-expanded': 'false',
- style: { fontSize: '135%', color: '#036' },
+ style: { fontSize: '135%' },
},
this.state.selectedToken.name,
' ',
@@ -125568,6 +125893,7 @@
this.self,
'otherToken'
),
+ className: 'other',
},
React.createElement(
'span',
@@ -125890,12 +126216,19 @@
var state = props.store.getState();
_this.setState({ returnTicker: state.returnTicker });
}),
- (_this.state = {}),
+ (_this.state = { query: null }),
(_this.self = props.self),
(_this.tokens = props.tokens),
(_this.bases = props.bases),
(_this.getToken = props.getToken),
(_this.selectTokenAndBase = props.selectTokenAndBase),
+ (_this.handleSearchKeyUp = function(e) {
+ console.log('Search field update', e.target.value);
+ _this.setState({
+ query:
+ e.target.value.length > 0 ? e.target.value : null,
+ });
+ }),
_this
);
}
@@ -125907,7 +126240,8 @@
value: function(nextProps, nextState) {
return (
JSON.stringify(this.state.returnTicker) !==
- JSON.stringify(nextState.returnTicker)
+ JSON.stringify(nextState.returnTicker) ||
+ this.state.query !== nextState.query
);
},
},
@@ -125940,10 +126274,11 @@
var pairVolumes = [], j = 0;
j < this.bases.length;
j += 1
- )
+ ) {
for (var i = 0; i < this.tokens.length; i += 1) {
var token = this.getToken(this.tokens[i]),
base = this.getToken(this.bases[j]);
+
if (token && base) {
var rt = Object.values(
this.state.returnTicker
@@ -125964,10 +126299,39 @@
baseVolume: rt.baseVolume,
bid: rt.bid,
ask: rt.ask,
+ last: rt.last,
}),
pairVolumes.push(pairVolume);
}
}
+ }
+ console.log(
+ 'pairVolumes.length before filter',
+ pairVolumes.length
+ );
+ if (this.state.query) {
+ console.log('Filter ticker with', this.state.query);
+ var query = this.state.query,
+ queryRe = new RegExp(this.state.query, 'i');
+ pairVolumes = pairVolumes.filter(function(x) {
+ return (
+ (token = x.token),
+ token.name.match(queryRe) ||
+ token.fullName.match(queryRe) ||
+ token.addr.toLowerCase() ===
+ query.toLowerCase()
+ );
+ });
+ } else {
+ console.log('Filter by volume');
+ pairVolumes = pairVolumes.filter(function(x) {
+ return x.baseVolume > 0.001;
+ });
+ }
+ console.log(
+ 'pairVolumes.length after filter',
+ pairVolumes.length
+ );
return (
pairVolumes.sort(function(a, b) {
return (
@@ -125981,41 +126345,15 @@
React.createElement(
'div',
{ className: 'row-box nav-header' },
- React.createElement(
- 'ul',
- {
- className:
- 'nav nav-tabs three columns',
- role: 'tablist',
- },
- this.bases.map(function(base, index) {
- return React.createElement(
- 'li',
- {
- key: index,
- role: 'presentation',
- className:
- 0 === index
- ? 'active'
- : '',
- },
- React.createElement(
- 'a',
- {
- href:
- '#volume_' +
- base.name,
- 'aria-controls':
- 'volume_' +
- base.name,
- role: 'tab',
- 'data-toggle': 'tab',
- },
- base.name
- )
- );
- })
- )
+ React.createElement('input', {
+ type: 'search',
+ className: 'form-control',
+ placeholder:
+ 'Search for name, symbol, or address',
+ onKeyUp: this.handleSearchKeyUp.bind(
+ this
+ ),
+ })
),
React.createElement(
'div',
@@ -126037,70 +126375,10 @@
id: 'volume_' + base.name,
},
React.createElement(
- 'table',
- {
- className:
- 'table table-condensed table-borderless',
- },
- React.createElement(
- 'thead',
- null,
- React.createElement(
- 'tr',
- {
- className:
- 'table-header',
- },
- React.createElement(
- 'th',
- {
- className:
- 'trn four-columns overflow-hidden',
- },
- 'token'
- ),
- React.createElement(
- 'th',
- {
- className:
- 'trn four-columns overflow-hidden',
- },
- 'daily'
- ),
- React.createElement(
- 'th',
- {
- className:
- 'four-columns overflow-hidden',
- },
- React.createElement(
- 'span',
- {
- className:
- 'trn',
- },
- 'bid'
- )
- ),
- React.createElement(
- 'th',
- {
- className:
- 'four-columns overflow-hidden',
- },
- React.createElement(
- 'span',
- {
- className:
- 'trn',
- },
- 'offer'
- )
- )
- )
- ),
+ 'div',
+ null,
React.createElement(
- 'tbody',
+ 'div',
null,
pairVolumes
.filter(function(
@@ -126117,98 +126395,152 @@
i
) {
return React.createElement(
- 'tr',
- { key: i },
- React.createElement(
- 'td',
- {
- className:
- 'four-columns overflow-hidden',
- },
- React.createElement(
- 'a',
- {
- href:
- '/#!/trade/' +
- pairVolume
+ 'div',
+ {
+ className:
+ 'ticker-row',
+ key: i,
+ onClick: function(
+ e
+ ) {
+ e.preventDefault();
+ _this2.selectTokenAndBase.bind(
+ _this2.self,
+ pairVolume
+ .token
+ .addr,
+ pairVolume
+ .base
+ .addr
+ )();
+ history.pushState(
+ null,
+ null,
+ '/#!/trade/' +
+ (pairVolume
.token
- .name +
- '-' +
- pairVolume
- .base
- .name,
- onClick: function(
- e
- ) {
- e.preventDefault();
- _this2.selectTokenAndBase.bind(
- _this2.self,
+ .name ||
pairVolume
.token
- .addr,
+ .addr) +
+ '-' +
+ (pairVolume
+ .base
+ .name ||
pairVolume
.base
- .addr
- )();
- history.pushState(
- null,
- null,
- '/#!/trade/' +
- (pairVolume
- .token
- .name ||
- pairVolume
- .token
- .addr) +
- '-' +
- (pairVolume
- .base
- .name ||
- pairVolume
- .base
- .addr)
- );
+ .addr)
+ );
+ },
+ style: {
+ cursor:
+ 'pointer',
+ padding:
+ '4px 6px',
+ },
+ },
+ React.createElement(
+ 'div',
+ {
+ style: {
+ display:
+ 'flex',
+ justifyContent:
+ 'space-between',
+ },
+ },
+ React.createElement(
+ 'div',
+ {
+ className:
+ 'name',
+ style: {
+ 'font-weight':
+ 'bold',
},
},
'' +
pairVolume
.token
.name
+ ),
+ React.createElement(
+ 'div',
+ null,
+ pairVolume.last
+ ? pairVolume.last.toFixed(
+ 9
+ )
+ : 'n/a'
)
),
React.createElement(
- 'td',
- {
- className:
- 'four-columns overflow-hidden',
- },
- Math.round(
- pairVolume.quoteVolume
- )
- ),
- React.createElement(
- 'td',
+ 'div',
{
- className:
- 'four-columns overflow-hidden',
+ style: {
+ color:
+ 'rgba(255, 255, 255, 0.82)',
+ },
},
- pairVolume.bid
- ? pairVolume.bid.toFixed(
- 9
- )
- : ''
+ '' +
+ (pairVolume
+ .token
+ .fullName ||
+ pairVolume
+ .token
+ .name)
),
React.createElement(
- 'td',
+ 'div',
{
- className:
- 'four-columns overflow-hidden',
+ style: {
+ display:
+ 'flex',
+ justifyContent:
+ 'space-between',
+ },
},
- pairVolume.ask
- ? pairVolume.ask.toFixed(
- 9
- )
- : ''
+ React.createElement(
+ 'div',
+ {
+ style: {
+ display:
+ 'flex',
+ 'flex-direction':
+ 'column',
+ },
+ },
+ React.createElement(
+ 'div',
+ null,
+ pairVolume.bid
+ ? 'Bid ' +
+ pairVolume.bid.toFixed(
+ 9
+ )
+ : 'n/a'
+ ),
+ React.createElement(
+ 'div',
+ null,
+ pairVolume.ask
+ ? 'Ask ' +
+ pairVolume.ask.toFixed(
+ 9
+ )
+ : 'n/a'
+ )
+ ),
+ React.createElement(
+ 'div',
+ null,
+ parseFloat(
+ pairVolume.baseVolume
+ ).toFixed(
+ 3
+ ) +
+ ' Ξ Daily'
+ )
)
);
})
@@ -126341,8 +126673,8 @@
);
return results
? results[2]
- ? decodeURIComponent(results[2].replace(/\+/g, ' '))
- : ''
+ ? decodeURIComponent(results[2].replace(/\+/g, ' '))
+ : ''
: null;
},
etherDelta = new function() {
@@ -126385,7 +126717,7 @@
(self.connection = state.settings.connection),
(self.ethGasPrice = state.settings.ethGasPrice),
(self.minGas =
- self.ethGasPrice * self.config.gasDeposit / 1e18),
+ (self.ethGasPrice * self.config.gasDeposit) / 1e18),
!self.selectedContract &&
state.settings.selectedContract &&
self.checkContractUpgrade(function() {}),
@@ -126453,12 +126785,10 @@
(self.dialogInfo = function(message, closable) {
(closable =
'undefined' !== typeof closable ? closable : true),
- alertify
- .dialogInfo(message)
- .set({
- closable: closable,
- closableByDimmer: closable,
- }),
+ alertify.dialogInfo(message).set({
+ closable: closable,
+ closableByDimmer: closable,
+ }),
ga('send', {
hitType: 'event',
eventCategory: 'Dialog',
@@ -126507,49 +126837,9 @@
'MetaMask' !==
self.accounts[self.selectedAccount]
.kind
- ? self.accounts[self.selectedAccount].pk
- ? (self.dialogError(
- "You are using a ForkDelta account that has a private key attached, but you're connected to MetaMask. You should disable MetaMask from Chrome's Window -> Extensions menu (don't worry, this won't lose your MetaMask data), then refresh ForkDelta."
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Ethereum - transaction error',
- }))
- : (self.dialogError(
- 'You are connected to MetaMask, but you are either using a non-MetaMask account, or you are not logged into the MetaMask account you have selected. Check this in MetaMask, then refresh and try again.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Ethereum - transaction error',
- }))
- : 'PublicRPC' !==
- self.connection.connection ||
- self.accounts[self.selectedAccount].pk
- ? 'PublicRPC' !==
- self.connection.connection ||
- self.utility.verifyPrivateKey(
- self.accounts[
- self.selectedAccount
- ].addr,
- self.accounts[
- self.selectedAccount
- ].pk
- )
- ? 'PublicRPC' ===
- self.connection.connection &&
- balance < 2 * self.minGas
+ ? self.accounts[self.selectedAccount].pk
? (self.dialogError(
- "Your wallet's ETH balance (" +
- balance +
- ' ETH) is not enough to cover the gas cost (Ethereum network fee). ForkDelta sends ' +
- self.minGas +
- " ETH with each transaction. This is an overestimate and the excess will get refunded to you. It's a good idea to send more than " +
- self.minGas +
- ' so you can pay for not only this transaction, but also future transactions you do on ForkDelta. The gas has to come directly from your Wallet (ForkDelta has no physical way of paying gas from your deposited ETH).'
+ "You are using a ForkDelta account that has a private key attached, but you're connected to MetaMask. You should disable MetaMask from Chrome's Window -> Extensions menu (don't worry, this won't lose your MetaMask data), then refresh ForkDelta."
),
ga('send', {
hitType: 'event',
@@ -126558,7 +126848,7 @@
'Ethereum - transaction error',
}))
: (self.dialogError(
- 'You tried to send an Ethereum transaction but there was an error. Make sure you have enough ETH in your "Wallet" column to pay for the gas fee. If you already have a pending transaction (enter your address on Etherscan to find out), please wait for it to confirm, or increase your "gas price" (in the upper right dropdown) and try again.'
+ 'You are connected to MetaMask, but you are either using a non-MetaMask account, or you are not logged into the MetaMask account you have selected. Check this in MetaMask, then refresh and try again.'
),
ga('send', {
hitType: 'event',
@@ -126566,24 +126856,67 @@
eventAction:
'Ethereum - transaction error',
}))
- : (self.dialogError(
- 'You are using a ForkDelta account that has an invalid private key.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Ethereum - transaction error',
- }))
- : (self.dialogError(
- 'You are using a ForkDelta account that doesn\'t have a private key attached. Perhaps you created the account using MetaMask, in which case you should make sure MetaMask is enabled and logged in to this account, then refresh ForkDelta. Or, if you have the private key, you can choose "Import account" from the accounts dropdown (upper right) to re-import the account with its private key.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Ethereum - transaction error',
- }));
+ : 'PublicRPC' !==
+ self.connection.connection ||
+ self.accounts[self.selectedAccount].pk
+ ? 'PublicRPC' !==
+ self.connection.connection ||
+ self.utility.verifyPrivateKey(
+ self.accounts[
+ self.selectedAccount
+ ].addr,
+ self.accounts[
+ self.selectedAccount
+ ].pk
+ )
+ ? 'PublicRPC' ===
+ self.connection
+ .connection &&
+ balance < 2 * self.minGas
+ ? (self.dialogError(
+ "Your wallet's ETH balance (" +
+ balance +
+ ' ETH) is not enough to cover the gas cost (Ethereum network fee). ForkDelta sends ' +
+ self.minGas +
+ " ETH with each transaction. This is an overestimate and the excess will get refunded to you. It's a good idea to send more than " +
+ self.minGas +
+ ' so you can pay for not only this transaction, but also future transactions you do on ForkDelta. The gas has to come directly from your Wallet (ForkDelta has no physical way of paying gas from your deposited ETH).'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory:
+ 'Error',
+ eventAction:
+ 'Ethereum - transaction error',
+ }))
+ : (self.dialogError(
+ 'You tried to send an Ethereum transaction but there was an error. Make sure you have enough ETH in your "Wallet" column to pay for the gas fee. If you already have a pending transaction (enter your address on Etherscan to find out), please wait for it to confirm, or increase your "gas price" (in the upper right dropdown) and try again.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory:
+ 'Error',
+ eventAction:
+ 'Ethereum - transaction error',
+ }))
+ : (self.dialogError(
+ 'You are using a ForkDelta account that has an invalid private key.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction:
+ 'Ethereum - transaction error',
+ }))
+ : (self.dialogError(
+ 'You are using a ForkDelta account that doesn\'t have a private key attached. Perhaps you created the account using MetaMask, in which case you should make sure MetaMask is enabled and logged in to this account, then refresh ForkDelta. Or, if you have the private key, you can choose "Import account" from the accounts dropdown (upper right) to re-import the account with its private key.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction:
+ 'Ethereum - transaction error',
+ }));
}
);
}),
@@ -126769,29 +127102,29 @@
eventAction: 'Add Account - invalid private key',
}))
: self.web3.isAddress(addr)
- ? (self.store.dispatch({
- type: 'SELECT_ACCOUNT',
- value: self.accounts.length,
- }),
- self.store.dispatch({
- type: 'ADD_ACCOUNT',
- value: { addr: addr, pk: pk },
- }),
- (self.nonce = void 0),
- self.refresh(function() {}, !0),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Action',
- eventAction: 'Add Account',
- }))
- : (self.dialogError(
- 'The specified address is invalid.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction: 'Add Account - invalid address',
- }));
+ ? (self.store.dispatch({
+ type: 'SELECT_ACCOUNT',
+ value: self.accounts.length,
+ }),
+ self.store.dispatch({
+ type: 'ADD_ACCOUNT',
+ value: { addr: addr, pk: pk },
+ }),
+ (self.nonce = void 0),
+ self.refresh(function() {}, !0),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Action',
+ eventAction: 'Add Account',
+ }))
+ : (self.dialogError(
+ 'The specified address is invalid.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction: 'Add Account - invalid address',
+ }));
}),
(self.showPrivateKey = function() {
var addr = self.accounts[self.selectedAccount].addr,
@@ -126996,8 +127329,8 @@
return 'buy' === kind && ask && price > 1.5 * ask
? ask
: 'sell' === kind && bid && price < 0.5 * bid
- ? bid
- : void 0;
+ ? bid
+ : void 0;
}),
(self.transformOrders = function(res) {
return (
@@ -127106,170 +127439,178 @@
self.accounts[self.selectedAccount].addr.toLowerCase()
? toAddr.toLowerCase() ===
self.selectedContract.toLowerCase()
- ? (self.dialogError(
- 'If you send funds directly to the smart contract, they will be lost. You need to use the Deposit tab to deposit.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction: 'Transfer - invalid address',
- eventLabel: token.name,
- eventValue: inputAmount,
- }))
- : '0x0000000000000000000000000000000000000' ===
- addr.slice(0, 39)
- ? self.utility.getBalance(
- self.web3,
- self.accounts[self.selectedAccount].addr,
- function(err, balance) {
- amount.gt(balance) && (amount = balance),
- amount.lte(0)
- ? (self.dialogError(
- 'You do not have anything to transfer. Note: you can only transfer from your "Wallet." If you have Ether on deposit, please withdraw first, then transfer.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Transfer - nothing to transfer',
- eventLabel: token.name,
- eventValue: inputAmount,
- }))
- : self.utility.send(
- self.web3,
- self.ledgerEth,
- void 0,
- toAddr,
- void 0,
- [
- {
- gas:
- self.config
- .gasDeposit,
- gasPrice:
- self.ethGasPrice,
- value: amount.toNumber(),
- },
- ],
- self.accounts[
- self.selectedAccount
- ].addr,
- self.accounts[
- self.selectedAccount
- ].pk,
- self.accounts[
- self.selectedAccount
- ].kind,
- self.nonce,
- function(errSend, result) {
- (self.nonce =
- result.nonce),
- self.addPending(
- errSend,
- {
- txHash:
- result.txHash,
- }
- ),
- self.alertTxResult(
- errSend,
- result
- ),
- ga('send', {
- hitType:
- 'event',
- eventCategory:
- 'Action',
- eventAction:
- 'Transfer',
- eventLabel:
- token.name,
- eventValue: inputAmount,
- });
- }
- );
- }
- )
- : self.utility.call(
- self.web3,
- self.contractToken,
- token.addr,
- 'balanceOf',
- [self.accounts[self.selectedAccount].addr],
- function(err, result) {
- amount.gt(result) && (amount = result),
- amount.lte(0)
- ? (self.dialogError(
- 'You do not have anything to transfer. Note: you can only transfer from your "Wallet." If you have tokens on deposit, please withdraw first, then transfer.'
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Error',
- eventAction:
- 'Transfer - nothing to transfer',
- eventLabel: token.name,
- eventValue: inputAmount,
- }))
- : self.utility.send(
- self.web3,
- self.ledgerEth,
- self.contractToken,
- token.addr,
- 'transfer',
- [
+ ? (self.dialogError(
+ 'If you send funds directly to the smart contract, they will be lost. You need to use the Deposit tab to deposit.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction: 'Transfer - invalid address',
+ eventLabel: token.name,
+ eventValue: inputAmount,
+ }))
+ : '0x0000000000000000000000000000000000000' ===
+ addr.slice(0, 39)
+ ? self.utility.getBalance(
+ self.web3,
+ self.accounts[self.selectedAccount].addr,
+ function(err, balance) {
+ amount.gt(balance) &&
+ (amount = balance),
+ amount.lte(0)
+ ? (self.dialogError(
+ 'You do not have anything to transfer. Note: you can only transfer from your "Wallet." If you have Ether on deposit, please withdraw first, then transfer.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction:
+ 'Transfer - nothing to transfer',
+ eventLabel: token.name,
+ eventValue: inputAmount,
+ }))
+ : self.utility.send(
+ self.web3,
+ self.ledgerEth,
+ void 0,
toAddr,
- amount,
- {
- gas:
- self.config
- .gasDeposit,
- gasPrice:
- self.ethGasPrice,
- value: 0,
- },
- ],
- self.accounts[
- self.selectedAccount
- ].addr,
- self.accounts[
- self.selectedAccount
- ].pk,
- self.accounts[
- self.selectedAccount
- ].kind,
- self.nonce,
- function(
- errSend,
- resultSend
- ) {
- (self.nonce =
- resultSend.nonce),
- self.addPending(
- errSend,
- {
- txHash:
- resultSend.txHash,
- }
- ),
- self.alertTxResult(
- errSend,
- resultSend
- ),
- ga('send', {
- hitType:
- 'event',
- eventCategory:
- 'Action',
- eventAction:
- 'Transfer',
- eventLabel:
- token.name,
- eventValue: inputAmount,
- });
- }
- );
- }
- )
+ void 0,
+ [
+ {
+ gas:
+ self.config
+ .gasDeposit,
+ gasPrice:
+ self.ethGasPrice,
+ value: amount.toNumber(),
+ },
+ ],
+ self.accounts[
+ self.selectedAccount
+ ].addr,
+ self.accounts[
+ self.selectedAccount
+ ].pk,
+ self.accounts[
+ self.selectedAccount
+ ].kind,
+ self.nonce,
+ function(
+ errSend,
+ result
+ ) {
+ (self.nonce =
+ result.nonce),
+ self.addPending(
+ errSend,
+ {
+ txHash:
+ result.txHash,
+ }
+ ),
+ self.alertTxResult(
+ errSend,
+ result
+ ),
+ ga('send', {
+ hitType:
+ 'event',
+ eventCategory:
+ 'Action',
+ eventAction:
+ 'Transfer',
+ eventLabel:
+ token.name,
+ eventValue: inputAmount,
+ });
+ }
+ );
+ }
+ )
+ : self.utility.call(
+ self.web3,
+ self.contractToken,
+ token.addr,
+ 'balanceOf',
+ [
+ self.accounts[self.selectedAccount]
+ .addr,
+ ],
+ function(err, result) {
+ amount.gt(result) &&
+ (amount = result),
+ amount.lte(0)
+ ? (self.dialogError(
+ 'You do not have anything to transfer. Note: you can only transfer from your "Wallet." If you have tokens on deposit, please withdraw first, then transfer.'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction:
+ 'Transfer - nothing to transfer',
+ eventLabel: token.name,
+ eventValue: inputAmount,
+ }))
+ : self.utility.send(
+ self.web3,
+ self.ledgerEth,
+ self.contractToken,
+ token.addr,
+ 'transfer',
+ [
+ toAddr,
+ amount,
+ {
+ gas:
+ self.config
+ .gasDeposit,
+ gasPrice:
+ self.ethGasPrice,
+ value: 0,
+ },
+ ],
+ self.accounts[
+ self.selectedAccount
+ ].addr,
+ self.accounts[
+ self.selectedAccount
+ ].pk,
+ self.accounts[
+ self.selectedAccount
+ ].kind,
+ self.nonce,
+ function(
+ errSend,
+ resultSend
+ ) {
+ (self.nonce =
+ resultSend.nonce),
+ self.addPending(
+ errSend,
+ {
+ txHash:
+ resultSend.txHash,
+ }
+ ),
+ self.alertTxResult(
+ errSend,
+ resultSend
+ ),
+ ga('send', {
+ hitType:
+ 'event',
+ eventCategory:
+ 'Action',
+ eventAction:
+ 'Transfer',
+ eventLabel:
+ token.name,
+ eventValue: inputAmount,
+ });
+ }
+ );
+ }
+ )
: (self.dialogError('Please specify a valid address.'),
ga('send', {
hitType: 'event',
@@ -127638,89 +127979,107 @@
}))
: '0x0000000000000000000000000000000000000' ===
addr.slice(0, 39)
- ? self.utility.send(
- self.web3,
- self.ledgerEth,
- self.contractEtherDelta,
- self.selectedContract,
- 'withdraw',
- [
- amount,
- {
- gas:
- self.config.gasWithdraw,
- gasPrice: self.ethGasPrice,
- value: 0,
- },
- ],
- self.accounts[self.selectedAccount]
- .addr,
- self.accounts[self.selectedAccount]
- .pk,
- self.accounts[self.selectedAccount]
- .kind,
- self.nonce,
- function(errSend, resultSend) {
- (self.nonce = resultSend.nonce),
- self.addPending(errSend, {
- txHash:
- resultSend.txHash,
- }),
- self.alertTxResult(
- errSend,
- resultSend
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Action',
- eventAction: 'Withdraw',
- eventLabel: token.name,
- eventValue: amountIn,
- });
- }
- )
- : self.utility.send(
- self.web3,
- self.ledgerEth,
- self.contractEtherDelta,
- self.selectedContract,
- 'withdrawToken',
- [
- addr,
- amount,
- {
- gas:
- self.config.gasWithdraw,
- gasPrice: self.ethGasPrice,
- value: 0,
- },
- ],
- self.accounts[self.selectedAccount]
- .addr,
- self.accounts[self.selectedAccount]
- .pk,
- self.accounts[self.selectedAccount]
- .kind,
- self.nonce,
- function(errSend, resultSend) {
- (self.nonce = resultSend.nonce),
- self.addPending(errSend, {
- txHash:
- resultSend.txHash,
- }),
- self.alertTxResult(
- errSend,
- resultSend
- ),
- ga('send', {
- hitType: 'event',
- eventCategory: 'Action',
- eventAction: 'Withdraw',
- eventLabel: token.name,
- eventValue: amountIn,
- });
- }
- );
+ ? self.utility.send(
+ self.web3,
+ self.ledgerEth,
+ self.contractEtherDelta,
+ self.selectedContract,
+ 'withdraw',
+ [
+ amount,
+ {
+ gas:
+ self.config
+ .gasWithdraw,
+ gasPrice:
+ self.ethGasPrice,
+ value: 0,
+ },
+ ],
+ self.accounts[
+ self.selectedAccount
+ ].addr,
+ self.accounts[
+ self.selectedAccount
+ ].pk,
+ self.accounts[
+ self.selectedAccount
+ ].kind,
+ self.nonce,
+ function(errSend, resultSend) {
+ (self.nonce =
+ resultSend.nonce),
+ self.addPending(errSend, {
+ txHash:
+ resultSend.txHash,
+ }),
+ self.alertTxResult(
+ errSend,
+ resultSend
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory:
+ 'Action',
+ eventAction:
+ 'Withdraw',
+ eventLabel:
+ token.name,
+ eventValue: amountIn,
+ });
+ }
+ )
+ : self.utility.send(
+ self.web3,
+ self.ledgerEth,
+ self.contractEtherDelta,
+ self.selectedContract,
+ 'withdrawToken',
+ [
+ addr,
+ amount,
+ {
+ gas:
+ self.config
+ .gasWithdraw,
+ gasPrice:
+ self.ethGasPrice,
+ value: 0,
+ },
+ ],
+ self.accounts[
+ self.selectedAccount
+ ].addr,
+ self.accounts[
+ self.selectedAccount
+ ].pk,
+ self.accounts[
+ self.selectedAccount
+ ].kind,
+ self.nonce,
+ function(errSend, resultSend) {
+ (self.nonce =
+ resultSend.nonce),
+ self.addPending(errSend, {
+ txHash:
+ resultSend.txHash,
+ }),
+ self.alertTxResult(
+ errSend,
+ resultSend
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory:
+ 'Action',
+ eventAction:
+ 'Withdraw',
+ eventLabel:
+ token.name,
+ eventValue: amountIn,
+ });
+ }
+ );
}
);
}),
@@ -127908,16 +128267,20 @@
(self.alertSuccess(
'You sent an order to the order book. Please wait for it to be processed.'
),
- self.socket.emit(
- 'message',
- order
- ),
self.socket.once(
'messageResult',
function(messageResult) {
- console.log(
- messageResult
+ alertify.notify(
+ messageResult[1],
+ messageResult[0] ==
+ 200
+ ? 'success'
+ : 'error',
+ 5
),
+ console.log(
+ messageResult
+ ),
ga('send', {
hitType:
'event',
@@ -127935,6 +128298,10 @@
.name,
});
}
+ ),
+ self.socket.emit(
+ 'message',
+ order
));
}
}
@@ -128126,31 +128493,8 @@
: availableBalance.lte(
new BigNumber(0)
)
- ? (self.dialogError(
- "You cannot trade this order because you don't have enough funds. Please DEPOSIT first using the Deposit form in the upper left. Enter the amount you want to deposit and press the 'Deposit' button."
- ),
- ga('send', {
- hitType: 'event',
- eventCategory:
- 'Error',
- eventAction:
- 'Trade - failed',
- eventLabel:
- self
- .selectedToken
- .name +
- '/' +
- self
- .selectedBase
- .name,
- eventValue: inputAmount,
- }))
- : !resultTestTrade ||
- amount.lte(
- new BigNumber(0)
- )
? (self.dialogError(
- "You cannot trade this order because it already traded. Someone else already traded this order and the order book hasn't updated yet."
+ "You cannot trade this order because you don't have enough funds. Please DEPOSIT first using the Deposit form in the upper left. Enter the amount you want to deposit and press the 'Deposit' button."
),
ga('send', {
hitType: 'event',
@@ -128168,86 +128512,110 @@
.name,
eventValue: inputAmount,
}))
- : self.utility.send(
- self.web3,
- self.ledgerEth,
- self.contractEtherDelta,
- self.selectedContract,
- 'trade',
- [
- order.tokenGet,
- order.amountGet,
- order.tokenGive,
- order.amountGive,
- order.expires,
- order.nonce,
- order.user,
- v,
- r,
- s,
- amount,
- {
- gas:
- self
- .config
- .gasTrade,
- gasPrice:
- self.ethGasPrice,
- value: 0,
- },
- ],
- self.accounts[
- self
- .selectedAccount
- ].addr,
- self.accounts[
- self
- .selectedAccount
- ].pk,
- self.accounts[
- self
- .selectedAccount
- ].kind,
- self.nonce,
- function(
- errSend,
- resultSend
- ) {
- (self.nonce =
- resultSend.nonce),
- self.addPending(
- errSend,
- {
- txHash:
- resultSend.txHash,
- }
- ),
- self.alertTxResult(
- errSend,
- resultSend
- ),
- ga(
- 'send',
- {
- hitType:
- 'event',
- eventCategory:
- 'Action',
- eventAction:
- 'Trade',
- eventLabel:
- self
- .selectedToken
- .name +
- '/' +
- self
- .selectedBase
- .name,
- eventValue: inputAmount,
- }
- );
- }
- );
+ : !resultTestTrade ||
+ amount.lte(
+ new BigNumber(0)
+ )
+ ? (self.dialogError(
+ "You cannot trade this order because it already traded. Someone else already traded this order and the order book hasn't updated yet."
+ ),
+ ga('send', {
+ hitType:
+ 'event',
+ eventCategory:
+ 'Error',
+ eventAction:
+ 'Trade - failed',
+ eventLabel:
+ self
+ .selectedToken
+ .name +
+ '/' +
+ self
+ .selectedBase
+ .name,
+ eventValue: inputAmount,
+ }))
+ : self.utility.send(
+ self.web3,
+ self.ledgerEth,
+ self.contractEtherDelta,
+ self.selectedContract,
+ 'trade',
+ [
+ order.tokenGet,
+ order.amountGet,
+ order.tokenGive,
+ order.amountGive,
+ order.expires,
+ order.nonce,
+ order.user,
+ v,
+ r,
+ s,
+ amount,
+ {
+ gas:
+ self
+ .config
+ .gasTrade,
+ gasPrice:
+ self.ethGasPrice,
+ value: 0,
+ },
+ ],
+ self.accounts[
+ self
+ .selectedAccount
+ ].addr,
+ self.accounts[
+ self
+ .selectedAccount
+ ].pk,
+ self.accounts[
+ self
+ .selectedAccount
+ ].kind,
+ self.nonce,
+ function(
+ errSend,
+ resultSend
+ ) {
+ (self.nonce =
+ resultSend.nonce),
+ self.addPending(
+ errSend,
+ {
+ txHash:
+ resultSend.txHash,
+ }
+ ),
+ self.alertTxResult(
+ errSend,
+ resultSend
+ ),
+ ga(
+ 'send',
+ {
+ hitType:
+ 'event',
+ eventCategory:
+ 'Action',
+ eventAction:
+ 'Trade',
+ eventLabel:
+ self
+ .selectedToken
+ .name +
+ '/' +
+ self
+ .selectedBase
+ .name,
+ eventValue: inputAmount,
+ }
+ );
+ }
+ );
}
);
}
@@ -128313,6 +128681,7 @@
expectedKeys = JSON.stringify([
'addr',
'decimals',
+ 'fullName',
'name',
]);
return (
@@ -128321,26 +128690,28 @@
: self.selectedToken.addr &&
self.selectedToken.addr.toLowerCase() ===
lowerAddrOrToken
- ? (result = self.selectedToken)
- : self.selectedBase.addr &&
- self.selectedBase.addr.toLowerCase() ===
- lowerAddrOrToken
- ? (result = self.selectedBase)
- : addrOrToken &&
- addrOrToken.addr &&
- JSON.stringify(
- Object.keys(addrOrToken).sort()
- ) === expectedKeys
- ? (result = addrOrToken)
- : 'string' == typeof addrOrToken &&
- '0x' === addrOrToken.slice(0, 2) &&
- name &&
- decimals >= 0 &&
- (((result = JSON.parse(
- JSON.stringify(self.config.tokens[0])
- )).addr = lowerAddrOrToken),
- (result.name = name),
- (result.decimals = decimals)),
+ ? (result = self.selectedToken)
+ : self.selectedBase.addr &&
+ self.selectedBase.addr.toLowerCase() ===
+ lowerAddrOrToken
+ ? (result = self.selectedBase)
+ : addrOrToken &&
+ addrOrToken.addr &&
+ JSON.stringify(
+ Object.keys(addrOrToken).sort()
+ ) === expectedKeys
+ ? (result = addrOrToken)
+ : 'string' == typeof addrOrToken &&
+ '0x' === addrOrToken.slice(0, 2) &&
+ name &&
+ decimals >= 0 &&
+ (((result = JSON.parse(
+ JSON.stringify(
+ self.config.tokens[0]
+ )
+ )).addr = lowerAddrOrToken),
+ (result.name = name),
+ (result.decimals = decimals)),
result
);
}),
@@ -128382,6 +128753,8 @@
2,
6
)),
+ (token.fullName =
+ token.name),
callback(null, token);
}
))
@@ -129278,8 +129651,8 @@
self.web3.setProvider(
new Web3.providers.HttpProvider(
self.config.ethTestnet
- ? 'https://api.myetherapi.com/rop'
- : 'https://api.myetherapi.com/eth'
+ ? 'https://api.myetherwallet.com/rop'
+ : 'https://api.myetherwallet.com/eth'
)
),
self.store.dispatch({
@@ -129288,8 +129661,8 @@
connection: {
connection: 'PublicRPC',
provider: self.config.ethTestnet
- ? 'https://api.myetherapi.com/rop'
- : 'https://api.myetherapi.com/eth',
+ ? 'https://api.myetherwallet.com/rop'
+ : 'https://api.myetherwallet.com/eth',
testnet: self.config.ethTestnet,
},
},
@@ -129301,8 +129674,8 @@
(self.web3 = new Web3(
new Web3.providers.HttpProvider(
self.config.ethTestnet
- ? 'https://api.myetherapi.com/rop'
- : 'https://api.myetherapi.com/eth'
+ ? 'https://api.myetherwallet.com/rop'
+ : 'https://api.myetherwallet.com/eth'
)
)),
self.store.dispatch({
@@ -129311,8 +129684,8 @@
connection: {
connection: 'PublicRPC',
provider: self.config.ethTestnet
- ? 'https://api.myetherapi.com/rop'
- : 'https://api.myetherapi.com/eth',
+ ? 'https://api.myetherwallet.com/rop'
+ : 'https://api.myetherwallet.com/eth',
testnet: self.config.ethTestnet,
},
},
@@ -129339,25 +129712,35 @@
);
}),
(self.initNetwork = function(callback) {
- self.web3.version.getNetwork(function(error, version) {
- error ||
- !version ||
- 1 === Number(version) ||
- self.config.ethTestnet ||
- self.dialogError(
- 'You are connected to the Ethereum testnet. Please connect to the Ethereum mainnet.'
+ try {
+ self.web3.version.getNetwork(function(error, version) {
+ error ||
+ !version ||
+ 1 === Number(version) ||
+ self.config.ethTestnet ||
+ self.dialogError(
+ 'You are connected to the Ethereum testnet. Please connect to the Ethereum mainnet.'
+ );
+ var ethGasPriceCookie = self.utility.readCookie(
+ 'ethGasPrice'
);
- var ethGasPriceCookie = self.utility.readCookie(
- 'ethGasPrice'
- );
- if (ethGasPriceCookie) {
- var newEthGasPrice = JSON.parse(ethGasPriceCookie);
- newEthGasPrice > self.config.ethGasPrice
- ? self.setGasPrice(newEthGasPrice, !0)
- : self.setGasPrice(self.config.ethGasPrice, !0);
- } else self.setGasPrice(self.config.ethGasPrice, !0);
- callback();
- });
+ if (ethGasPriceCookie) {
+ var newEthGasPrice = JSON.parse(
+ ethGasPriceCookie
+ );
+ newEthGasPrice > self.config.ethGasPrice
+ ? self.setGasPrice(newEthGasPrice, !0)
+ : self.setGasPrice(
+ self.config.ethGasPrice,
+ !0
+ );
+ } else self.setGasPrice(self.config.ethGasPrice, !0);
+ callback();
+ });
+ } catch (err) {
+ console.error(err);
+ throw err;
+ }
}),
(self.initAPI = function(callback) {
Array.isArray(self.config.socketServer) &&
@@ -129373,9 +129756,12 @@
self.config.socketServer
));
var zeroAddr = '0x0000000000000000000000000000000000000000';
- (self.socket = io.connect(self.config.socketServer, {
- transports: ['websocket'],
- })),
+ (self.socket = io.connect(
+ self.config.socketServer,
+ {
+ transports: ['websocket'],
+ }
+ )),
self.socket.on('connect', function() {
console.log('socket connected');
}),
@@ -129541,8 +129927,8 @@
window.location.hash.substr(0, 9) === '#!/trade/'
? window.location.hash.substr(9)
: window.location.hash.substr(0, 1) === '#'
- ? window.location.hash.substr(1)
- : ''
+ ? window.location.hash.substr(1)
+ : ''
).split('-'),
token = hashSplit[0],
base = hashSplit[1],
@@ -129598,10 +129984,10 @@
0,
1
) === '#'
- ? event.target.window.location.hash.substr(
- 1
- )
- : ''
+ ? event.target.window.location.hash.substr(
+ 1
+ )
+ : ''
).split('-'),
token = hashSplit[0],
base = hashSplit[1],
@@ -129670,7 +130056,8 @@
self.config.contractEtherDeltaAddrs[0].addr,
},
}),
- (self.web3.eth.defaultAccount = self.config.ethAddr),
+ (self.web3.eth.defaultAccount = self.config.ethAddr);
+ var getAccountsCall = function() {
self.web3.eth.getAccounts(function(e, accounts) {
if (!e && accounts && accounts.length > 0) {
var accountsL = accounts.map(function(x) {
@@ -129708,8 +130095,39 @@
eventAction:
'Ethereum - MetaMask not logged in',
}));
- }),
- callback();
+ });
+ };
+ var providerEnable =
+ self.web3.currentProvider &&
+ typeof self.web3.currentProvider.enable ===
+ 'function' &&
+ self.web3.currentProvider.enable;
+ if (providerEnable) {
+ providerEnable()
+ .then(getAccountsCall.bind(this))
+ .catch(function(error) {
+ console.error(
+ 'getAccountsCall failed with',
+ error
+ );
+ 'RPC' === self.connection.connection &&
+ (self.dialogError(
+ 'Your privacy settings are preventing ForkDelta from logging you in. Please, ' +
+ 'enable account access for ForkDelta (https://forkdelta.' +
+ 'app).'
+ ),
+ ga('send', {
+ hitType: 'event',
+ eventCategory: 'Error',
+ eventAction:
+ 'Ethereum - Provider enable failed: ' +
+ error,
+ }));
+ });
+ } else {
+ getAccountsCall();
+ }
+ callback();
}),
(self.startForkDelta = function() {
self.loadConfig(function() {
@@ -129973,10 +130391,10 @@
: _newState.buys.find(function(y) {
return y.id === x.id;
})
- ? (_newState.buys = _newState.buys.map(function(y) {
- return y.id === x.id ? x : y;
- }))
- : _newState.buys.push(x);
+ ? (_newState.buys = _newState.buys.map(function(y) {
+ return y.id === x.id ? x : y;
+ }))
+ : _newState.buys.push(x);
}),
action.value.sells.forEach(function(x) {
x.deleted
@@ -129988,10 +130406,12 @@
: _newState.sells.find(function(y) {
return y.id === x.id;
})
- ? (_newState.sells = _newState.sells.map(function(y) {
- return y.id === x.id ? x : y;
- }))
- : _newState.sells.push(x);
+ ? (_newState.sells = _newState.sells.map(function(
+ y
+ ) {
+ return y.id === x.id ? x : y;
+ }))
+ : _newState.sells.push(x);
}),
{
sells: _newState.sells.sort(function(a, b) {
@@ -130084,10 +130504,10 @@
: _newState.buys.find(function(y) {
return y.id === x.id;
})
- ? (_newState.buys = _newState.buys.map(function(y) {
- return y.id === x.id ? x : y;
- }))
- : _newState.buys.push(x);
+ ? (_newState.buys = _newState.buys.map(function(y) {
+ return y.id === x.id ? x : y;
+ }))
+ : _newState.buys.push(x);
}),
action.value.sells.forEach(function(x) {
x.deleted || x.ethAvailableVolumeBase <= 0.001
@@ -130099,10 +130519,12 @@
: _newState.sells.find(function(y) {
return y.id === x.id;
})
- ? (_newState.sells = _newState.sells.map(function(y) {
- return y.id === x.id ? x : y;
- }))
- : _newState.sells.push(x);
+ ? (_newState.sells = _newState.sells.map(function(
+ y
+ ) {
+ return y.id === x.id ? x : y;
+ }))
+ : _newState.sells.push(x);
}),
{
sells: _newState.sells.sort(function(a, b) {
@@ -132037,9 +132459,9 @@
: ('number' == typeof this.value
? (out[offset] = this.value)
: 'string' == typeof this.value
- ? out.write(this.value, offset)
- : Buffer.isBuffer(this.value) &&
- this.value.copy(out, offset),
+ ? out.write(this.value, offset)
+ : Buffer.isBuffer(this.value) &&
+ this.value.copy(out, offset),
(offset += this.length)),
out)
);
@@ -132327,8 +132749,8 @@
(null !== state.explicit
? (tag = state.explicit)
: null !== state.implicit
- ? (tag = state.implicit)
- : null !== state.tag && (tag = state.tag),
+ ? (tag = state.implicit)
+ : null !== state.tag && (tag = state.tag),
null !== tag || state.any)
) {
if (
@@ -132386,8 +132808,8 @@
(result = state.any
? result
: null === state.choice
- ? this._decodeGeneric(state.tag, input, options)
- : this._decodeChoice(input, options)),
+ ? this._decodeGeneric(state.tag, input, options)
+ : this._decodeChoice(input, options)),
input.isError(result))
)
return result;
@@ -132421,38 +132843,46 @@
return 'seq' === tag || 'set' === tag
? null
: 'seqof' === tag || 'setof' === tag
- ? this._decodeList(input, tag, state.args[0], options)
- : /str$/.test(tag)
- ? this._decodeStr(input, tag, options)
- : 'objid' === tag && state.args
- ? this._decodeObjid(
- input,
- state.args[0],
- state.args[1],
- options
- )
- : 'objid' === tag
- ? this._decodeObjid(input, null, null, options)
- : 'gentime' === tag || 'utctime' === tag
- ? this._decodeTime(input, tag, options)
- : 'null_' === tag
- ? this._decodeNull(input, options)
- : 'bool' === tag
- ? this._decodeBool(input, options)
- : 'objDesc' === tag
- ? this._decodeStr(input, tag, options)
- : 'int' === tag || 'enum' === tag
- ? this._decodeInt(
- input,
- state.args && state.args[0],
- options
- )
- : null !== state.use
- ? this._getUse(
- state.use,
- input._reporterState.obj
- )._decode(input, options)
- : input.error('unknown tag: ' + tag);
+ ? this._decodeList(input, tag, state.args[0], options)
+ : /str$/.test(tag)
+ ? this._decodeStr(input, tag, options)
+ : 'objid' === tag && state.args
+ ? this._decodeObjid(
+ input,
+ state.args[0],
+ state.args[1],
+ options
+ )
+ : 'objid' === tag
+ ? this._decodeObjid(input, null, null, options)
+ : 'gentime' === tag || 'utctime' === tag
+ ? this._decodeTime(input, tag, options)
+ : 'null_' === tag
+ ? this._decodeNull(input, options)
+ : 'bool' === tag
+ ? this._decodeBool(input, options)
+ : 'objDesc' === tag
+ ? this._decodeStr(
+ input,
+ tag,
+ options
+ )
+ : 'int' === tag || 'enum' === tag
+ ? this._decodeInt(
+ input,
+ state.args &&
+ state.args[0],
+ options
+ )
+ : null !== state.use
+ ? this._getUse(
+ state.use,
+ input._reporterState
+ .obj
+ )._decode(input, options)
+ : input.error(
+ 'unknown tag: ' + tag
+ );
}),
(Node.prototype._getUse = function(entity, obj) {
var state = this._baseState;
@@ -133155,23 +133585,23 @@
}
return 'numstr' === tag
? this._isNumstr(str)
- ? this._createEncoderBuffer(str)
- : this.reporter.error(
- 'Encoding of string type: numstr supports only digits and space'
- )
- : 'printstr' === tag
- ? this._isPrintstr(str)
? this._createEncoderBuffer(str)
: this.reporter.error(
- 'Encoding of string type: printstr supports only latin upper and lower case letters, digits, space, apostrophe, left and rigth parenthesis, plus sign, comma, hyphen, dot, slash, colon, equal sign, question mark'
+ 'Encoding of string type: numstr supports only digits and space'
)
- : /str$/.test(tag)
- ? this._createEncoderBuffer(str)
- : 'objDesc' === tag
- ? this._createEncoderBuffer(str)
- : this.reporter.error(
- 'Encoding of string type: ' + tag + ' unsupported'
- );
+ : 'printstr' === tag
+ ? this._isPrintstr(str)
+ ? this._createEncoderBuffer(str)
+ : this.reporter.error(
+ 'Encoding of string type: printstr supports only latin upper and lower case letters, digits, space, apostrophe, left and rigth parenthesis, plus sign, comma, hyphen, dot, slash, colon, equal sign, question mark'
+ )
+ : /str$/.test(tag)
+ ? this._createEncoderBuffer(str)
+ : 'objDesc' === tag
+ ? this._createEncoderBuffer(str)
+ : this.reporter.error(
+ 'Encoding of string type: ' + tag + ' unsupported'
+ );
}),
(DERNode.prototype._encodeObjid = function(id, values, relative) {
if ('string' == typeof id) {
@@ -133229,18 +133659,18 @@
'Z',
].join(''))
: 'utctime' === tag
- ? (str = [
- two(date.getFullYear() % 100),
- two(date.getUTCMonth() + 1),
- two(date.getUTCDate()),
- two(date.getUTCHours()),
- two(date.getUTCMinutes()),
- two(date.getUTCSeconds()),
- 'Z',
- ].join(''))
- : this.reporter.error(
- 'Encoding ' + tag + ' time is not supported yet'
- ),
+ ? (str = [
+ two(date.getFullYear() % 100),
+ two(date.getUTCMonth() + 1),
+ two(date.getUTCDate()),
+ two(date.getUTCHours()),
+ two(date.getUTCMinutes()),
+ two(date.getUTCSeconds()),
+ 'Z',
+ ].join(''))
+ : this.reporter.error(
+ 'Encoding ' + tag + ' time is not supported yet'
+ ),
this._encodeStr(str, 'octstr')
);
}),
@@ -133663,8 +134093,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ 'util/': 743 },
@@ -133693,7 +134125,7 @@
return output.join('');
}
(exports.byteLength = function(b64) {
- return 3 * b64.length / 4 - placeHoldersCount(b64);
+ return (3 * b64.length) / 4 - placeHoldersCount(b64);
}),
(exports.toByteArray = function(b64) {
var i,
@@ -133704,7 +134136,7 @@
arr,
len = b64.length;
(placeHolders = placeHoldersCount(b64)),
- (arr = new Arr(3 * len / 4 - placeHolders)),
+ (arr = new Arr((3 * len) / 4 - placeHolders)),
(l = placeHolders > 0 ? len - 4 : len);
var L = 0;
for (i = 0, j = 0; i < l; i += 4, j += 3)
@@ -133815,7 +134247,9 @@
(r |=
c >= 49 && c <= 54
? c - 49 + 10
- : c >= 17 && c <= 22 ? c - 17 + 10 : 15 & c);
+ : c >= 17 && c <= 22
+ ? c - 17 + 10
+ : 15 & c);
}
return r;
}
@@ -133958,7 +134392,7 @@
function Mont(m) {
Red.call(this, m),
(this.shift = this.m.bitLength()),
- this.shift % 26 != 0 && (this.shift += 26 - this.shift % 26),
+ this.shift % 26 != 0 && (this.shift += 26 - (this.shift % 26)),
(this.r = new BN(1).iushln(this.shift)),
(this.r2 = this.imod(this.r.sqr())),
(this.rinv = this.r._invmp(this.m)),
@@ -134014,18 +134448,18 @@
number < 67108864
? ((this.words = [67108863 & number]), (this.length = 1))
: number < 4503599627370496
- ? ((this.words = [
- 67108863 & number,
- (number / 67108864) & 67108863,
- ]),
- (this.length = 2))
- : (assert(number < 9007199254740992),
- (this.words = [
- 67108863 & number,
- (number / 67108864) & 67108863,
- 1,
- ]),
- (this.length = 3)),
+ ? ((this.words = [
+ 67108863 & number,
+ (number / 67108864) & 67108863,
+ ]),
+ (this.length = 2))
+ : (assert(number < 9007199254740992),
+ (this.words = [
+ 67108863 & number,
+ (number / 67108864) & 67108863,
+ 1,
+ ]),
+ (this.length = 3)),
'le' === endian &&
this._initArray(this.toArray(), base, endian);
}),
@@ -134298,12 +134732,12 @@
2 === this.length
? (ret += 67108864 * this.words[1])
: 3 === this.length && 1 === this.words[2]
- ? (ret += 4503599627370496 + 67108864 * this.words[1])
- : this.length > 2 &&
- assert(
- !1,
- 'Number can only safely store up to 53 bits'
- ),
+ ? (ret += 4503599627370496 + 67108864 * this.words[1])
+ : this.length > 2 &&
+ assert(
+ !1,
+ 'Number can only safely store up to 53 bits'
+ ),
0 !== this.negative ? -ret : ret
);
}),
@@ -134547,13 +134981,13 @@
(num.negative ^= 1),
res)
: 0 === num.negative && 0 !== this.negative
- ? ((this.negative = 0),
- (res = num.sub(this)),
- (this.negative = 1),
- res)
- : this.length > num.length
- ? this.clone().iadd(num)
- : num.clone().iadd(this);
+ ? ((this.negative = 0),
+ (res = num.sub(this)),
+ (this.negative = 1),
+ res)
+ : this.length > num.length
+ ? this.clone().iadd(num)
+ : num.clone().iadd(this);
}),
(BN.prototype.isub = function(num) {
if (0 !== num.negative) {
@@ -135393,10 +135827,10 @@
return 10 === this.length && 10 === num.length
? comb10MulTo(this, num, out)
: len < 63
- ? smallMulTo(this, num, out)
- : len < 1024
- ? bigMulTo(this, num, out)
- : jumboMulTo(this, num, out);
+ ? smallMulTo(this, num, out)
+ : len < 1024
+ ? bigMulTo(this, num, out)
+ : jumboMulTo(this, num, out);
}),
(FFTM.prototype.makeRBT = function(N) {
for (
@@ -135422,8 +135856,8 @@
for (var s = 1; s < N; s <<= 1)
for (
var l = s << 1,
- rtwdf = Math.cos(2 * Math.PI / l),
- itwdf = Math.sin(2 * Math.PI / l),
+ rtwdf = Math.cos((2 * Math.PI) / l),
+ itwdf = Math.sin((2 * Math.PI) / l),
p = 0;
p < N;
p += l
@@ -135607,7 +136041,7 @@
(BN.prototype.iushrn = function(bits, hint, extended) {
assert('number' == typeof bits && bits >= 0);
var h;
- h = hint ? (hint - hint % 26) / 26 : 0;
+ h = hint ? (hint - (hint % 26)) / 26 : 0;
var r = bits % 26,
s = Math.min((bits - r) / 26, this.length),
mask = 67108863 ^ ((67108863 >>> r) << r),
@@ -135692,15 +136126,15 @@
num < 0
? this.isubn(-num)
: 0 !== this.negative
- ? 1 === this.length && (0 | this.words[0]) < num
- ? ((this.words[0] = num - (0 | this.words[0])),
- (this.negative = 0),
- this)
- : ((this.negative = 0),
- this.isubn(num),
- (this.negative = 1),
- this)
- : this._iaddn(num)
+ ? 1 === this.length && (0 | this.words[0]) < num
+ ? ((this.words[0] = num - (0 | this.words[0])),
+ (this.negative = 0),
+ this)
+ : ((this.negative = 0),
+ this.isubn(num),
+ (this.negative = 1),
+ this)
+ : this._iaddn(num)
);
}),
(BN.prototype._iaddn = function(num) {
@@ -135822,30 +136256,37 @@
positive && 0 !== mod.negative && mod.iadd(num)),
{ div: div, mod: mod })
: 0 === this.negative && 0 !== num.negative
- ? ((res = this.divmod(num.neg(), mode)),
- 'mod' !== mode && (div = res.div.neg()),
- { div: div, mod: res.mod })
- : 0 != (this.negative & num.negative)
- ? ((res = this.neg().divmod(num.neg(), mode)),
- 'div' !== mode &&
- ((mod = res.mod.neg()),
- positive && 0 !== mod.negative && mod.isub(num)),
- { div: res.div, mod: mod })
- : num.length > this.length || this.cmp(num) < 0
- ? { div: new BN(0), mod: this }
- : 1 === num.length
- ? 'div' === mode
- ? { div: this.divn(num.words[0]), mod: null }
- : 'mod' === mode
- ? {
- div: null,
- mod: new BN(this.modn(num.words[0])),
- }
- : {
- div: this.divn(num.words[0]),
- mod: new BN(this.modn(num.words[0])),
- }
- : this._wordDiv(num, mode);
+ ? ((res = this.divmod(num.neg(), mode)),
+ 'mod' !== mode && (div = res.div.neg()),
+ { div: div, mod: res.mod })
+ : 0 != (this.negative & num.negative)
+ ? ((res = this.neg().divmod(num.neg(), mode)),
+ 'div' !== mode &&
+ ((mod = res.mod.neg()),
+ positive && 0 !== mod.negative && mod.isub(num)),
+ { div: res.div, mod: mod })
+ : num.length > this.length || this.cmp(num) < 0
+ ? { div: new BN(0), mod: this }
+ : 1 === num.length
+ ? 'div' === mode
+ ? {
+ div: this.divn(num.words[0]),
+ mod: null,
+ }
+ : 'mod' === mode
+ ? {
+ div: null,
+ mod: new BN(
+ this.modn(num.words[0])
+ ),
+ }
+ : {
+ div: this.divn(num.words[0]),
+ mod: new BN(
+ this.modn(num.words[0])
+ ),
+ }
+ : this._wordDiv(num, mode);
}),
(BN.prototype.div = function(num) {
return this.divmod(num, 'div', !1).div;
@@ -135865,7 +136306,9 @@
cmp = mod.cmp(half);
return cmp < 0 || (1 === r2 && 0 === cmp)
? dm.div
- : 0 !== dm.div.negative ? dm.div.isubn(1) : dm.div.iaddn(1);
+ : 0 !== dm.div.negative
+ ? dm.div.isubn(1)
+ : dm.div.iaddn(1);
}),
(BN.prototype.modn = function(num) {
assert(num <= 67108863);
@@ -136214,7 +136657,9 @@
return (
0 === cmp
? ((r.words[0] = 0), (r.length = 1))
- : cmp > 0 ? r.isub(this.p) : r.strip(),
+ : cmp > 0
+ ? r.isub(this.p)
+ : r.strip(),
r
);
}),
@@ -136777,7 +137222,7 @@
(module.exports = StreamCipher),
(StreamCipher.prototype._update = function(chunk) {
if (!this._called && this._alen) {
- var rump = 16 - this._alen % 16;
+ var rump = 16 - (this._alen % 16);
rump < 16 &&
((rump = new Buffer(rump)).fill(0),
this._ghash.update(rump));
@@ -136891,8 +137336,8 @@
return 'stream' === config.type
? new StreamCipher(modelist[config.mode], password, iv, !0)
: 'auth' === config.type
- ? new AuthCipher(modelist[config.mode], password, iv, !0)
- : new Decipher(modelist[config.mode], password, iv);
+ ? new AuthCipher(modelist[config.mode], password, iv, !0)
+ : new Decipher(modelist[config.mode], password, iv);
}
var aes = require('./aes'),
Transform = require('cipher-base'),
@@ -137012,8 +137457,8 @@
return 'stream' === config.type
? new StreamCipher(modelist[config.mode], password, iv)
: 'auth' === config.type
- ? new AuthCipher(modelist[config.mode], password, iv)
- : new Cipher(modelist[config.mode], password, iv);
+ ? new AuthCipher(modelist[config.mode], password, iv)
+ : new Cipher(modelist[config.mode], password, iv);
}
var aes = require('./aes'),
Transform = require('cipher-base'),
@@ -137154,7 +137599,7 @@
) {
for (
- 0 != (this.state[~~(i / 8)] & (1 << (7 - i % 8))) &&
+ 0 != (this.state[~~(i / 8)] & (1 << (7 - (i % 8)))) &&
(Zi = xor(Zi, Vi)),
lsb_Vi = 0 != (1 & Vi[3]),
j = 3;
@@ -137422,7 +137867,7 @@
for (var pad, bit, value, i = -1, out = 0; ++i < 8; )
(pad = self._cipher.encryptBlock(self._prev)),
(bit = byteParam & (1 << (7 - i)) ? 128 : 0),
- (out += (128 & (value = pad[0] ^ bit)) >> (i % 8)),
+ (out += (128 & (value = pad[0] ^ bit)) >> i % 8),
(self._prev = shiftIn(self._prev, decrypt ? bit : value));
return out;
}
@@ -138210,18 +138655,20 @@
strategy,
dictionary
) {
- switch (((this.windowBits = windowBits),
- (this.level = level),
- (this.memLevel = memLevel),
- (this.strategy = strategy),
- (this.mode !== exports.GZIP && this.mode !== exports.GUNZIP) ||
- (this.windowBits += 16),
- this.mode === exports.UNZIP && (this.windowBits += 32),
- (this.mode !== exports.DEFLATERAW &&
- this.mode !== exports.INFLATERAW) ||
- (this.windowBits = -this.windowBits),
- (this.strm = new zstream()),
- this.mode)) {
+ switch (
+ ((this.windowBits = windowBits),
+ (this.level = level),
+ (this.memLevel = memLevel),
+ (this.strategy = strategy),
+ (this.mode !== exports.GZIP && this.mode !== exports.GUNZIP) ||
+ (this.windowBits += 16),
+ this.mode === exports.UNZIP && (this.windowBits += 32),
+ (this.mode !== exports.DEFLATERAW &&
+ this.mode !== exports.INFLATERAW) ||
+ (this.windowBits = -this.windowBits),
+ (this.strm = new zstream()),
+ this.mode)
+ ) {
case exports.DEFLATE:
case exports.GZIP:
case exports.DEFLATERAW:
@@ -138327,13 +138774,15 @@
((input = new Buffer(0)), (in_len = 0), (in_off = 0)),
out._set ? (out.set = out._set) : (out.set = bufferSet);
var strm = this.strm;
- switch (((strm.avail_in = in_len),
- (strm.input = input),
- (strm.next_in = in_off),
- (strm.avail_out = out_len),
- (strm.output = out),
- (strm.next_out = out_off),
- this.mode)) {
+ switch (
+ ((strm.avail_in = in_len),
+ (strm.input = input),
+ (strm.next_in = in_off),
+ (strm.avail_out = out_len),
+ (strm.output = out),
+ (strm.next_out = out_off),
+ this.mode)
+ ) {
case exports.DEFLATE:
case exports.GZIP:
case exports.DEFLATERAW:
@@ -138938,8 +139387,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ buffer: 623 },
@@ -138987,8 +139438,8 @@
return value instanceof ArrayBuffer
? fromArrayBuffer(value, encodingOrOffset, length)
: 'string' == typeof value
- ? fromString(value, encodingOrOffset)
- : fromObject(value);
+ ? fromString(value, encodingOrOffset)
+ : fromObject(value);
}
function assertSize(size) {
if ('number' != typeof size)
@@ -139001,10 +139452,10 @@
size <= 0
? createBuffer(size)
: void 0 !== fill
- ? 'string' == typeof encoding
- ? createBuffer(size).fill(fill, encoding)
- : createBuffer(size).fill(fill)
- : createBuffer(size)
+ ? 'string' == typeof encoding
+ ? createBuffer(size).fill(fill, encoding)
+ : createBuffer(size).fill(fill)
+ : createBuffer(size)
);
}
function allocUnsafe(size) {
@@ -139044,8 +139495,8 @@
void 0 === byteOffset && void 0 === length
? new Uint8Array(array)
: void 0 === length
- ? new Uint8Array(array, byteOffset)
- : new Uint8Array(array, byteOffset, length)),
+ ? new Uint8Array(array, byteOffset)
+ : new Uint8Array(array, byteOffset, length)),
(buf.__proto__ = Buffer.prototype),
buf
);
@@ -139152,8 +139603,8 @@
('string' == typeof byteOffset
? ((encoding = byteOffset), (byteOffset = 0))
: byteOffset > 2147483647
- ? (byteOffset = 2147483647)
- : byteOffset < -2147483648 && (byteOffset = -2147483648),
+ ? (byteOffset = 2147483647)
+ : byteOffset < -2147483648 && (byteOffset = -2147483648),
(byteOffset = +byteOffset),
numberIsNaN(byteOffset) && (byteOffset = dir ? 0 : buffer.length - 1),
byteOffset < 0 && (byteOffset = buffer.length + byteOffset),
@@ -139177,12 +139628,12 @@
(val &= 255),
'function' == typeof Uint8Array.prototype.indexOf
? dir
- ? Uint8Array.prototype.indexOf.call(buffer, val, byteOffset)
- : Uint8Array.prototype.lastIndexOf.call(
- buffer,
- val,
- byteOffset
- )
+ ? Uint8Array.prototype.indexOf.call(buffer, val, byteOffset)
+ : Uint8Array.prototype.lastIndexOf.call(
+ buffer,
+ val,
+ byteOffset
+ )
: arrayIndexOf(buffer, [val], byteOffset, encoding, dir)
);
throw new TypeError('val must be string, number or Buffer');
@@ -139290,7 +139741,11 @@
bytesPerSequence =
firstByte > 239
? 4
- : firstByte > 223 ? 3 : firstByte > 191 ? 2 : 1;
+ : firstByte > 223
+ ? 3
+ : firstByte > 191
+ ? 2
+ : 1;
if (i + bytesPerSequence <= end) {
var secondByte, thirdByte, fourthByte, tempCodePoint;
switch (bytesPerSequence) {
@@ -139678,8 +140133,8 @@
return 0 === length
? ''
: 0 === arguments.length
- ? utf8Slice(this, 0, length)
- : slowToString.apply(this, arguments);
+ ? utf8Slice(this, 0, length)
+ : slowToString.apply(this, arguments);
}),
(Buffer.prototype.equals = function(b) {
if (!Buffer.isBuffer(b))
@@ -140596,8 +141051,8 @@
return 'md5' === (alg = alg.toLowerCase())
? new HashNoConstructor(md5)
: 'rmd160' === alg || 'ripemd160' === alg
- ? new HashNoConstructor(rmd160)
- : new Hash(sha(alg));
+ ? new HashNoConstructor(rmd160)
+ : new Hash(sha(alg));
});
}.call(this, require('buffer').Buffer));
},
@@ -140616,7 +141071,7 @@
'use strict';
function toArray(buf, bigEndian) {
if (buf.length % intSize != 0) {
- var len = buf.length + (intSize - buf.length % intSize);
+ var len = buf.length + (intSize - (buf.length % intSize));
buf = Buffer.concat([buf, zeroBuffer], len);
}
for (
@@ -140662,8 +141117,7 @@
function(require, module, exports) {
'use strict';
function core_md5(x, len) {
- (x[len >> 5] |= 128 << (len % 32)),
- (x[14 + (((len + 64) >>> 9) << 4)] = len);
+ (x[len >> 5] |= 128 << len % 32), (x[14 + (((len + 64) >>> 9) << 4)] = len);
for (
var a = 1732584193,
b = -271733879,
@@ -141451,8 +141905,8 @@
return 0 === data.length
? []
: 'decrypt' === this.type
- ? this._updateDecrypt(data)
- : this._updateEncrypt(data);
+ ? this._updateDecrypt(data)
+ : this._updateEncrypt(data);
}),
(Cipher.prototype._buffer = function(data, off) {
for (
@@ -141484,7 +141938,7 @@
this.bufferOff === this.buffer.length &&
(outputOff += this._flushBuffer(out, outputOff)));
for (
- var max = data.length - (data.length - inputOff) % this.blockSize;
+ var max = data.length - ((data.length - inputOff) % this.blockSize);
inputOff < max;
inputOff += this.blockSize
)
@@ -143020,8 +143474,8 @@
),
this._events[type]
? isObject(this._events[type])
- ? this._events[type].push(listener)
- : (this._events[type] = [this._events[type], listener])
+ ? this._events[type].push(listener)
+ : (this._events[type] = [this._events[type], listener])
: (this._events[type] = listener),
isObject(this._events[type]) &&
!this._events[type].warned &&
@@ -143112,8 +143566,8 @@
(EventEmitter.prototype.listeners = function(type) {
return this._events && this._events[type]
? isFunction(this._events[type])
- ? [this._events[type]]
- : this._events[type].slice()
+ ? [this._events[type]]
+ : this._events[type].slice()
: [];
}),
(EventEmitter.prototype.listenerCount = function(type) {
@@ -143234,7 +143688,7 @@
(BlockHash.prototype._pad = function() {
var len = this.pendingTotal,
bytes = this._delta8,
- k = bytes - (len + this.padLength) % bytes,
+ k = bytes - ((len + this.padLength) % bytes),
res = new Array(k + this.padLength);
res[0] = 128;
for (var i = 1; i < k; i++) res[i] = 0;
@@ -143309,24 +143763,34 @@
return j <= 15
? x ^ y ^ z
: j <= 31
- ? (x & y) | (~x & z)
- : j <= 47
- ? (x | ~y) ^ z
- : j <= 63 ? (x & z) | (y & ~z) : x ^ (y | ~z);
+ ? (x & y) | (~x & z)
+ : j <= 47
+ ? (x | ~y) ^ z
+ : j <= 63
+ ? (x & z) | (y & ~z)
+ : x ^ (y | ~z);
}
function K(j) {
return j <= 15
? 0
: j <= 31
- ? 1518500249
- : j <= 47 ? 1859775393 : j <= 63 ? 2400959708 : 2840853838;
+ ? 1518500249
+ : j <= 47
+ ? 1859775393
+ : j <= 63
+ ? 2400959708
+ : 2840853838;
}
function Kh(j) {
return j <= 15
? 1352829926
: j <= 31
- ? 1548603684
- : j <= 47 ? 1836072691 : j <= 63 ? 2053994217 : 0;
+ ? 1548603684
+ : j <= 47
+ ? 1836072691
+ : j <= 63
+ ? 2053994217
+ : 0;
}
var hash = require('../hash'),
utils = hash.utils,
@@ -143838,7 +144302,11 @@
function ft_1(s, x, y, z) {
return 0 === s
? ch32(x, y, z)
- : 1 === s || 3 === s ? p32(x, y, z) : 2 === s ? maj32(x, y, z) : void 0;
+ : 1 === s || 3 === s
+ ? p32(x, y, z)
+ : 2 === s
+ ? maj32(x, y, z)
+ : void 0;
}
function ch64_hi(xh, xl, yh, yl, zh, zl) {
var r = (xh & yh) ^ (~xh & zh);
@@ -144398,16 +144866,18 @@
return 7 === word.length
? '0' + word
: 6 === word.length
- ? '00' + word
- : 5 === word.length
- ? '000' + word
- : 4 === word.length
- ? '0000' + word
- : 3 === word.length
- ? '00000' + word
- : 2 === word.length
- ? '000000' + word
- : 1 === word.length ? '0000000' + word : word;
+ ? '00' + word
+ : 5 === word.length
+ ? '000' + word
+ : 4 === word.length
+ ? '0000' + word
+ : 3 === word.length
+ ? '00000' + word
+ : 2 === word.length
+ ? '000000' + word
+ : 1 === word.length
+ ? '0000000' + word
+ : word;
}
function assert(cond, msg) {
if (!cond) throw new Error(msg || 'Assertion failed');
@@ -144647,7 +145117,7 @@
);
if (0 === e) e = 1 - eBias;
else {
- if (e === eMax) return m ? NaN : 1 / 0 * (s ? -1 : 1);
+ if (e === eMax) return m ? NaN : (1 / 0) * (s ? -1 : 1);
(m += Math.pow(2, mLen)), (e -= eBias);
}
return (s ? -1 : 1) * m * Math.pow(2, e - mLen);
@@ -144678,13 +145148,13 @@
e + eBias >= eMax
? ((m = 0), (e = eMax))
: e + eBias >= 1
- ? ((m = (value * c - 1) * Math.pow(2, mLen)),
- (e += eBias))
- : ((m =
- value *
- Math.pow(2, eBias - 1) *
- Math.pow(2, mLen)),
- (e = 0)));
+ ? ((m = (value * c - 1) * Math.pow(2, mLen)),
+ (e += eBias))
+ : ((m =
+ value *
+ Math.pow(2, eBias - 1) *
+ Math.pow(2, mLen)),
+ (e = 0)));
mLen >= 8;
buffer[offset + i] = 255 & m, i += d, m /= 256, mLen -= 8
);
@@ -144848,7 +145318,9 @@
(exports.shrinkBuf = function(buf, size) {
return buf.length === size
? buf
- : buf.subarray ? buf.subarray(0, size) : ((buf.length = size), buf);
+ : buf.subarray
+ ? buf.subarray(0, size)
+ : ((buf.length = size), buf);
});
var fnTyped = {
arraySet: function(dest, src, src_offs, len, dest_offs) {
@@ -145216,8 +145688,8 @@
? (flush_block_only(s, !0),
0 === s.strm.avail_out ? BS_FINISH_STARTED : BS_FINISH_DONE)
: s.last_lit && (flush_block_only(s, !1), 0 === s.strm.avail_out)
- ? BS_NEED_MORE
- : BS_BLOCK_DONE
+ ? BS_NEED_MORE
+ : BS_BLOCK_DONE
);
}
function deflate_slow(s, flush) {
@@ -145298,8 +145770,8 @@
? (flush_block_only(s, !0),
0 === s.strm.avail_out ? BS_FINISH_STARTED : BS_FINISH_DONE)
: s.last_lit && (flush_block_only(s, !1), 0 === s.strm.avail_out)
- ? BS_NEED_MORE
- : BS_BLOCK_DONE
+ ? BS_NEED_MORE
+ : BS_BLOCK_DONE
);
}
function deflate_rle(s, flush) {
@@ -145355,8 +145827,8 @@
? (flush_block_only(s, !0),
0 === s.strm.avail_out ? BS_FINISH_STARTED : BS_FINISH_DONE)
: s.last_lit && (flush_block_only(s, !1), 0 === s.strm.avail_out)
- ? BS_NEED_MORE
- : BS_BLOCK_DONE
+ ? BS_NEED_MORE
+ : BS_BLOCK_DONE
);
}
function deflate_huff(s, flush) {
@@ -145380,8 +145852,8 @@
? (flush_block_only(s, !0),
0 === s.strm.avail_out ? BS_FINISH_STARTED : BS_FINISH_DONE)
: s.last_lit && (flush_block_only(s, !1), 0 === s.strm.avail_out)
- ? BS_NEED_MORE
- : BS_BLOCK_DONE
+ ? BS_NEED_MORE
+ : BS_BLOCK_DONE
);
}
function Config(good_length, max_lazy, nice_length, max_chain, func) {
@@ -145652,8 +146124,8 @@
(exports.deflateSetHeader = function(strm, head) {
return strm && strm.state
? 2 !== strm.state.wrap
- ? Z_STREAM_ERROR
- : ((strm.state.gzhead = head), Z_OK)
+ ? Z_STREAM_ERROR
+ : ((strm.state.gzhead = head), Z_OK)
: Z_STREAM_ERROR;
}),
(exports.deflate = function(strm, flush) {
@@ -145699,8 +146171,8 @@
9 === s.level
? 2
: s.strategy >= Z_HUFFMAN_ONLY || s.level < 2
- ? 4
- : 0
+ ? 4
+ : 0
),
put_byte(s, 255 & s.gzhead.os),
s.gzhead.extra &&
@@ -145726,8 +146198,8 @@
9 === s.level
? 2
: s.strategy >= Z_HUFFMAN_ONLY || s.level < 2
- ? 4
- : 0
+ ? 4
+ : 0
),
put_byte(s, OS_CODE),
(s.status = BUSY_STATE));
@@ -145736,9 +146208,13 @@
(header |=
(s.strategy >= Z_HUFFMAN_ONLY || s.level < 2
? 0
- : s.level < 6 ? 1 : 6 === s.level ? 2 : 3) << 6),
+ : s.level < 6
+ ? 1
+ : 6 === s.level
+ ? 2
+ : 3) << 6),
0 !== s.strstart && (header |= PRESET_DICT),
- (header += 31 - header % 31),
+ (header += 31 - (header % 31)),
(s.status = BUSY_STATE),
putShortMSB(s, header),
0 !== s.strstart &&
@@ -145883,8 +146359,8 @@
s.strategy === Z_HUFFMAN_ONLY
? deflate_huff(s, flush)
: s.strategy === Z_RLE
- ? deflate_rle(s, flush)
- : configuration_table[s.level].func(s, flush);
+ ? deflate_rle(s, flush)
+ : configuration_table[s.level].func(s, flush);
if (
((bstate !== BS_FINISH_STARTED && bstate !== BS_FINISH_DONE) ||
(s.status = FINISH_STATE),
@@ -145911,21 +146387,21 @@
return flush !== Z_FINISH
? Z_OK
: s.wrap <= 0
- ? Z_STREAM_END
- : (2 === s.wrap
- ? (put_byte(s, 255 & strm.adler),
- put_byte(s, (strm.adler >> 8) & 255),
- put_byte(s, (strm.adler >> 16) & 255),
- put_byte(s, (strm.adler >> 24) & 255),
- put_byte(s, 255 & strm.total_in),
- put_byte(s, (strm.total_in >> 8) & 255),
- put_byte(s, (strm.total_in >> 16) & 255),
- put_byte(s, (strm.total_in >> 24) & 255))
- : (putShortMSB(s, strm.adler >>> 16),
- putShortMSB(s, 65535 & strm.adler)),
- flush_pending(strm),
- s.wrap > 0 && (s.wrap = -s.wrap),
- 0 !== s.pending ? Z_OK : Z_STREAM_END);
+ ? Z_STREAM_END
+ : (2 === s.wrap
+ ? (put_byte(s, 255 & strm.adler),
+ put_byte(s, (strm.adler >> 8) & 255),
+ put_byte(s, (strm.adler >> 16) & 255),
+ put_byte(s, (strm.adler >> 24) & 255),
+ put_byte(s, 255 & strm.total_in),
+ put_byte(s, (strm.total_in >> 8) & 255),
+ put_byte(s, (strm.total_in >> 16) & 255),
+ put_byte(s, (strm.total_in >> 24) & 255))
+ : (putShortMSB(s, strm.adler >>> 16),
+ putShortMSB(s, 65535 & strm.adler)),
+ flush_pending(strm),
+ s.wrap > 0 && (s.wrap = -s.wrap),
+ 0 !== s.pending ? Z_OK : Z_STREAM_END);
}),
(exports.deflateEnd = function(strm) {
var status;
@@ -145937,9 +146413,9 @@
status !== HCRC_STATE &&
status !== BUSY_STATE &&
status !== FINISH_STATE
- ? err(strm, Z_STREAM_ERROR)
- : ((strm.state = null),
- status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK)
+ ? err(strm, Z_STREAM_ERROR)
+ : ((strm.state = null),
+ status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK)
: Z_STREAM_ERROR;
}),
(exports.deflateSetDictionary = function(strm, dictionary) {
@@ -146803,10 +147279,12 @@
if (0 === have) break inf_leave;
have--, (hold += input[next++] << bits), (bits += 8);
}
- switch (((state.last = 1 & hold),
- (hold >>>= 1),
- (bits -= 1),
- 3 & hold)) {
+ switch (
+ ((state.last = 1 & hold),
+ (hold >>>= 1),
+ (bits -= 1),
+ 3 & hold)
+ ) {
case 0:
state.mode = STORED;
break;
@@ -147378,8 +147856,8 @@
var state;
return strm && strm.state
? 0 == (2 & (state = strm.state).wrap)
- ? Z_STREAM_ERROR
- : ((state.head = head), (head.done = !1), Z_OK)
+ ? Z_STREAM_ERROR
+ : ((state.head = head), (head.done = !1), Z_OK)
: Z_STREAM_ERROR;
}),
(exports.inflateSetDictionary = function(strm, dictionary) {
@@ -147388,15 +147866,15 @@
dictLength = dictionary.length;
return strm && strm.state
? 0 !== (state = strm.state).wrap && state.mode !== DICT
- ? Z_STREAM_ERROR
- : state.mode === DICT &&
- ((dictid = 1),
- (dictid = adler32(dictid, dictionary, dictLength, 0)) !==
- state.check)
- ? Z_DATA_ERROR
- : updatewindow(strm, dictionary, dictLength, dictLength)
- ? ((state.mode = MEM), Z_MEM_ERROR)
- : ((state.havedict = 1), Z_OK)
+ ? Z_STREAM_ERROR
+ : state.mode === DICT &&
+ ((dictid = 1),
+ (dictid = adler32(dictid, dictionary, dictLength, 0)) !==
+ state.check)
+ ? Z_DATA_ERROR
+ : updatewindow(strm, dictionary, dictLength, dictLength)
+ ? ((state.mode = MEM), Z_MEM_ERROR)
+ : ((state.havedict = 1), Z_OK)
: Z_STREAM_ERROR;
}),
(exports.inflateInfo = 'pako inflate (from Nodeca project)');
@@ -147606,12 +148084,12 @@
(0 === type
? ((base = extra = work), (end = 19))
: 1 === type
- ? ((base = lbase),
- (base_index -= 257),
- (extra = lext),
- (extra_index -= 257),
- (end = 256))
- : ((base = dbase), (extra = dext), (end = -1)),
+ ? ((base = lbase),
+ (base_index -= 257),
+ (extra = lext),
+ (extra_index -= 257),
+ (end = 256))
+ : ((base = dbase), (extra = dext), (end = -1)),
(huff = 0),
(sym = 0),
(len = min),
@@ -147630,9 +148108,9 @@
work[sym] < end
? ((here_op = 0), (here_val = work[sym]))
: work[sym] > end
- ? ((here_op = extra[extra_index + work[sym]]),
- (here_val = base[base_index + work[sym]]))
- : ((here_op = 96), (here_val = 0)),
+ ? ((here_op = extra[extra_index + work[sym]]),
+ (here_val = base[base_index + work[sym]]))
+ : ((here_op = 96), (here_val = 0)),
(incr = 1 << (len - drop)),
(min = fill = 1 << curr);
do {
@@ -147997,18 +148475,18 @@
(count < min_count
? (s.bl_tree[2 * curlen] += count)
: 0 !== curlen
- ? (curlen !== prevlen && s.bl_tree[2 * curlen]++,
- s.bl_tree[2 * REP_3_6]++)
- : count <= 10
- ? s.bl_tree[2 * REPZ_3_10]++
- : s.bl_tree[2 * REPZ_11_138]++,
+ ? (curlen !== prevlen && s.bl_tree[2 * curlen]++,
+ s.bl_tree[2 * REP_3_6]++)
+ : count <= 10
+ ? s.bl_tree[2 * REPZ_3_10]++
+ : s.bl_tree[2 * REPZ_11_138]++,
(count = 0),
(prevlen = curlen),
0 === nextlen
? ((max_count = 138), (min_count = 3))
: curlen === nextlen
- ? ((max_count = 6), (min_count = 3))
- : ((max_count = 7), (min_count = 4)));
+ ? ((max_count = 6), (min_count = 3))
+ : ((max_count = 7), (min_count = 4)));
}
function send_tree(s, tree, max_code) {
var n,
@@ -148039,17 +148517,17 @@
send_code(s, REP_3_6, s.bl_tree),
send_bits(s, count - 3, 2))
: count <= 10
- ? (send_code(s, REPZ_3_10, s.bl_tree),
- send_bits(s, count - 3, 3))
- : (send_code(s, REPZ_11_138, s.bl_tree),
- send_bits(s, count - 11, 7));
+ ? (send_code(s, REPZ_3_10, s.bl_tree),
+ send_bits(s, count - 3, 3))
+ : (send_code(s, REPZ_11_138, s.bl_tree),
+ send_bits(s, count - 11, 7));
(count = 0),
(prevlen = curlen),
0 === nextlen
? ((max_count = 138), (min_count = 3))
: curlen === nextlen
- ? ((max_count = 6), (min_count = 3))
- : ((max_count = 7), (min_count = 4));
+ ? ((max_count = 6), (min_count = 3))
+ : ((max_count = 7), (min_count = 4));
}
}
function build_bl_tree(s) {
@@ -148241,16 +148719,16 @@
stored_len + 4 <= opt_lenb && -1 !== buf
? _tr_stored_block(s, buf, stored_len, last)
: s.strategy === Z_FIXED || static_lenb === opt_lenb
- ? (send_bits(s, (STATIC_TREES << 1) + (last ? 1 : 0), 3),
- compress_block(s, static_ltree, static_dtree))
- : (send_bits(s, (DYN_TREES << 1) + (last ? 1 : 0), 3),
- send_all_trees(
- s,
- s.l_desc.max_code + 1,
- s.d_desc.max_code + 1,
- max_blindex + 1
- ),
- compress_block(s, s.dyn_ltree, s.dyn_dtree)),
+ ? (send_bits(s, (STATIC_TREES << 1) + (last ? 1 : 0), 3),
+ compress_block(s, static_ltree, static_dtree))
+ : (send_bits(s, (DYN_TREES << 1) + (last ? 1 : 0), 3),
+ send_all_trees(
+ s,
+ s.l_desc.max_code + 1,
+ s.d_desc.max_code + 1,
+ max_blindex + 1
+ ),
+ compress_block(s, s.dyn_ltree, s.dyn_dtree)),
init_block(s),
last && bi_windup(s);
}),
@@ -148589,8 +149067,10 @@
ndata = asn1.certificate.decode(data, 'der').tbsCertificate
.subjectPublicKeyInfo;
case 'PUBLIC KEY':
- switch ((ndata || (ndata = asn1.PublicKey.decode(data, 'der')),
- (subtype = ndata.algorithm.algorithm.join('.')))) {
+ switch (
+ (ndata || (ndata = asn1.PublicKey.decode(data, 'der')),
+ (subtype = ndata.algorithm.algorithm.join('.')))
+ ) {
case '1.2.840.113549.1.1.1':
return asn1.RSAPublicKey.decode(
ndata.subjectPublicKey.data,
@@ -148619,8 +149099,10 @@
password
);
case 'PRIVATE KEY':
- switch (((ndata = asn1.PrivateKey.decode(data, 'der')),
- (subtype = ndata.algorithm.algorithm.join('.')))) {
+ switch (
+ ((ndata = asn1.PrivateKey.decode(data, 'der')),
+ (subtype = ndata.algorithm.algorithm.join('.')))
+ ) {
case '1.2.840.113549.1.1.1':
return asn1.RSAPrivateKey.decode(
ndata.subjectPrivateKey,
@@ -148712,8 +149194,8 @@
'.' === last
? parts.splice(i, 1)
: '..' === last
- ? (parts.splice(i, 1), up++)
- : up && (parts.splice(i, 1), up--);
+ ? (parts.splice(i, 1), up++)
+ : up && (parts.splice(i, 1), up--);
}
if (allowAboveRoot) for (; up--; up) parts.unshift('..');
return parts;
@@ -149415,10 +149897,10 @@
value <= 56319 &&
counter < length
? 56320 == (64512 & (extra = string.charCodeAt(counter++)))
- ? output.push(
- ((1023 & value) << 10) + (1023 & extra) + 65536
- )
- : (output.push(value), counter--)
+ ? output.push(
+ ((1023 & value) << 10) + (1023 & extra) + 65536
+ )
+ : (output.push(value), counter--)
: output.push(value);
return output;
}
@@ -149439,8 +149921,10 @@
return codePoint - 48 < 10
? codePoint - 22
: codePoint - 65 < 26
- ? codePoint - 65
- : codePoint - 97 < 26 ? codePoint - 97 : base;
+ ? codePoint - 65
+ : codePoint - 97 < 26
+ ? codePoint - 97
+ : base;
}
function digitToBasic(digit, flag) {
return digit + 22 + 75 * (digit < 26) - ((0 != flag) << 5);
@@ -149454,7 +149938,7 @@
k += base
)
delta = floor(delta / baseMinusTMin);
- return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+ return floor(k + ((baseMinusTMin + 1) * delta) / (delta + skew));
}
function decode(input) {
var out,
@@ -149492,7 +149976,9 @@
(t =
k <= bias
? tMin
- : k >= bias + tMax ? tMax : k - bias),
+ : k >= bias + tMax
+ ? tMax
+ : k - bias),
!(digit < t);
k += base
)
@@ -149568,7 +150054,9 @@
(t =
k <= bias
? tMin
- : k >= bias + tMax ? tMax : k - bias),
+ : k >= bias + tMax
+ ? tMax
+ : k - bias),
!(q < t);
k += base
)
@@ -149577,7 +150065,7 @@
output.push(
stringFromCharCode(
digitToBasic(
- t + qMinusT % baseMinusT,
+ t + (qMinusT % baseMinusT),
0
)
)
@@ -149674,8 +150162,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -149711,7 +150201,9 @@
(k = decodeURIComponent(kstr)),
(v = decodeURIComponent(vstr)),
hasOwnProperty(obj, k)
- ? isArray(obj[k]) ? obj[k].push(v) : (obj[k] = [obj[k], v])
+ ? isArray(obj[k])
+ ? obj[k].push(v)
+ : (obj[k] = [obj[k], v])
: (obj[k] = v);
}
return obj;
@@ -149761,10 +150253,10 @@
: ks + encodeURIComponent(stringifyPrimitive(obj[k]));
}).join(sep)
: name
- ? encodeURIComponent(stringifyPrimitive(name)) +
- eq +
- encodeURIComponent(stringifyPrimitive(obj))
- : ''
+ ? encodeURIComponent(stringifyPrimitive(name)) +
+ eq +
+ encodeURIComponent(stringifyPrimitive(obj))
+ : ''
);
};
var isArray =
@@ -149820,8 +150312,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {},
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {},
require('buffer').Buffer
));
},
@@ -149909,8 +150403,8 @@
return emitter.prependListener(event, fn);
emitter._events && emitter._events[event]
? isArray(emitter._events[event])
- ? emitter._events[event].unshift(fn)
- : (emitter._events[event] = [fn, emitter._events[event]])
+ ? emitter._events[event].unshift(fn)
+ : (emitter._events[event] = [fn, emitter._events[event]])
: emitter.on(event, fn);
}
function ReadableState(options, stream) {
@@ -150023,18 +150517,18 @@
return n <= 0 || (0 === state.length && state.ended)
? 0
: state.objectMode
- ? 1
- : n !== n
- ? state.flowing && state.length
- ? state.buffer.head.data.length
- : state.length
- : (n > state.highWaterMark &&
- (state.highWaterMark = computeNewHighWaterMark(n)),
- n <= state.length
- ? n
- : state.ended
- ? state.length
- : ((state.needReadable = !0), 0));
+ ? 1
+ : n !== n
+ ? state.flowing && state.length
+ ? state.buffer.head.data.length
+ : state.length
+ : (n > state.highWaterMark &&
+ (state.highWaterMark = computeNewHighWaterMark(n)),
+ n <= state.length
+ ? n
+ : state.ended
+ ? state.length
+ : ((state.needReadable = !0), 0));
}
function chunkInvalid(state, chunk) {
var er = null;
@@ -150134,13 +150628,13 @@
state.objectMode
? (ret = state.buffer.shift())
: !n || n >= state.length
- ? ((ret = state.decoder
- ? state.buffer.join('')
- : 1 === state.buffer.length
- ? state.buffer.head.data
- : state.buffer.concat(state.length)),
- state.buffer.clear())
- : (ret = fromListPartial(n, state.buffer, state.decoder)),
+ ? ((ret = state.decoder
+ ? state.buffer.join('')
+ : 1 === state.buffer.length
+ ? state.buffer.head.data
+ : state.buffer.concat(state.length)),
+ state.buffer.clear())
+ : (ret = fromListPartial(n, state.buffer, state.decoder)),
ret
);
}
@@ -150154,8 +150648,8 @@
n === list.head.data.length
? list.shift()
: hasStrings
- ? copyFromBufferString(n, list)
- : copyFromBuffer(n, list)),
+ ? copyFromBufferString(n, list)
+ : copyFromBuffer(n, list)),
ret
);
}
@@ -151159,7 +151653,13 @@
function utf8CheckByte(byte) {
return byte <= 127
? 0
- : byte >> 5 == 6 ? 2 : byte >> 4 == 14 ? 3 : byte >> 3 == 30 ? 4 : -1;
+ : byte >> 5 == 6
+ ? 2
+ : byte >> 4 == 14
+ ? 3
+ : byte >> 3 == 30
+ ? 4
+ : -1;
}
function utf8CheckIncomplete(self, buf, i) {
var j = buf.length - 1;
@@ -151168,15 +151668,16 @@
return nb >= 0
? (nb > 0 && (self.lastNeed = nb - 1), nb)
: --j < i
- ? 0
- : (nb = utf8CheckByte(buf[j])) >= 0
- ? (nb > 0 && (self.lastNeed = nb - 2), nb)
- : --j < i
- ? 0
- : (nb = utf8CheckByte(buf[j])) >= 0
- ? (nb > 0 && (2 === nb ? (nb = 0) : (self.lastNeed = nb - 3)),
- nb)
- : 0;
+ ? 0
+ : (nb = utf8CheckByte(buf[j])) >= 0
+ ? (nb > 0 && (self.lastNeed = nb - 2), nb)
+ : --j < i
+ ? 0
+ : (nb = utf8CheckByte(buf[j])) >= 0
+ ? (nb > 0 &&
+ (2 === nb ? (nb = 0) : (self.lastNeed = nb - 3)),
+ nb)
+ : 0;
}
function utf8CheckExtraBytes(self, buf, p) {
if (128 != (192 & buf[0])) return (self.lastNeed = 0), '�'.repeat(p);
@@ -151193,10 +151694,10 @@
return void 0 !== r
? r
: this.lastNeed <= buf.length
- ? (buf.copy(this.lastChar, p, 0, this.lastNeed),
- this.lastChar.toString(this.encoding, 0, this.lastTotal))
- : (buf.copy(this.lastChar, p, 0, buf.length),
- void (this.lastNeed -= buf.length));
+ ? (buf.copy(this.lastChar, p, 0, this.lastNeed),
+ this.lastChar.toString(this.encoding, 0, this.lastTotal))
+ : (buf.copy(this.lastChar, p, 0, buf.length),
+ void (this.lastNeed -= buf.length));
}
function utf16Text(buf, i) {
if ((buf.length - i) % 2 == 0) {
@@ -151284,7 +151785,9 @@
(i = this.lastNeed), (this.lastNeed = 0);
} else i = 0;
return i < buf.length
- ? r ? r + this.text(buf, i) : this.text(buf, i)
+ ? r
+ ? r + this.text(buf, i)
+ : this.text(buf, i)
: r || '';
}),
(StringDecoder.prototype.end = function(buf) {
@@ -151357,12 +151860,12 @@
(function(Buffer) {
function bytesToWords(bytes) {
for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
- words[b >>> 5] |= bytes[i] << (24 - b % 32);
+ words[b >>> 5] |= bytes[i] << (24 - (b % 32));
return words;
}
function wordsToBytes(words) {
for (var bytes = [], b = 0; b < 32 * words.length; b += 8)
- bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 255);
+ bytes.push((words[b >>> 5] >>> (24 - (b % 32))) & 255);
return bytes;
}
function processBlock(H, M, offset) {
@@ -151386,12 +151889,12 @@
i < 16
? f1(bl, cl, dl) + hl[0]
: i < 32
- ? f2(bl, cl, dl) + hl[1]
- : i < 48
- ? f3(bl, cl, dl) + hl[2]
- : i < 64
- ? f4(bl, cl, dl) + hl[3]
- : f5(bl, cl, dl) + hl[4]),
+ ? f2(bl, cl, dl) + hl[1]
+ : i < 48
+ ? f3(bl, cl, dl) + hl[2]
+ : i < 64
+ ? f4(bl, cl, dl) + hl[3]
+ : f5(bl, cl, dl) + hl[4]),
(t = ((t = rotl((t |= 0), sl[i])) + el) | 0),
(al = el),
(el = dl),
@@ -151403,12 +151906,12 @@
i < 16
? f5(br, cr, dr) + hr[0]
: i < 32
- ? f4(br, cr, dr) + hr[1]
- : i < 48
- ? f3(br, cr, dr) + hr[2]
- : i < 64
- ? f2(br, cr, dr) + hr[3]
- : f1(br, cr, dr) + hr[4]),
+ ? f4(br, cr, dr) + hr[1]
+ : i < 48
+ ? f3(br, cr, dr) + hr[2]
+ : i < 64
+ ? f2(br, cr, dr) + hr[3]
+ : f1(br, cr, dr) + hr[4]),
(t = ((t = rotl((t |= 0), sr[i])) + er) | 0),
(ar = er),
(er = dr),
@@ -151776,7 +152279,7 @@
var m = bytesToWords(message),
nBitsLeft = 8 * message.length,
nBitsTotal = 8 * message.length;
- (m[nBitsLeft >>> 5] |= 128 << (24 - nBitsLeft % 32)),
+ (m[nBitsLeft >>> 5] |= 128 << (24 - (nBitsLeft % 32))),
(m[14 + (((nBitsLeft + 64) >>> 9) << 4)] =
(16711935 & ((nBitsTotal << 8) | (nBitsTotal >>> 24))) |
(4278255360 & ((nBitsTotal << 24) | (nBitsTotal >>> 8))));
@@ -151992,8 +152495,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ './lib/request': 734, 'builtin-status-codes': 624, url: 738, xtend: 745 },
@@ -152055,8 +152560,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -152068,14 +152575,14 @@
return capability.fetch && useFetch
? 'fetch'
: capability.mozchunkedarraybuffer
- ? 'moz-chunked-arraybuffer'
- : capability.msstream
- ? 'ms-stream'
- : capability.arraybuffer && preferBinary
- ? 'arraybuffer'
- : capability.vbArray && preferBinary
- ? 'text:vbarray'
- : 'text';
+ ? 'moz-chunked-arraybuffer'
+ : capability.msstream
+ ? 'ms-stream'
+ : capability.arraybuffer && preferBinary
+ ? 'arraybuffer'
+ : capability.vbArray && preferBinary
+ ? 'text:vbarray'
+ : 'text';
}
function statusValid(xhr) {
try {
@@ -152311,8 +152818,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {},
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {},
require('buffer').Buffer
));
},
@@ -152401,8 +152910,8 @@
(self.headers[key] = []),
self.headers[key].push(matches[2]))
: void 0 !== self.headers[key]
- ? (self.headers[key] += ', ' + matches[2])
- : (self.headers[key] = matches[2]),
+ ? (self.headers[key] += ', ' + matches[2])
+ : (self.headers[key] = matches[2]),
self.rawHeaders.push(matches[1], matches[2]);
}
}),
@@ -152505,8 +153014,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {},
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {},
require('buffer').Buffer
));
},
@@ -152557,11 +153068,13 @@
}
},
StringDecoder = (exports.StringDecoder = function(encoding) {
- switch (((this.encoding = (encoding || 'utf8')
- .toLowerCase()
- .replace(/[-_]/, '')),
- assertEncoding(encoding),
- this.encoding)) {
+ switch (
+ ((this.encoding = (encoding || 'utf8')
+ .toLowerCase()
+ .replace(/[-_]/, '')),
+ assertEncoding(encoding),
+ this.encoding)
+ ) {
case 'utf8':
this.surrogateSize = 3;
break;
@@ -153123,8 +153636,8 @@
'.' === (last = srcPath[i])
? srcPath.splice(i, 1)
: '..' === last
- ? (srcPath.splice(i, 1), up++)
- : up && (srcPath.splice(i, 1), up--);
+ ? (srcPath.splice(i, 1), up++)
+ : up && (srcPath.splice(i, 1), up--);
if (!mustEndAbs && !removeAllDots)
for (; up--; up) srcPath.unshift('..');
!mustEndAbs ||
@@ -153139,7 +153652,9 @@
if (psychotic) {
result.hostname = result.host = isAbsolute
? ''
- : srcPath.length ? srcPath.shift() : '';
+ : srcPath.length
+ ? srcPath.shift()
+ : '';
var authInHost =
!!(result.host && result.host.indexOf('@') > 0) &&
result.host.split('@');
@@ -153226,8 +153741,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{},
@@ -153388,8 +153905,10 @@
return isNumber(value)
? ctx.stylize('' + value, 'number')
: isBoolean(value)
- ? ctx.stylize('' + value, 'boolean')
- : isNull(value) ? ctx.stylize('null', 'null') : void 0;
+ ? ctx.stylize('' + value, 'boolean')
+ : isNull(value)
+ ? ctx.stylize('null', 'null')
+ : void 0;
}
function formatError(value) {
return '[' + Error.prototype.toString.call(value) + ']';
@@ -153710,8 +154229,10 @@
'undefined' != typeof global
? global
: 'undefined' != typeof self
- ? self
- : 'undefined' != typeof window ? window : {}
+ ? self
+ : 'undefined' != typeof window
+ ? window
+ : {}
));
},
{ './support/isBuffer': 742, _process: 697, inherits: 741 },
diff --git a/repcheck/code.js b/repcheck/code.js
deleted file mode 100755
index 6756d885f..000000000
--- a/repcheck/code.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* global $ */
-
-function checker() { // eslint-disable-line
- const name = $('#name')[0].value.replace(/[^A-Za-z0-9_]/gi, '');
- const validNames = ['EtherDeltaZack_twitter', 'EtherDeltaRep1_twitter', 'EtherDeltaRep2_twitter', 'EtherDeltaRep3_twitter', 'EtherDeltaRep4_twitter', 'EtherDeltaUX_twitter'];
- if (validNames.map(x => x.toUpperCase()).indexOf(name.toUpperCase()) >= 0) {
- $('#result').html(`${name.toUpperCase()} is an official EtherDelta representative.`);
- } else {
- $('#result').html(`${name.toUpperCase()} is NOT OFFICIAL.`);
- }
-}
diff --git a/repcheck/index.html b/repcheck/index.html
deleted file mode 100755
index f91717ee8..000000000
--- a/repcheck/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- EtherDelta Representative Checker
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-