diff --git a/.gitignore b/.gitignore index 16ebb09f3..dc101e2e9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,6 @@ cordova/*.keystore cache webkitbuilds/* !webkitbuilds/README.md -!webkitbuilds/setup-win.iss -!webkitbuilds/favicon.ico -!webkitbuilds/.desktop -!webkitbuilds/build-osx.sh -!webkitbuilds/Background.png # chrome extensions chrome-app/build/* @@ -50,7 +45,7 @@ build/Release node_modules bower_components angular-bitcore-wallet-client/angular-bitcore-wallet-client.js -angular-pbkdf2/angular-pbkdf2.js +angular-bitauth/angular-bitauth.js # Users Environment Variables .lock-wscript @@ -105,25 +100,14 @@ externalServices.json cordova/Makefile cordova/ProjectMakefile app-template/bitpay-wallet -cordova/ProjectMakefile cordova/config.xml cordova/wp/Package.appxmanifest -www/img/logo-negative.svg -www/img/logo.svg src/js/appConfig.js src/js/externalServices.js +chrome-app/manifest.json +www/img/app -cordova/Makefile -cordova/ProjectMakefile -app-template/bitpay-wallet -cordova/ProjectMakefile -cordova/config.xml -cordova/wp/Package.appxmanifest -www/img/logo-negative.svg -www/img/logo.svg -src/js/appConfig.js - cordova/android/res/ cordova/wp/Assets/ cordova/wp/*.png diff --git a/Gruntfile.js b/Gruntfile.js index bd234152c..4bd01513c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,6 +6,7 @@ module.exports = function(grunt) { // Project Configuration grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), exec: { appConfig: { command: 'node ./util/buildAppConfig.js' @@ -19,8 +20,8 @@ module.exports = function(grunt) { cordovaclean: { command: 'make -C cordova clean' }, - osx: { - command: 'webkitbuilds/build-osx.sh sign' + macos: { + command: 'sh webkitbuilds/build-macos.sh sign' }, coveralls: { command: 'cat coverage/report-lcov/lcov.info |./node_modules/coveralls/bin/coveralls.js' @@ -60,10 +61,10 @@ module.exports = function(grunt) { stdin: true, }, desktopsign: { - cmd: 'gpg -u 1112CFA1 --output webkitbuilds/Copay-linux.zip.sig --detach-sig webkitbuilds/Copay-linux.zip && gpg -u 1112CFA1 --output webkitbuilds/Copay-win.exe.sig --detach-sig webkitbuilds/Copay-win.exe' + cmd: 'gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>-linux.zip.sig --detach-sig webkitbuilds/<%= pkg.title %>-linux.zip && gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>-win.exe.sig --detach-sig webkitbuilds/<%= pkg.title %>-win.exe' }, desktopverify: { - cmd: 'gpg --verify webkitbuilds/Copay-linux.zip.sig webkitbuilds/Copay-linux.zip && gpg --verify webkitbuilds/Copay-win.exe.sig webkitbuilds/Copay-win.exe' + cmd: 'gpg --verify webkitbuilds/<%= pkg.title %>-linux.zip.sig webkitbuilds/<%= pkg.title %>-linux.zip && gpg --verify webkitbuilds/<%= pkg.title %>-win.exe.sig webkitbuilds/<%= pkg.title %>-win.exe' }, }, watch: { @@ -128,7 +129,7 @@ module.exports = function(grunt) { 'bower_components/angular-md5/angular-md5.js', 'bower_components/angular-mocks/angular-mocks.js', 'bower_components/ngtouch/src/ngTouch.js', - 'angular-pbkdf2/angular-pbkdf2.js', + 'angular-bitauth/angular-bitauth.js', 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js' ], dest: 'www/lib/angular.js' @@ -209,49 +210,40 @@ module.exports = function(grunt) { files: [{ expand: true, cwd: 'webkitbuilds/', - src: ['.desktop', '../www/img/icons/favicon.ico', '../www/img/icons/icon-256.png'], - dest: 'webkitbuilds/Copay/linux64/', + src: ['.desktop', '../www/img/app/favicon.ico', '../www/img/app/512x512.png'], + dest: 'webkitbuilds/<%= pkg.title %>/linux64/', flatten: true, filter: 'isFile' }], } }, - karma: { - unit: { - configFile: 'test/karma.conf.js' - }, - prod: { - configFile: 'test/karma.conf.js', - singleRun: true - } - }, nwjs: { options: { - appName: 'Copay', + appName: '<%= pkg.title %>', platforms: ['win64', 'osx64', 'linux64'], buildDir: './webkitbuilds', version: '0.16.0', - macIcns: './www/img/icons/icon.icns', - exeIco: './www/img/icons/icon.ico' + macIcns: './www/img/app/logo.icns', + exeIco: './www/img/app/logo.ico' }, src: ['./package.json', './www/**/*'] }, compress: { linux: { options: { - archive: './webkitbuilds/Copay-linux.zip' + archive: './webkitbuilds/<%= pkg.title %>-linux.zip' }, expand: true, - cwd: './webkitbuilds/Copay/linux64/', + cwd: './webkitbuilds/<%= pkg.title %>/linux64/', src: ['**/*'], - dest: 'copay-linux/' + dest: '<%= pkg.title %>-linux/' } }, browserify: { dist: { files: { 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js': ['angular-bitcore-wallet-client/index.js'], - 'angular-pbkdf2/angular-pbkdf2.js': ['angular-pbkdf2/index.js'] + 'angular-bitauth/angular-bitauth.js': ['angular-bitauth/index.js'] }, } } @@ -260,10 +252,8 @@ module.exports = function(grunt) { grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']); grunt.registerTask('prod', ['default', 'uglify']); grunt.registerTask('translate', ['nggettext_extract']); - grunt.registerTask('test', ['karma:unit']); - grunt.registerTask('test-coveralls', ['browserify', 'karma:prod', 'exec:coveralls']); grunt.registerTask('desktop', ['prod', 'nwjs', 'copy:linux', 'compress:linux']); - grunt.registerTask('osx', ['prod', 'nwjs', 'exec:osx']); + grunt.registerTask('macos', ['prod', 'nwjs', 'exec:macos']); grunt.registerTask('chrome', ['exec:chrome']); grunt.registerTask('wp', ['prod', 'exec:wp']); grunt.registerTask('wp-copy', ['default', 'exec:wpcopy']); diff --git a/angular-bitauth/index.js b/angular-bitauth/index.js new file mode 100644 index 000000000..cb6ebaa2e --- /dev/null +++ b/angular-bitauth/index.js @@ -0,0 +1,18 @@ +var bitauthModule = angular.module('bitauthModule', []); +var bitauth = require('../node_modules/bitauth'); + +bitauthModule.constant('MODULE_VERSION', '1.0.0'); + +bitauthModule.provider("bitauthService", function() { + var provider = {}; + + provider.$get = function() { + var service = {}; + + service = bitauth; + + return service; + }; + + return provider; +}); diff --git a/angular-pbkdf2/angular-pbkdf2.js b/angular-pbkdf2/angular-pbkdf2.js new file mode 100644 index 000000000..12b05f4ca --- /dev/null +++ b/angular-pbkdf2/angular-pbkdf2.js @@ -0,0 +1,6634 @@ +(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o + * @license MIT + */ +/* eslint-disable no-proto */ + +'use strict' + +var base64 = require('base64-js') +var ieee754 = require('ieee754') +var isArray = require('isarray') + +exports.Buffer = Buffer +exports.SlowBuffer = SlowBuffer +exports.INSPECT_MAX_BYTES = 50 + +/** + * If `Buffer.TYPED_ARRAY_SUPPORT`: + * === true Use Uint8Array implementation (fastest) + * === false Use Object implementation (most compatible, even IE6) + * + * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+, + * Opera 11.6+, iOS 4.2+. + * + * Due to various browser bugs, sometimes the Object implementation will be used even + * when the browser supports typed arrays. + * + * Note: + * + * - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances, + * See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438. + * + * - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function. + * + * - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of + * incorrect length in some situations. + + * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they + * get the Object implementation, which is slower but behaves correctly. + */ +Buffer.TYPED_ARRAY_SUPPORT = global.TYPED_ARRAY_SUPPORT !== undefined + ? global.TYPED_ARRAY_SUPPORT + : typedArraySupport() + +/* + * Export kMaxLength after typed array support is determined. + */ +exports.kMaxLength = kMaxLength() + +function typedArraySupport () { + try { + var arr = new Uint8Array(1) + arr.__proto__ = {__proto__: Uint8Array.prototype, foo: function () { return 42 }} + return arr.foo() === 42 && // typed array instances can be augmented + typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray` + arr.subarray(1, 1).byteLength === 0 // ie10 has broken `subarray` + } catch (e) { + return false + } +} + +function kMaxLength () { + return Buffer.TYPED_ARRAY_SUPPORT + ? 0x7fffffff + : 0x3fffffff +} + +function createBuffer (that, length) { + if (kMaxLength() < length) { + throw new RangeError('Invalid typed array length') + } + if (Buffer.TYPED_ARRAY_SUPPORT) { + // Return an augmented `Uint8Array` instance, for best performance + that = new Uint8Array(length) + that.__proto__ = Buffer.prototype + } else { + // Fallback: Return an object instance of the Buffer class + if (that === null) { + that = new Buffer(length) + } + that.length = length + } + + return that +} + +/** + * The Buffer constructor returns instances of `Uint8Array` that have their + * prototype changed to `Buffer.prototype`. Furthermore, `Buffer` is a subclass of + * `Uint8Array`, so the returned instances will have all the node `Buffer` methods + * and the `Uint8Array` methods. Square bracket notation works as expected -- it + * returns a single octet. + * + * The `Uint8Array` prototype remains unmodified. + */ + +function Buffer (arg, encodingOrOffset, length) { + if (!Buffer.TYPED_ARRAY_SUPPORT && !(this instanceof Buffer)) { + return new Buffer(arg, encodingOrOffset, length) + } + + // Common case. + if (typeof arg === 'number') { + if (typeof encodingOrOffset === 'string') { + throw new Error( + 'If encoding is specified then the first argument must be a string' + ) + } + return allocUnsafe(this, arg) + } + return from(this, arg, encodingOrOffset, length) +} + +Buffer.poolSize = 8192 // not used by this implementation + +// TODO: Legacy, not needed anymore. Remove in next major version. +Buffer._augment = function (arr) { + arr.__proto__ = Buffer.prototype + return arr +} + +function from (that, value, encodingOrOffset, length) { + if (typeof value === 'number') { + throw new TypeError('"value" argument must not be a number') + } + + if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) { + return fromArrayBuffer(that, value, encodingOrOffset, length) + } + + if (typeof value === 'string') { + return fromString(that, value, encodingOrOffset) + } + + return fromObject(that, value) +} + +/** + * Functionally equivalent to Buffer(arg, encoding) but throws a TypeError + * if value is a number. + * Buffer.from(str[, encoding]) + * Buffer.from(array) + * Buffer.from(buffer) + * Buffer.from(arrayBuffer[, byteOffset[, length]]) + **/ +Buffer.from = function (value, encodingOrOffset, length) { + return from(null, value, encodingOrOffset, length) +} + +if (Buffer.TYPED_ARRAY_SUPPORT) { + Buffer.prototype.__proto__ = Uint8Array.prototype + Buffer.__proto__ = Uint8Array + if (typeof Symbol !== 'undefined' && Symbol.species && + Buffer[Symbol.species] === Buffer) { + // Fix subarray() in ES2016. See: https://github.com/feross/buffer/pull/97 + Object.defineProperty(Buffer, Symbol.species, { + value: null, + configurable: true + }) + } +} + +function assertSize (size) { + if (typeof size !== 'number') { + throw new TypeError('"size" argument must be a number') + } else if (size < 0) { + throw new RangeError('"size" argument must not be negative') + } +} + +function alloc (that, size, fill, encoding) { + assertSize(size) + if (size <= 0) { + return createBuffer(that, size) + } + if (fill !== undefined) { + // Only pay attention to encoding if it's a string. This + // prevents accidentally sending in a number that would + // be interpretted as a start offset. + return typeof encoding === 'string' + ? createBuffer(that, size).fill(fill, encoding) + : createBuffer(that, size).fill(fill) + } + return createBuffer(that, size) +} + +/** + * Creates a new filled Buffer instance. + * alloc(size[, fill[, encoding]]) + **/ +Buffer.alloc = function (size, fill, encoding) { + return alloc(null, size, fill, encoding) +} + +function allocUnsafe (that, size) { + assertSize(size) + that = createBuffer(that, size < 0 ? 0 : checked(size) | 0) + if (!Buffer.TYPED_ARRAY_SUPPORT) { + for (var i = 0; i < size; ++i) { + that[i] = 0 + } + } + return that +} + +/** + * Equivalent to Buffer(num), by default creates a non-zero-filled Buffer instance. + * */ +Buffer.allocUnsafe = function (size) { + return allocUnsafe(null, size) +} +/** + * Equivalent to SlowBuffer(num), by default creates a non-zero-filled Buffer instance. + */ +Buffer.allocUnsafeSlow = function (size) { + return allocUnsafe(null, size) +} + +function fromString (that, string, encoding) { + if (typeof encoding !== 'string' || encoding === '') { + encoding = 'utf8' + } + + if (!Buffer.isEncoding(encoding)) { + throw new TypeError('"encoding" must be a valid string encoding') + } + + var length = byteLength(string, encoding) | 0 + that = createBuffer(that, length) + + var actual = that.write(string, encoding) + + if (actual !== length) { + // Writing a hex string, for example, that contains invalid characters will + // cause everything after the first invalid character to be ignored. (e.g. + // 'abxxcd' will be treated as 'ab') + that = that.slice(0, actual) + } + + return that +} + +function fromArrayLike (that, array) { + var length = array.length < 0 ? 0 : checked(array.length) | 0 + that = createBuffer(that, length) + for (var i = 0; i < length; i += 1) { + that[i] = array[i] & 255 + } + return that +} + +function fromArrayBuffer (that, array, byteOffset, length) { + array.byteLength // this throws if `array` is not a valid ArrayBuffer + + if (byteOffset < 0 || array.byteLength < byteOffset) { + throw new RangeError('\'offset\' is out of bounds') + } + + if (array.byteLength < byteOffset + (length || 0)) { + throw new RangeError('\'length\' is out of bounds') + } + + if (byteOffset === undefined && length === undefined) { + array = new Uint8Array(array) + } else if (length === undefined) { + array = new Uint8Array(array, byteOffset) + } else { + array = new Uint8Array(array, byteOffset, length) + } + + if (Buffer.TYPED_ARRAY_SUPPORT) { + // Return an augmented `Uint8Array` instance, for best performance + that = array + that.__proto__ = Buffer.prototype + } else { + // Fallback: Return an object instance of the Buffer class + that = fromArrayLike(that, array) + } + return that +} + +function fromObject (that, obj) { + if (Buffer.isBuffer(obj)) { + var len = checked(obj.length) | 0 + that = createBuffer(that, len) + + if (that.length === 0) { + return that + } + + obj.copy(that, 0, 0, len) + return that + } + + if (obj) { + if ((typeof ArrayBuffer !== 'undefined' && + obj.buffer instanceof ArrayBuffer) || 'length' in obj) { + if (typeof obj.length !== 'number' || isnan(obj.length)) { + return createBuffer(that, 0) + } + return fromArrayLike(that, obj) + } + + if (obj.type === 'Buffer' && isArray(obj.data)) { + return fromArrayLike(that, obj.data) + } + } + + throw new TypeError('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.') +} + +function checked (length) { + // Note: cannot use `length < kMaxLength()` here because that fails when + // length is NaN (which is otherwise coerced to zero.) + if (length >= kMaxLength()) { + throw new RangeError('Attempt to allocate Buffer larger than maximum ' + + 'size: 0x' + kMaxLength().toString(16) + ' bytes') + } + return length | 0 +} + +function SlowBuffer (length) { + if (+length != length) { // eslint-disable-line eqeqeq + length = 0 + } + return Buffer.alloc(+length) +} + +Buffer.isBuffer = function isBuffer (b) { + return !!(b != null && b._isBuffer) +} + +Buffer.compare = function compare (a, b) { + if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) { + throw new TypeError('Arguments must be Buffers') + } + + if (a === b) return 0 + + var x = a.length + var y = b.length + + for (var i = 0, len = Math.min(x, y); i < len; ++i) { + if (a[i] !== b[i]) { + x = a[i] + y = b[i] + break + } + } + + if (x < y) return -1 + if (y < x) return 1 + return 0 +} + +Buffer.isEncoding = function isEncoding (encoding) { + switch (String(encoding).toLowerCase()) { + case 'hex': + case 'utf8': + case 'utf-8': + case 'ascii': + case 'latin1': + case 'binary': + case 'base64': + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return true + default: + return false + } +} + +Buffer.concat = function concat (list, length) { + if (!isArray(list)) { + throw new TypeError('"list" argument must be an Array of Buffers') + } + + if (list.length === 0) { + return Buffer.alloc(0) + } + + var i + if (length === undefined) { + length = 0 + for (i = 0; i < list.length; ++i) { + length += list[i].length + } + } + + var buffer = Buffer.allocUnsafe(length) + var pos = 0 + for (i = 0; i < list.length; ++i) { + var buf = list[i] + if (!Buffer.isBuffer(buf)) { + throw new TypeError('"list" argument must be an Array of Buffers') + } + buf.copy(buffer, pos) + pos += buf.length + } + return buffer +} + +function byteLength (string, encoding) { + if (Buffer.isBuffer(string)) { + return string.length + } + if (typeof ArrayBuffer !== 'undefined' && typeof ArrayBuffer.isView === 'function' && + (ArrayBuffer.isView(string) || string instanceof ArrayBuffer)) { + return string.byteLength + } + if (typeof string !== 'string') { + string = '' + string + } + + var len = string.length + if (len === 0) return 0 + + // Use a for loop to avoid recursion + var loweredCase = false + for (;;) { + switch (encoding) { + case 'ascii': + case 'latin1': + case 'binary': + return len + case 'utf8': + case 'utf-8': + case undefined: + return utf8ToBytes(string).length + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return len * 2 + case 'hex': + return len >>> 1 + case 'base64': + return base64ToBytes(string).length + default: + if (loweredCase) return utf8ToBytes(string).length // assume utf8 + encoding = ('' + encoding).toLowerCase() + loweredCase = true + } + } +} +Buffer.byteLength = byteLength + +function slowToString (encoding, start, end) { + var loweredCase = false + + // No need to verify that "this.length <= MAX_UINT32" since it's a read-only + // property of a typed array. + + // This behaves neither like String nor Uint8Array in that we set start/end + // to their upper/lower bounds if the value passed is out of range. + // undefined is handled specially as per ECMA-262 6th Edition, + // Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization. + if (start === undefined || start < 0) { + start = 0 + } + // Return early if start > this.length. Done here to prevent potential uint32 + // coercion fail below. + if (start > this.length) { + return '' + } + + if (end === undefined || end > this.length) { + end = this.length + } + + if (end <= 0) { + return '' + } + + // Force coersion to uint32. This will also coerce falsey/NaN values to 0. + end >>>= 0 + start >>>= 0 + + if (end <= start) { + return '' + } + + if (!encoding) encoding = 'utf8' + + while (true) { + switch (encoding) { + case 'hex': + return hexSlice(this, start, end) + + case 'utf8': + case 'utf-8': + return utf8Slice(this, start, end) + + case 'ascii': + return asciiSlice(this, start, end) + + case 'latin1': + case 'binary': + return latin1Slice(this, start, end) + + case 'base64': + return base64Slice(this, start, end) + + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return utf16leSlice(this, start, end) + + default: + if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding) + encoding = (encoding + '').toLowerCase() + loweredCase = true + } + } +} + +// The property is used by `Buffer.isBuffer` and `is-buffer` (in Safari 5-7) to detect +// Buffer instances. +Buffer.prototype._isBuffer = true + +function swap (b, n, m) { + var i = b[n] + b[n] = b[m] + b[m] = i +} + +Buffer.prototype.swap16 = function swap16 () { + var len = this.length + if (len % 2 !== 0) { + throw new RangeError('Buffer size must be a multiple of 16-bits') + } + for (var i = 0; i < len; i += 2) { + swap(this, i, i + 1) + } + return this +} + +Buffer.prototype.swap32 = function swap32 () { + var len = this.length + if (len % 4 !== 0) { + throw new RangeError('Buffer size must be a multiple of 32-bits') + } + for (var i = 0; i < len; i += 4) { + swap(this, i, i + 3) + swap(this, i + 1, i + 2) + } + return this +} + +Buffer.prototype.swap64 = function swap64 () { + var len = this.length + if (len % 8 !== 0) { + throw new RangeError('Buffer size must be a multiple of 64-bits') + } + for (var i = 0; i < len; i += 8) { + swap(this, i, i + 7) + swap(this, i + 1, i + 6) + swap(this, i + 2, i + 5) + swap(this, i + 3, i + 4) + } + return this +} + +Buffer.prototype.toString = function toString () { + var length = this.length | 0 + if (length === 0) return '' + if (arguments.length === 0) return utf8Slice(this, 0, length) + return slowToString.apply(this, arguments) +} + +Buffer.prototype.equals = function equals (b) { + if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer') + if (this === b) return true + return Buffer.compare(this, b) === 0 +} + +Buffer.prototype.inspect = function inspect () { + var str = '' + var max = exports.INSPECT_MAX_BYTES + if (this.length > 0) { + str = this.toString('hex', 0, max).match(/.{2}/g).join(' ') + if (this.length > max) str += ' ... ' + } + return '' +} + +Buffer.prototype.compare = function compare (target, start, end, thisStart, thisEnd) { + if (!Buffer.isBuffer(target)) { + throw new TypeError('Argument must be a Buffer') + } + + if (start === undefined) { + start = 0 + } + if (end === undefined) { + end = target ? target.length : 0 + } + if (thisStart === undefined) { + thisStart = 0 + } + if (thisEnd === undefined) { + thisEnd = this.length + } + + if (start < 0 || end > target.length || thisStart < 0 || thisEnd > this.length) { + throw new RangeError('out of range index') + } + + if (thisStart >= thisEnd && start >= end) { + return 0 + } + if (thisStart >= thisEnd) { + return -1 + } + if (start >= end) { + return 1 + } + + start >>>= 0 + end >>>= 0 + thisStart >>>= 0 + thisEnd >>>= 0 + + if (this === target) return 0 + + var x = thisEnd - thisStart + var y = end - start + var len = Math.min(x, y) + + var thisCopy = this.slice(thisStart, thisEnd) + var targetCopy = target.slice(start, end) + + for (var i = 0; i < len; ++i) { + if (thisCopy[i] !== targetCopy[i]) { + x = thisCopy[i] + y = targetCopy[i] + break + } + } + + if (x < y) return -1 + if (y < x) return 1 + return 0 +} + +// Finds either the first index of `val` in `buffer` at offset >= `byteOffset`, +// OR the last index of `val` in `buffer` at offset <= `byteOffset`. +// +// Arguments: +// - buffer - a Buffer to search +// - val - a string, Buffer, or number +// - byteOffset - an index into `buffer`; will be clamped to an int32 +// - encoding - an optional encoding, relevant is val is a string +// - dir - true for indexOf, false for lastIndexOf +function bidirectionalIndexOf (buffer, val, byteOffset, encoding, dir) { + // Empty buffer means no match + if (buffer.length === 0) return -1 + + // Normalize byteOffset + if (typeof byteOffset === 'string') { + encoding = byteOffset + byteOffset = 0 + } else if (byteOffset > 0x7fffffff) { + byteOffset = 0x7fffffff + } else if (byteOffset < -0x80000000) { + byteOffset = -0x80000000 + } + byteOffset = +byteOffset // Coerce to Number. + if (isNaN(byteOffset)) { + // byteOffset: it it's undefined, null, NaN, "foo", etc, search whole buffer + byteOffset = dir ? 0 : (buffer.length - 1) + } + + // Normalize byteOffset: negative offsets start from the end of the buffer + if (byteOffset < 0) byteOffset = buffer.length + byteOffset + if (byteOffset >= buffer.length) { + if (dir) return -1 + else byteOffset = buffer.length - 1 + } else if (byteOffset < 0) { + if (dir) byteOffset = 0 + else return -1 + } + + // Normalize val + if (typeof val === 'string') { + val = Buffer.from(val, encoding) + } + + // Finally, search either indexOf (if dir is true) or lastIndexOf + if (Buffer.isBuffer(val)) { + // Special case: looking for empty string/buffer always fails + if (val.length === 0) { + return -1 + } + return arrayIndexOf(buffer, val, byteOffset, encoding, dir) + } else if (typeof val === 'number') { + val = val & 0xFF // Search for a byte value [0-255] + if (Buffer.TYPED_ARRAY_SUPPORT && + typeof Uint8Array.prototype.indexOf === 'function') { + if (dir) { + return Uint8Array.prototype.indexOf.call(buffer, val, byteOffset) + } else { + return Uint8Array.prototype.lastIndexOf.call(buffer, val, byteOffset) + } + } + return arrayIndexOf(buffer, [ val ], byteOffset, encoding, dir) + } + + throw new TypeError('val must be string, number or Buffer') +} + +function arrayIndexOf (arr, val, byteOffset, encoding, dir) { + var indexSize = 1 + var arrLength = arr.length + var valLength = val.length + + if (encoding !== undefined) { + encoding = String(encoding).toLowerCase() + if (encoding === 'ucs2' || encoding === 'ucs-2' || + encoding === 'utf16le' || encoding === 'utf-16le') { + if (arr.length < 2 || val.length < 2) { + return -1 + } + indexSize = 2 + arrLength /= 2 + valLength /= 2 + byteOffset /= 2 + } + } + + function read (buf, i) { + if (indexSize === 1) { + return buf[i] + } else { + return buf.readUInt16BE(i * indexSize) + } + } + + var i + if (dir) { + var foundIndex = -1 + for (i = byteOffset; i < arrLength; i++) { + if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) { + if (foundIndex === -1) foundIndex = i + if (i - foundIndex + 1 === valLength) return foundIndex * indexSize + } else { + if (foundIndex !== -1) i -= i - foundIndex + foundIndex = -1 + } + } + } else { + if (byteOffset + valLength > arrLength) byteOffset = arrLength - valLength + for (i = byteOffset; i >= 0; i--) { + var found = true + for (var j = 0; j < valLength; j++) { + if (read(arr, i + j) !== read(val, j)) { + found = false + break + } + } + if (found) return i + } + } + + return -1 +} + +Buffer.prototype.includes = function includes (val, byteOffset, encoding) { + return this.indexOf(val, byteOffset, encoding) !== -1 +} + +Buffer.prototype.indexOf = function indexOf (val, byteOffset, encoding) { + return bidirectionalIndexOf(this, val, byteOffset, encoding, true) +} + +Buffer.prototype.lastIndexOf = function lastIndexOf (val, byteOffset, encoding) { + return bidirectionalIndexOf(this, val, byteOffset, encoding, false) +} + +function hexWrite (buf, string, offset, length) { + offset = Number(offset) || 0 + var remaining = buf.length - offset + if (!length) { + length = remaining + } else { + length = Number(length) + if (length > remaining) { + length = remaining + } + } + + // must be an even number of digits + var strLen = string.length + if (strLen % 2 !== 0) throw new TypeError('Invalid hex string') + + if (length > strLen / 2) { + length = strLen / 2 + } + for (var i = 0; i < length; ++i) { + var parsed = parseInt(string.substr(i * 2, 2), 16) + if (isNaN(parsed)) return i + buf[offset + i] = parsed + } + return i +} + +function utf8Write (buf, string, offset, length) { + return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length) +} + +function asciiWrite (buf, string, offset, length) { + return blitBuffer(asciiToBytes(string), buf, offset, length) +} + +function latin1Write (buf, string, offset, length) { + return asciiWrite(buf, string, offset, length) +} + +function base64Write (buf, string, offset, length) { + return blitBuffer(base64ToBytes(string), buf, offset, length) +} + +function ucs2Write (buf, string, offset, length) { + return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length) +} + +Buffer.prototype.write = function write (string, offset, length, encoding) { + // Buffer#write(string) + if (offset === undefined) { + encoding = 'utf8' + length = this.length + offset = 0 + // Buffer#write(string, encoding) + } else if (length === undefined && typeof offset === 'string') { + encoding = offset + length = this.length + offset = 0 + // Buffer#write(string, offset[, length][, encoding]) + } else if (isFinite(offset)) { + offset = offset | 0 + if (isFinite(length)) { + length = length | 0 + if (encoding === undefined) encoding = 'utf8' + } else { + encoding = length + length = undefined + } + // legacy write(string, encoding, offset, length) - remove in v0.13 + } else { + throw new Error( + 'Buffer.write(string, encoding, offset[, length]) is no longer supported' + ) + } + + var remaining = this.length - offset + if (length === undefined || length > remaining) length = remaining + + if ((string.length > 0 && (length < 0 || offset < 0)) || offset > this.length) { + throw new RangeError('Attempt to write outside buffer bounds') + } + + if (!encoding) encoding = 'utf8' + + var loweredCase = false + for (;;) { + switch (encoding) { + case 'hex': + return hexWrite(this, string, offset, length) + + case 'utf8': + case 'utf-8': + return utf8Write(this, string, offset, length) + + case 'ascii': + return asciiWrite(this, string, offset, length) + + case 'latin1': + case 'binary': + return latin1Write(this, string, offset, length) + + case 'base64': + // Warning: maxLength not taken into account in base64Write + return base64Write(this, string, offset, length) + + case 'ucs2': + case 'ucs-2': + case 'utf16le': + case 'utf-16le': + return ucs2Write(this, string, offset, length) + + default: + if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding) + encoding = ('' + encoding).toLowerCase() + loweredCase = true + } + } +} + +Buffer.prototype.toJSON = function toJSON () { + return { + type: 'Buffer', + data: Array.prototype.slice.call(this._arr || this, 0) + } +} + +function base64Slice (buf, start, end) { + if (start === 0 && end === buf.length) { + return base64.fromByteArray(buf) + } else { + return base64.fromByteArray(buf.slice(start, end)) + } +} + +function utf8Slice (buf, start, end) { + end = Math.min(buf.length, end) + var res = [] + + var i = start + while (i < end) { + var firstByte = buf[i] + var codePoint = null + var bytesPerSequence = (firstByte > 0xEF) ? 4 + : (firstByte > 0xDF) ? 3 + : (firstByte > 0xBF) ? 2 + : 1 + + if (i + bytesPerSequence <= end) { + var secondByte, thirdByte, fourthByte, tempCodePoint + + switch (bytesPerSequence) { + case 1: + if (firstByte < 0x80) { + codePoint = firstByte + } + break + case 2: + secondByte = buf[i + 1] + if ((secondByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0x1F) << 0x6 | (secondByte & 0x3F) + if (tempCodePoint > 0x7F) { + codePoint = tempCodePoint + } + } + break + case 3: + secondByte = buf[i + 1] + thirdByte = buf[i + 2] + if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | (thirdByte & 0x3F) + if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) { + codePoint = tempCodePoint + } + } + break + case 4: + secondByte = buf[i + 1] + thirdByte = buf[i + 2] + fourthByte = buf[i + 3] + if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) { + tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | (fourthByte & 0x3F) + if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) { + codePoint = tempCodePoint + } + } + } + } + + if (codePoint === null) { + // we did not generate a valid codePoint so insert a + // replacement char (U+FFFD) and advance only 1 byte + codePoint = 0xFFFD + bytesPerSequence = 1 + } else if (codePoint > 0xFFFF) { + // encode to utf16 (surrogate pair dance) + codePoint -= 0x10000 + res.push(codePoint >>> 10 & 0x3FF | 0xD800) + codePoint = 0xDC00 | codePoint & 0x3FF + } + + res.push(codePoint) + i += bytesPerSequence + } + + return decodeCodePointsArray(res) +} + +// Based on http://stackoverflow.com/a/22747272/680742, the browser with +// the lowest limit is Chrome, with 0x10000 args. +// We go 1 magnitude less, for safety +var MAX_ARGUMENTS_LENGTH = 0x1000 + +function decodeCodePointsArray (codePoints) { + var len = codePoints.length + if (len <= MAX_ARGUMENTS_LENGTH) { + return String.fromCharCode.apply(String, codePoints) // avoid extra slice() + } + + // Decode in chunks to avoid "call stack size exceeded". + var res = '' + var i = 0 + while (i < len) { + res += String.fromCharCode.apply( + String, + codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH) + ) + } + return res +} + +function asciiSlice (buf, start, end) { + var ret = '' + end = Math.min(buf.length, end) + + for (var i = start; i < end; ++i) { + ret += String.fromCharCode(buf[i] & 0x7F) + } + return ret +} + +function latin1Slice (buf, start, end) { + var ret = '' + end = Math.min(buf.length, end) + + for (var i = start; i < end; ++i) { + ret += String.fromCharCode(buf[i]) + } + return ret +} + +function hexSlice (buf, start, end) { + var len = buf.length + + if (!start || start < 0) start = 0 + if (!end || end < 0 || end > len) end = len + + var out = '' + for (var i = start; i < end; ++i) { + out += toHex(buf[i]) + } + return out +} + +function utf16leSlice (buf, start, end) { + var bytes = buf.slice(start, end) + var res = '' + for (var i = 0; i < bytes.length; i += 2) { + res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256) + } + return res +} + +Buffer.prototype.slice = function slice (start, end) { + var len = this.length + start = ~~start + end = end === undefined ? len : ~~end + + if (start < 0) { + start += len + if (start < 0) start = 0 + } else if (start > len) { + start = len + } + + if (end < 0) { + end += len + if (end < 0) end = 0 + } else if (end > len) { + end = len + } + + if (end < start) end = start + + var newBuf + if (Buffer.TYPED_ARRAY_SUPPORT) { + newBuf = this.subarray(start, end) + newBuf.__proto__ = Buffer.prototype + } else { + var sliceLen = end - start + newBuf = new Buffer(sliceLen, undefined) + for (var i = 0; i < sliceLen; ++i) { + newBuf[i] = this[i + start] + } + } + + return newBuf +} + +/* + * Need to make sure that buffer isn't trying to write out of bounds. + */ +function checkOffset (offset, ext, length) { + if ((offset % 1) !== 0 || offset < 0) throw new RangeError('offset is not uint') + if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length') +} + +Buffer.prototype.readUIntLE = function readUIntLE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var val = this[offset] + var mul = 1 + var i = 0 + while (++i < byteLength && (mul *= 0x100)) { + val += this[offset + i] * mul + } + + return val +} + +Buffer.prototype.readUIntBE = function readUIntBE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + checkOffset(offset, byteLength, this.length) + } + + var val = this[offset + --byteLength] + var mul = 1 + while (byteLength > 0 && (mul *= 0x100)) { + val += this[offset + --byteLength] * mul + } + + return val +} + +Buffer.prototype.readUInt8 = function readUInt8 (offset, noAssert) { + if (!noAssert) checkOffset(offset, 1, this.length) + return this[offset] +} + +Buffer.prototype.readUInt16LE = function readUInt16LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + return this[offset] | (this[offset + 1] << 8) +} + +Buffer.prototype.readUInt16BE = function readUInt16BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + return (this[offset] << 8) | this[offset + 1] +} + +Buffer.prototype.readUInt32LE = function readUInt32LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return ((this[offset]) | + (this[offset + 1] << 8) | + (this[offset + 2] << 16)) + + (this[offset + 3] * 0x1000000) +} + +Buffer.prototype.readUInt32BE = function readUInt32BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset] * 0x1000000) + + ((this[offset + 1] << 16) | + (this[offset + 2] << 8) | + this[offset + 3]) +} + +Buffer.prototype.readIntLE = function readIntLE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var val = this[offset] + var mul = 1 + var i = 0 + while (++i < byteLength && (mul *= 0x100)) { + val += this[offset + i] * mul + } + mul *= 0x80 + + if (val >= mul) val -= Math.pow(2, 8 * byteLength) + + return val +} + +Buffer.prototype.readIntBE = function readIntBE (offset, byteLength, noAssert) { + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) checkOffset(offset, byteLength, this.length) + + var i = byteLength + var mul = 1 + var val = this[offset + --i] + while (i > 0 && (mul *= 0x100)) { + val += this[offset + --i] * mul + } + mul *= 0x80 + + if (val >= mul) val -= Math.pow(2, 8 * byteLength) + + return val +} + +Buffer.prototype.readInt8 = function readInt8 (offset, noAssert) { + if (!noAssert) checkOffset(offset, 1, this.length) + if (!(this[offset] & 0x80)) return (this[offset]) + return ((0xff - this[offset] + 1) * -1) +} + +Buffer.prototype.readInt16LE = function readInt16LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + var val = this[offset] | (this[offset + 1] << 8) + return (val & 0x8000) ? val | 0xFFFF0000 : val +} + +Buffer.prototype.readInt16BE = function readInt16BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 2, this.length) + var val = this[offset + 1] | (this[offset] << 8) + return (val & 0x8000) ? val | 0xFFFF0000 : val +} + +Buffer.prototype.readInt32LE = function readInt32LE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset]) | + (this[offset + 1] << 8) | + (this[offset + 2] << 16) | + (this[offset + 3] << 24) +} + +Buffer.prototype.readInt32BE = function readInt32BE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + + return (this[offset] << 24) | + (this[offset + 1] << 16) | + (this[offset + 2] << 8) | + (this[offset + 3]) +} + +Buffer.prototype.readFloatLE = function readFloatLE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + return ieee754.read(this, offset, true, 23, 4) +} + +Buffer.prototype.readFloatBE = function readFloatBE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 4, this.length) + return ieee754.read(this, offset, false, 23, 4) +} + +Buffer.prototype.readDoubleLE = function readDoubleLE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 8, this.length) + return ieee754.read(this, offset, true, 52, 8) +} + +Buffer.prototype.readDoubleBE = function readDoubleBE (offset, noAssert) { + if (!noAssert) checkOffset(offset, 8, this.length) + return ieee754.read(this, offset, false, 52, 8) +} + +function checkInt (buf, value, offset, ext, max, min) { + if (!Buffer.isBuffer(buf)) throw new TypeError('"buffer" argument must be a Buffer instance') + if (value > max || value < min) throw new RangeError('"value" argument is out of bounds') + if (offset + ext > buf.length) throw new RangeError('Index out of range') +} + +Buffer.prototype.writeUIntLE = function writeUIntLE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + var maxBytes = Math.pow(2, 8 * byteLength) - 1 + checkInt(this, value, offset, byteLength, maxBytes, 0) + } + + var mul = 1 + var i = 0 + this[offset] = value & 0xFF + while (++i < byteLength && (mul *= 0x100)) { + this[offset + i] = (value / mul) & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeUIntBE = function writeUIntBE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + byteLength = byteLength | 0 + if (!noAssert) { + var maxBytes = Math.pow(2, 8 * byteLength) - 1 + checkInt(this, value, offset, byteLength, maxBytes, 0) + } + + var i = byteLength - 1 + var mul = 1 + this[offset + i] = value & 0xFF + while (--i >= 0 && (mul *= 0x100)) { + this[offset + i] = (value / mul) & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeUInt8 = function writeUInt8 (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0) + if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value) + this[offset] = (value & 0xff) + return offset + 1 +} + +function objectWriteUInt16 (buf, value, offset, littleEndian) { + if (value < 0) value = 0xffff + value + 1 + for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) { + buf[offset + i] = (value & (0xff << (8 * (littleEndian ? i : 1 - i)))) >>> + (littleEndian ? i : 1 - i) * 8 + } +} + +Buffer.prototype.writeUInt16LE = function writeUInt16LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + } else { + objectWriteUInt16(this, value, offset, true) + } + return offset + 2 +} + +Buffer.prototype.writeUInt16BE = function writeUInt16BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 8) + this[offset + 1] = (value & 0xff) + } else { + objectWriteUInt16(this, value, offset, false) + } + return offset + 2 +} + +function objectWriteUInt32 (buf, value, offset, littleEndian) { + if (value < 0) value = 0xffffffff + value + 1 + for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) { + buf[offset + i] = (value >>> (littleEndian ? i : 3 - i) * 8) & 0xff + } +} + +Buffer.prototype.writeUInt32LE = function writeUInt32LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset + 3] = (value >>> 24) + this[offset + 2] = (value >>> 16) + this[offset + 1] = (value >>> 8) + this[offset] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, true) + } + return offset + 4 +} + +Buffer.prototype.writeUInt32BE = function writeUInt32BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 24) + this[offset + 1] = (value >>> 16) + this[offset + 2] = (value >>> 8) + this[offset + 3] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, false) + } + return offset + 4 +} + +Buffer.prototype.writeIntLE = function writeIntLE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) { + var limit = Math.pow(2, 8 * byteLength - 1) + + checkInt(this, value, offset, byteLength, limit - 1, -limit) + } + + var i = 0 + var mul = 1 + var sub = 0 + this[offset] = value & 0xFF + while (++i < byteLength && (mul *= 0x100)) { + if (value < 0 && sub === 0 && this[offset + i - 1] !== 0) { + sub = 1 + } + this[offset + i] = ((value / mul) >> 0) - sub & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeIntBE = function writeIntBE (value, offset, byteLength, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) { + var limit = Math.pow(2, 8 * byteLength - 1) + + checkInt(this, value, offset, byteLength, limit - 1, -limit) + } + + var i = byteLength - 1 + var mul = 1 + var sub = 0 + this[offset + i] = value & 0xFF + while (--i >= 0 && (mul *= 0x100)) { + if (value < 0 && sub === 0 && this[offset + i + 1] !== 0) { + sub = 1 + } + this[offset + i] = ((value / mul) >> 0) - sub & 0xFF + } + + return offset + byteLength +} + +Buffer.prototype.writeInt8 = function writeInt8 (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80) + if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value) + if (value < 0) value = 0xff + value + 1 + this[offset] = (value & 0xff) + return offset + 1 +} + +Buffer.prototype.writeInt16LE = function writeInt16LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + } else { + objectWriteUInt16(this, value, offset, true) + } + return offset + 2 +} + +Buffer.prototype.writeInt16BE = function writeInt16BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 8) + this[offset + 1] = (value & 0xff) + } else { + objectWriteUInt16(this, value, offset, false) + } + return offset + 2 +} + +Buffer.prototype.writeInt32LE = function writeInt32LE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000) + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value & 0xff) + this[offset + 1] = (value >>> 8) + this[offset + 2] = (value >>> 16) + this[offset + 3] = (value >>> 24) + } else { + objectWriteUInt32(this, value, offset, true) + } + return offset + 4 +} + +Buffer.prototype.writeInt32BE = function writeInt32BE (value, offset, noAssert) { + value = +value + offset = offset | 0 + if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000) + if (value < 0) value = 0xffffffff + value + 1 + if (Buffer.TYPED_ARRAY_SUPPORT) { + this[offset] = (value >>> 24) + this[offset + 1] = (value >>> 16) + this[offset + 2] = (value >>> 8) + this[offset + 3] = (value & 0xff) + } else { + objectWriteUInt32(this, value, offset, false) + } + return offset + 4 +} + +function checkIEEE754 (buf, value, offset, ext, max, min) { + if (offset + ext > buf.length) throw new RangeError('Index out of range') + if (offset < 0) throw new RangeError('Index out of range') +} + +function writeFloat (buf, value, offset, littleEndian, noAssert) { + if (!noAssert) { + checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38) + } + ieee754.write(buf, value, offset, littleEndian, 23, 4) + return offset + 4 +} + +Buffer.prototype.writeFloatLE = function writeFloatLE (value, offset, noAssert) { + return writeFloat(this, value, offset, true, noAssert) +} + +Buffer.prototype.writeFloatBE = function writeFloatBE (value, offset, noAssert) { + return writeFloat(this, value, offset, false, noAssert) +} + +function writeDouble (buf, value, offset, littleEndian, noAssert) { + if (!noAssert) { + checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308) + } + ieee754.write(buf, value, offset, littleEndian, 52, 8) + return offset + 8 +} + +Buffer.prototype.writeDoubleLE = function writeDoubleLE (value, offset, noAssert) { + return writeDouble(this, value, offset, true, noAssert) +} + +Buffer.prototype.writeDoubleBE = function writeDoubleBE (value, offset, noAssert) { + return writeDouble(this, value, offset, false, noAssert) +} + +// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length) +Buffer.prototype.copy = function copy (target, targetStart, start, end) { + if (!start) start = 0 + if (!end && end !== 0) end = this.length + if (targetStart >= target.length) targetStart = target.length + if (!targetStart) targetStart = 0 + if (end > 0 && end < start) end = start + + // Copy 0 bytes; we're done + if (end === start) return 0 + if (target.length === 0 || this.length === 0) return 0 + + // Fatal error conditions + if (targetStart < 0) { + throw new RangeError('targetStart out of bounds') + } + if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds') + if (end < 0) throw new RangeError('sourceEnd out of bounds') + + // Are we oob? + if (end > this.length) end = this.length + if (target.length - targetStart < end - start) { + end = target.length - targetStart + start + } + + var len = end - start + var i + + if (this === target && start < targetStart && targetStart < end) { + // descending copy from end + for (i = len - 1; i >= 0; --i) { + target[i + targetStart] = this[i + start] + } + } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) { + // ascending copy from start + for (i = 0; i < len; ++i) { + target[i + targetStart] = this[i + start] + } + } else { + Uint8Array.prototype.set.call( + target, + this.subarray(start, start + len), + targetStart + ) + } + + return len +} + +// Usage: +// buffer.fill(number[, offset[, end]]) +// buffer.fill(buffer[, offset[, end]]) +// buffer.fill(string[, offset[, end]][, encoding]) +Buffer.prototype.fill = function fill (val, start, end, encoding) { + // Handle string cases: + if (typeof val === 'string') { + if (typeof start === 'string') { + encoding = start + start = 0 + end = this.length + } else if (typeof end === 'string') { + encoding = end + end = this.length + } + if (val.length === 1) { + var code = val.charCodeAt(0) + if (code < 256) { + val = code + } + } + if (encoding !== undefined && typeof encoding !== 'string') { + throw new TypeError('encoding must be a string') + } + if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) { + throw new TypeError('Unknown encoding: ' + encoding) + } + } else if (typeof val === 'number') { + val = val & 255 + } + + // Invalid ranges are not set to a default, so can range check early. + if (start < 0 || this.length < start || this.length < end) { + throw new RangeError('Out of range index') + } + + if (end <= start) { + return this + } + + start = start >>> 0 + end = end === undefined ? this.length : end >>> 0 + + if (!val) val = 0 + + var i + if (typeof val === 'number') { + for (i = start; i < end; ++i) { + this[i] = val + } + } else { + var bytes = Buffer.isBuffer(val) + ? val + : utf8ToBytes(new Buffer(val, encoding).toString()) + var len = bytes.length + for (i = 0; i < end - start; ++i) { + this[i + start] = bytes[i % len] + } + } + + return this +} + +// HELPER FUNCTIONS +// ================ + +var INVALID_BASE64_RE = /[^+\/0-9A-Za-z-_]/g + +function base64clean (str) { + // Node strips out invalid characters like \n and \t from the string, base64-js does not + str = stringtrim(str).replace(INVALID_BASE64_RE, '') + // Node converts strings with length < 2 to '' + if (str.length < 2) return '' + // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not + while (str.length % 4 !== 0) { + str = str + '=' + } + return str +} + +function stringtrim (str) { + if (str.trim) return str.trim() + return str.replace(/^\s+|\s+$/g, '') +} + +function toHex (n) { + if (n < 16) return '0' + n.toString(16) + return n.toString(16) +} + +function utf8ToBytes (string, units) { + units = units || Infinity + var codePoint + var length = string.length + var leadSurrogate = null + var bytes = [] + + for (var i = 0; i < length; ++i) { + codePoint = string.charCodeAt(i) + + // is surrogate component + if (codePoint > 0xD7FF && codePoint < 0xE000) { + // last char was a lead + if (!leadSurrogate) { + // no lead yet + if (codePoint > 0xDBFF) { + // unexpected trail + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + continue + } else if (i + 1 === length) { + // unpaired lead + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + continue + } + + // valid lead + leadSurrogate = codePoint + + continue + } + + // 2 leads in a row + if (codePoint < 0xDC00) { + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + leadSurrogate = codePoint + continue + } + + // valid surrogate pair + codePoint = (leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00) + 0x10000 + } else if (leadSurrogate) { + // valid bmp char, but last char was a lead + if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD) + } + + leadSurrogate = null + + // encode utf8 + if (codePoint < 0x80) { + if ((units -= 1) < 0) break + bytes.push(codePoint) + } else if (codePoint < 0x800) { + if ((units -= 2) < 0) break + bytes.push( + codePoint >> 0x6 | 0xC0, + codePoint & 0x3F | 0x80 + ) + } else if (codePoint < 0x10000) { + if ((units -= 3) < 0) break + bytes.push( + codePoint >> 0xC | 0xE0, + codePoint >> 0x6 & 0x3F | 0x80, + codePoint & 0x3F | 0x80 + ) + } else if (codePoint < 0x110000) { + if ((units -= 4) < 0) break + bytes.push( + codePoint >> 0x12 | 0xF0, + codePoint >> 0xC & 0x3F | 0x80, + codePoint >> 0x6 & 0x3F | 0x80, + codePoint & 0x3F | 0x80 + ) + } else { + throw new Error('Invalid code point') + } + } + + return bytes +} + +function asciiToBytes (str) { + var byteArray = [] + for (var i = 0; i < str.length; ++i) { + // Node's code seems to be doing this and not & 0x7F.. + byteArray.push(str.charCodeAt(i) & 0xFF) + } + return byteArray +} + +function utf16leToBytes (str, units) { + var c, hi, lo + var byteArray = [] + for (var i = 0; i < str.length; ++i) { + if ((units -= 2) < 0) break + + c = str.charCodeAt(i) + hi = c >> 8 + lo = c % 256 + byteArray.push(lo) + byteArray.push(hi) + } + + return byteArray +} + +function base64ToBytes (str) { + return base64.toByteArray(base64clean(str)) +} + +function blitBuffer (src, dst, offset, length) { + for (var i = 0; i < length; ++i) { + if ((i + offset >= dst.length) || (i >= src.length)) break + dst[i + offset] = src[i] + } + return i +} + +function isnan (val) { + return val !== val // eslint-disable-line no-self-compare +} + +}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) +},{"base64-js":4,"ieee754":5,"isarray":6}],4:[function(require,module,exports){ +'use strict' + +exports.byteLength = byteLength +exports.toByteArray = toByteArray +exports.fromByteArray = fromByteArray + +var lookup = [] +var revLookup = [] +var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array + +var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' +for (var i = 0, len = code.length; i < len; ++i) { + lookup[i] = code[i] + revLookup[code.charCodeAt(i)] = i +} + +revLookup['-'.charCodeAt(0)] = 62 +revLookup['_'.charCodeAt(0)] = 63 + +function placeHoldersCount (b64) { + var len = b64.length + if (len % 4 > 0) { + throw new Error('Invalid string. Length must be a multiple of 4') + } + + // the number of equal signs (place holders) + // if there are two placeholders, than the two characters before it + // represent one byte + // if there is only one, then the three characters before it represent 2 bytes + // this is just a cheap hack to not do indexOf twice + return b64[len - 2] === '=' ? 2 : b64[len - 1] === '=' ? 1 : 0 +} + +function byteLength (b64) { + // base64 is 4/3 + up to two characters of the original data + return b64.length * 3 / 4 - placeHoldersCount(b64) +} + +function toByteArray (b64) { + var i, j, l, tmp, placeHolders, arr + var len = b64.length + placeHolders = placeHoldersCount(b64) + + arr = new Arr(len * 3 / 4 - placeHolders) + + // if there are placeholders, only get up to the last complete 4 chars + l = placeHolders > 0 ? len - 4 : len + + var L = 0 + + for (i = 0, j = 0; i < l; i += 4, j += 3) { + tmp = (revLookup[b64.charCodeAt(i)] << 18) | (revLookup[b64.charCodeAt(i + 1)] << 12) | (revLookup[b64.charCodeAt(i + 2)] << 6) | revLookup[b64.charCodeAt(i + 3)] + arr[L++] = (tmp >> 16) & 0xFF + arr[L++] = (tmp >> 8) & 0xFF + arr[L++] = tmp & 0xFF + } + + if (placeHolders === 2) { + tmp = (revLookup[b64.charCodeAt(i)] << 2) | (revLookup[b64.charCodeAt(i + 1)] >> 4) + arr[L++] = tmp & 0xFF + } else if (placeHolders === 1) { + tmp = (revLookup[b64.charCodeAt(i)] << 10) | (revLookup[b64.charCodeAt(i + 1)] << 4) | (revLookup[b64.charCodeAt(i + 2)] >> 2) + arr[L++] = (tmp >> 8) & 0xFF + arr[L++] = tmp & 0xFF + } + + return arr +} + +function tripletToBase64 (num) { + return lookup[num >> 18 & 0x3F] + lookup[num >> 12 & 0x3F] + lookup[num >> 6 & 0x3F] + lookup[num & 0x3F] +} + +function encodeChunk (uint8, start, end) { + var tmp + var output = [] + for (var i = start; i < end; i += 3) { + tmp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2]) + output.push(tripletToBase64(tmp)) + } + return output.join('') +} + +function fromByteArray (uint8) { + var tmp + var len = uint8.length + var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes + var output = '' + var parts = [] + var maxChunkLength = 16383 // must be multiple of 3 + + // go through the array every three bytes, we'll deal with trailing stuff later + for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) { + parts.push(encodeChunk(uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength))) + } + + // pad the end with zeros, but make sure to not forget the extra bytes + if (extraBytes === 1) { + tmp = uint8[len - 1] + output += lookup[tmp >> 2] + output += lookup[(tmp << 4) & 0x3F] + output += '==' + } else if (extraBytes === 2) { + tmp = (uint8[len - 2] << 8) + (uint8[len - 1]) + output += lookup[tmp >> 10] + output += lookup[(tmp >> 4) & 0x3F] + output += lookup[(tmp << 2) & 0x3F] + output += '=' + } + + parts.push(output) + + return parts.join('') +} + +},{}],5:[function(require,module,exports){ +exports.read = function (buffer, offset, isLE, mLen, nBytes) { + var e, m + var eLen = nBytes * 8 - mLen - 1 + var eMax = (1 << eLen) - 1 + var eBias = eMax >> 1 + var nBits = -7 + var i = isLE ? (nBytes - 1) : 0 + var d = isLE ? -1 : 1 + var s = buffer[offset + i] + + i += d + + e = s & ((1 << (-nBits)) - 1) + s >>= (-nBits) + nBits += eLen + for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {} + + m = e & ((1 << (-nBits)) - 1) + e >>= (-nBits) + nBits += mLen + for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {} + + if (e === 0) { + e = 1 - eBias + } else if (e === eMax) { + return m ? NaN : ((s ? -1 : 1) * Infinity) + } else { + m = m + Math.pow(2, mLen) + e = e - eBias + } + return (s ? -1 : 1) * m * Math.pow(2, e - mLen) +} + +exports.write = function (buffer, value, offset, isLE, mLen, nBytes) { + var e, m, c + var eLen = nBytes * 8 - mLen - 1 + var eMax = (1 << eLen) - 1 + var eBias = eMax >> 1 + var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0) + var i = isLE ? 0 : (nBytes - 1) + var d = isLE ? 1 : -1 + var s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0 + + value = Math.abs(value) + + if (isNaN(value) || value === Infinity) { + m = isNaN(value) ? 1 : 0 + e = eMax + } else { + e = Math.floor(Math.log(value) / Math.LN2) + if (value * (c = Math.pow(2, -e)) < 1) { + e-- + c *= 2 + } + if (e + eBias >= 1) { + value += rt / c + } else { + value += rt * Math.pow(2, 1 - eBias) + } + if (value * c >= 2) { + e++ + c /= 2 + } + + if (e + eBias >= eMax) { + m = 0 + e = eMax + } else if (e + eBias >= 1) { + m = (value * c - 1) * Math.pow(2, mLen) + e = e + eBias + } else { + m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen) + e = 0 + } + } + + for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {} + + e = (e << mLen) | m + eLen += mLen + for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {} + + buffer[offset + i - d] |= s * 128 +} + +},{}],6:[function(require,module,exports){ +var toString = {}.toString; + +module.exports = Array.isArray || function (arr) { + return toString.call(arr) == '[object Array]'; +}; + +},{}],7:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +function EventEmitter() { + this._events = this._events || {}; + this._maxListeners = this._maxListeners || undefined; +} +module.exports = EventEmitter; + +// Backwards-compat with node 0.10.x +EventEmitter.EventEmitter = EventEmitter; + +EventEmitter.prototype._events = undefined; +EventEmitter.prototype._maxListeners = undefined; + +// By default EventEmitters will print a warning if more than 10 listeners are +// added to it. This is a useful default which helps finding memory leaks. +EventEmitter.defaultMaxListeners = 10; + +// Obviously not all Emitters should be limited to 10. This function allows +// that to be increased. Set to zero for unlimited. +EventEmitter.prototype.setMaxListeners = function(n) { + if (!isNumber(n) || n < 0 || isNaN(n)) + throw TypeError('n must be a positive number'); + this._maxListeners = n; + return this; +}; + +EventEmitter.prototype.emit = function(type) { + var er, handler, len, args, i, listeners; + + if (!this._events) + this._events = {}; + + // If there is no 'error' event listener then throw. + if (type === 'error') { + if (!this._events.error || + (isObject(this._events.error) && !this._events.error.length)) { + er = arguments[1]; + if (er instanceof Error) { + throw er; // Unhandled 'error' event + } else { + // At least give some kind of context to the user + var err = new Error('Uncaught, unspecified "error" event. (' + er + ')'); + err.context = er; + throw err; + } + } + } + + handler = this._events[type]; + + if (isUndefined(handler)) + return false; + + if (isFunction(handler)) { + switch (arguments.length) { + // fast cases + case 1: + handler.call(this); + break; + case 2: + handler.call(this, arguments[1]); + break; + case 3: + handler.call(this, arguments[1], arguments[2]); + break; + // slower + default: + args = Array.prototype.slice.call(arguments, 1); + handler.apply(this, args); + } + } else if (isObject(handler)) { + args = Array.prototype.slice.call(arguments, 1); + listeners = handler.slice(); + len = listeners.length; + for (i = 0; i < len; i++) + listeners[i].apply(this, args); + } + + return true; +}; + +EventEmitter.prototype.addListener = function(type, listener) { + var m; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events) + this._events = {}; + + // To avoid recursion in the case that type === "newListener"! Before + // adding it to the listeners, first emit "newListener". + if (this._events.newListener) + this.emit('newListener', type, + isFunction(listener.listener) ? + listener.listener : listener); + + if (!this._events[type]) + // Optimize the case of one listener. Don't need the extra array object. + this._events[type] = listener; + else if (isObject(this._events[type])) + // If we've already got an array, just append. + this._events[type].push(listener); + else + // Adding the second element, need to change to array. + this._events[type] = [this._events[type], listener]; + + // Check for listener leak + if (isObject(this._events[type]) && !this._events[type].warned) { + if (!isUndefined(this._maxListeners)) { + m = this._maxListeners; + } else { + m = EventEmitter.defaultMaxListeners; + } + + if (m && m > 0 && this._events[type].length > m) { + this._events[type].warned = true; + console.error('(node) warning: possible EventEmitter memory ' + + 'leak detected. %d listeners added. ' + + 'Use emitter.setMaxListeners() to increase limit.', + this._events[type].length); + if (typeof console.trace === 'function') { + // not supported in IE 10 + console.trace(); + } + } + } + + return this; +}; + +EventEmitter.prototype.on = EventEmitter.prototype.addListener; + +EventEmitter.prototype.once = function(type, listener) { + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + var fired = false; + + function g() { + this.removeListener(type, g); + + if (!fired) { + fired = true; + listener.apply(this, arguments); + } + } + + g.listener = listener; + this.on(type, g); + + return this; +}; + +// emits a 'removeListener' event iff the listener was removed +EventEmitter.prototype.removeListener = function(type, listener) { + var list, position, length, i; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events || !this._events[type]) + return this; + + list = this._events[type]; + length = list.length; + position = -1; + + if (list === listener || + (isFunction(list.listener) && list.listener === listener)) { + delete this._events[type]; + if (this._events.removeListener) + this.emit('removeListener', type, listener); + + } else if (isObject(list)) { + for (i = length; i-- > 0;) { + if (list[i] === listener || + (list[i].listener && list[i].listener === listener)) { + position = i; + break; + } + } + + if (position < 0) + return this; + + if (list.length === 1) { + list.length = 0; + delete this._events[type]; + } else { + list.splice(position, 1); + } + + if (this._events.removeListener) + this.emit('removeListener', type, listener); + } + + return this; +}; + +EventEmitter.prototype.removeAllListeners = function(type) { + var key, listeners; + + if (!this._events) + return this; + + // not listening for removeListener, no need to emit + if (!this._events.removeListener) { + if (arguments.length === 0) + this._events = {}; + else if (this._events[type]) + delete this._events[type]; + return this; + } + + // emit removeListener for all listeners on all events + if (arguments.length === 0) { + for (key in this._events) { + if (key === 'removeListener') continue; + this.removeAllListeners(key); + } + this.removeAllListeners('removeListener'); + this._events = {}; + return this; + } + + listeners = this._events[type]; + + if (isFunction(listeners)) { + this.removeListener(type, listeners); + } else if (listeners) { + // LIFO order + while (listeners.length) + this.removeListener(type, listeners[listeners.length - 1]); + } + delete this._events[type]; + + return this; +}; + +EventEmitter.prototype.listeners = function(type) { + var ret; + if (!this._events || !this._events[type]) + ret = []; + else if (isFunction(this._events[type])) + ret = [this._events[type]]; + else + ret = this._events[type].slice(); + return ret; +}; + +EventEmitter.prototype.listenerCount = function(type) { + if (this._events) { + var evlistener = this._events[type]; + + if (isFunction(evlistener)) + return 1; + else if (evlistener) + return evlistener.length; + } + return 0; +}; + +EventEmitter.listenerCount = function(emitter, type) { + return emitter.listenerCount(type); +}; + +function isFunction(arg) { + return typeof arg === 'function'; +} + +function isNumber(arg) { + return typeof arg === 'number'; +} + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} + +function isUndefined(arg) { + return arg === void 0; +} + +},{}],8:[function(require,module,exports){ +if (typeof Object.create === 'function') { + // implementation from standard node.js 'util' module + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + ctor.prototype = Object.create(superCtor.prototype, { + constructor: { + value: ctor, + enumerable: false, + writable: true, + configurable: true + } + }); + }; +} else { + // old school shim for old browsers + module.exports = function inherits(ctor, superCtor) { + ctor.super_ = superCtor + var TempCtor = function () {} + TempCtor.prototype = superCtor.prototype + ctor.prototype = new TempCtor() + ctor.prototype.constructor = ctor + } +} + +},{}],9:[function(require,module,exports){ +/*! + * Determine if an object is a Buffer + * + * @author Feross Aboukhadijeh + * @license MIT + */ + +// The _isBuffer check is for Safari 5-7 support, because it's missing +// Object.prototype.constructor. Remove this eventually +module.exports = function (obj) { + return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer) +} + +function isBuffer (obj) { + return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj) +} + +// For Node v0.10 support. Remove this eventually. +function isSlowBuffer (obj) { + return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0)) +} + +},{}],10:[function(require,module,exports){ +// shim for using process in browser +var process = module.exports = {}; + +// cached from whatever global is present so that test runners that stub it +// don't break things. But we need to wrap it in a try catch in case it is +// wrapped in strict mode code which doesn't define any globals. It's inside a +// function because try/catches deoptimize in certain engines. + +var cachedSetTimeout; +var cachedClearTimeout; + +function defaultSetTimout() { + throw new Error('setTimeout has not been defined'); +} +function defaultClearTimeout () { + throw new Error('clearTimeout has not been defined'); +} +(function () { + try { + if (typeof setTimeout === 'function') { + cachedSetTimeout = setTimeout; + } else { + cachedSetTimeout = defaultSetTimout; + } + } catch (e) { + cachedSetTimeout = defaultSetTimout; + } + try { + if (typeof clearTimeout === 'function') { + cachedClearTimeout = clearTimeout; + } else { + cachedClearTimeout = defaultClearTimeout; + } + } catch (e) { + cachedClearTimeout = defaultClearTimeout; + } +} ()) +function runTimeout(fun) { + if (cachedSetTimeout === setTimeout) { + //normal enviroments in sane situations + return setTimeout(fun, 0); + } + // if setTimeout wasn't available but was latter defined + if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) { + cachedSetTimeout = setTimeout; + return setTimeout(fun, 0); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedSetTimeout(fun, 0); + } catch(e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedSetTimeout.call(null, fun, 0); + } catch(e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error + return cachedSetTimeout.call(this, fun, 0); + } + } + + +} +function runClearTimeout(marker) { + if (cachedClearTimeout === clearTimeout) { + //normal enviroments in sane situations + return clearTimeout(marker); + } + // if clearTimeout wasn't available but was latter defined + if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) { + cachedClearTimeout = clearTimeout; + return clearTimeout(marker); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedClearTimeout(marker); + } catch (e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedClearTimeout.call(null, marker); + } catch (e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error. + // Some versions of I.E. have different rules for clearTimeout vs setTimeout + return cachedClearTimeout.call(this, marker); + } + } + + + +} +var queue = []; +var draining = false; +var currentQueue; +var queueIndex = -1; + +function cleanUpNextTick() { + if (!draining || !currentQueue) { + return; + } + draining = false; + if (currentQueue.length) { + queue = currentQueue.concat(queue); + } else { + queueIndex = -1; + } + if (queue.length) { + drainQueue(); + } +} + +function drainQueue() { + if (draining) { + return; + } + var timeout = runTimeout(cleanUpNextTick); + draining = true; + + var len = queue.length; + while(len) { + currentQueue = queue; + queue = []; + while (++queueIndex < len) { + if (currentQueue) { + currentQueue[queueIndex].run(); + } + } + queueIndex = -1; + len = queue.length; + } + currentQueue = null; + draining = false; + runClearTimeout(timeout); +} + +process.nextTick = function (fun) { + var args = new Array(arguments.length - 1); + if (arguments.length > 1) { + for (var i = 1; i < arguments.length; i++) { + args[i - 1] = arguments[i]; + } + } + queue.push(new Item(fun, args)); + if (queue.length === 1 && !draining) { + runTimeout(drainQueue); + } +}; + +// v8 likes predictible objects +function Item(fun, array) { + this.fun = fun; + this.array = array; +} +Item.prototype.run = function () { + this.fun.apply(null, this.array); +}; +process.title = 'browser'; +process.browser = true; +process.env = {}; +process.argv = []; +process.version = ''; // empty string to avoid regexp issues +process.versions = {}; + +function noop() {} + +process.on = noop; +process.addListener = noop; +process.once = noop; +process.off = noop; +process.removeListener = noop; +process.removeAllListeners = noop; +process.emit = noop; + +process.binding = function (name) { + throw new Error('process.binding is not supported'); +}; + +process.cwd = function () { return '/' }; +process.chdir = function (dir) { + throw new Error('process.chdir is not supported'); +}; +process.umask = function() { return 0; }; + +},{}],11:[function(require,module,exports){ +module.exports = require("./lib/_stream_duplex.js") + +},{"./lib/_stream_duplex.js":12}],12:[function(require,module,exports){ +// a duplex stream is just a stream that is both readable and writable. +// Since JS doesn't have multiple prototypal inheritance, this class +// prototypally inherits from Readable, and then parasitically from +// Writable. + +'use strict'; + +/**/ + +var objectKeys = Object.keys || function (obj) { + var keys = []; + for (var key in obj) { + keys.push(key); + }return keys; +}; +/**/ + +module.exports = Duplex; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +var Readable = require('./_stream_readable'); +var Writable = require('./_stream_writable'); + +util.inherits(Duplex, Readable); + +var keys = objectKeys(Writable.prototype); +for (var v = 0; v < keys.length; v++) { + var method = keys[v]; + if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method]; +} + +function Duplex(options) { + if (!(this instanceof Duplex)) return new Duplex(options); + + Readable.call(this, options); + Writable.call(this, options); + + if (options && options.readable === false) this.readable = false; + + if (options && options.writable === false) this.writable = false; + + this.allowHalfOpen = true; + if (options && options.allowHalfOpen === false) this.allowHalfOpen = false; + + this.once('end', onend); +} + +// the no-half-open enforcer +function onend() { + // if we allow half-open state, or if the writable side ended, + // then we're ok. + if (this.allowHalfOpen || this._writableState.ended) return; + + // no more data can be written. + // But allow more writes to happen in this tick. + processNextTick(onEndNT, this); +} + +function onEndNT(self) { + self.end(); +} + +function forEach(xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); + } +} +},{"./_stream_readable":14,"./_stream_writable":16,"core-util-is":19,"inherits":8,"process-nextick-args":21}],13:[function(require,module,exports){ +// a passthrough stream. +// basically just the most minimal sort of Transform stream. +// Every written chunk gets output as-is. + +'use strict'; + +module.exports = PassThrough; + +var Transform = require('./_stream_transform'); + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +util.inherits(PassThrough, Transform); + +function PassThrough(options) { + if (!(this instanceof PassThrough)) return new PassThrough(options); + + Transform.call(this, options); +} + +PassThrough.prototype._transform = function (chunk, encoding, cb) { + cb(null, chunk); +}; +},{"./_stream_transform":15,"core-util-is":19,"inherits":8}],14:[function(require,module,exports){ +(function (process){ +'use strict'; + +module.exports = Readable; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var isArray = require('isarray'); +/**/ + +Readable.ReadableState = ReadableState; + +/**/ +var EE = require('events').EventEmitter; + +var EElistenerCount = function (emitter, type) { + return emitter.listeners(type).length; +}; +/**/ + +/**/ +var Stream; +(function () { + try { + Stream = require('st' + 'ream'); + } catch (_) {} finally { + if (!Stream) Stream = require('events').EventEmitter; + } +})(); +/**/ + +var Buffer = require('buffer').Buffer; +/**/ +var bufferShim = require('buffer-shims'); +/**/ + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +/**/ +var debugUtil = require('util'); +var debug = void 0; +if (debugUtil && debugUtil.debuglog) { + debug = debugUtil.debuglog('stream'); +} else { + debug = function () {}; +} +/**/ + +var BufferList = require('./internal/streams/BufferList'); +var StringDecoder; + +util.inherits(Readable, Stream); + +function prependListener(emitter, event, fn) { + if (typeof emitter.prependListener === 'function') { + return emitter.prependListener(event, fn); + } else { + // This is a hack to make sure that our error handler is attached before any + // userland ones. NEVER DO THIS. This is here only because this code needs + // to continue to work with older versions of Node.js that do not include + // the prependListener() method. The goal is to eventually remove this hack. + if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]]; + } +} + +var Duplex; +function ReadableState(options, stream) { + Duplex = Duplex || require('./_stream_duplex'); + + options = options || {}; + + // object stream flag. Used to make read(n) ignore n and to + // make all the buffer merging and length checks go away + this.objectMode = !!options.objectMode; + + if (stream instanceof Duplex) this.objectMode = this.objectMode || !!options.readableObjectMode; + + // the point at which it stops calling _read() to fill the buffer + // Note: 0 is a valid value, means "don't call _read preemptively ever" + var hwm = options.highWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + this.highWaterMark = hwm || hwm === 0 ? hwm : defaultHwm; + + // cast to ints. + this.highWaterMark = ~ ~this.highWaterMark; + + // A linked list is used to store data chunks instead of an array because the + // linked list can remove elements from the beginning faster than + // array.shift() + this.buffer = new BufferList(); + this.length = 0; + this.pipes = null; + this.pipesCount = 0; + this.flowing = null; + this.ended = false; + this.endEmitted = false; + this.reading = false; + + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. + this.sync = true; + + // whenever we return null, then we set a flag to say + // that we're awaiting a 'readable' event emission. + this.needReadable = false; + this.emittedReadable = false; + this.readableListening = false; + this.resumeScheduled = false; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // when piping, we only care about 'readable' events that happen + // after read()ing all the bytes and not getting any pushback. + this.ranOut = false; + + // the number of writers that are awaiting a drain event in .pipe()s + this.awaitDrain = 0; + + // if true, a maybeReadMore has been scheduled + this.readingMore = false; + + this.decoder = null; + this.encoding = null; + if (options.encoding) { + if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; + this.decoder = new StringDecoder(options.encoding); + this.encoding = options.encoding; + } +} + +var Duplex; +function Readable(options) { + Duplex = Duplex || require('./_stream_duplex'); + + if (!(this instanceof Readable)) return new Readable(options); + + this._readableState = new ReadableState(options, this); + + // legacy + this.readable = true; + + if (options && typeof options.read === 'function') this._read = options.read; + + Stream.call(this); +} + +// Manually shove something into the read() buffer. +// This returns true if the highWaterMark has not been hit yet, +// similar to how Writable.write() returns true if you should +// write() some more. +Readable.prototype.push = function (chunk, encoding) { + var state = this._readableState; + + if (!state.objectMode && typeof chunk === 'string') { + encoding = encoding || state.defaultEncoding; + if (encoding !== state.encoding) { + chunk = bufferShim.from(chunk, encoding); + encoding = ''; + } + } + + return readableAddChunk(this, state, chunk, encoding, false); +}; + +// Unshift should *always* be something directly out of read() +Readable.prototype.unshift = function (chunk) { + var state = this._readableState; + return readableAddChunk(this, state, chunk, '', true); +}; + +Readable.prototype.isPaused = function () { + return this._readableState.flowing === false; +}; + +function readableAddChunk(stream, state, chunk, encoding, addToFront) { + var er = chunkInvalid(state, chunk); + if (er) { + stream.emit('error', er); + } else if (chunk === null) { + state.reading = false; + onEofChunk(stream, state); + } else if (state.objectMode || chunk && chunk.length > 0) { + if (state.ended && !addToFront) { + var e = new Error('stream.push() after EOF'); + stream.emit('error', e); + } else if (state.endEmitted && addToFront) { + var _e = new Error('stream.unshift() after end event'); + stream.emit('error', _e); + } else { + var skipAdd; + if (state.decoder && !addToFront && !encoding) { + chunk = state.decoder.write(chunk); + skipAdd = !state.objectMode && chunk.length === 0; + } + + if (!addToFront) state.reading = false; + + // Don't add to the buffer if we've decoded to an empty string chunk and + // we're not in object mode + if (!skipAdd) { + // if we want the data now, just emit it. + if (state.flowing && state.length === 0 && !state.sync) { + stream.emit('data', chunk); + stream.read(0); + } else { + // update the buffer info. + state.length += state.objectMode ? 1 : chunk.length; + if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk); + + if (state.needReadable) emitReadable(stream); + } + } + + maybeReadMore(stream, state); + } + } else if (!addToFront) { + state.reading = false; + } + + return needMoreData(state); +} + +// if it's past the high water mark, we can push in some more. +// Also, if we have no data yet, we can stand some +// more bytes. This is to work around cases where hwm=0, +// such as the repl. Also, if the push() triggered a +// readable event, and the user called read(largeNumber) such that +// needReadable was set, then we ought to push more, so that another +// 'readable' event will be triggered. +function needMoreData(state) { + return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0); +} + +// backwards compatibility. +Readable.prototype.setEncoding = function (enc) { + if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; + this._readableState.decoder = new StringDecoder(enc); + this._readableState.encoding = enc; + return this; +}; + +// Don't raise the hwm > 8MB +var MAX_HWM = 0x800000; +function computeNewHighWaterMark(n) { + if (n >= MAX_HWM) { + n = MAX_HWM; + } else { + // Get the next highest power of 2 to prevent increasing hwm excessively in + // tiny amounts + n--; + n |= n >>> 1; + n |= n >>> 2; + n |= n >>> 4; + n |= n >>> 8; + n |= n >>> 16; + n++; + } + return n; +} + +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function howMuchToRead(n, state) { + if (n <= 0 || state.length === 0 && state.ended) return 0; + if (state.objectMode) return 1; + if (n !== n) { + // Only flow one buffer at a time + if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length; + } + // If we're asking for more than the current hwm, then raise the hwm. + if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n); + if (n <= state.length) return n; + // Don't have enough + if (!state.ended) { + state.needReadable = true; + return 0; + } + return state.length; +} + +// you can override either this method, or the async _read(n) below. +Readable.prototype.read = function (n) { + debug('read', n); + n = parseInt(n, 10); + var state = this._readableState; + var nOrig = n; + + if (n !== 0) state.emittedReadable = false; + + // if we're doing read(0) to trigger a readable event, but we + // already have a bunch of data in the buffer, then just trigger + // the 'readable' event and move on. + if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) { + debug('read: emitReadable', state.length, state.ended); + if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this); + return null; + } + + n = howMuchToRead(n, state); + + // if we've ended, and we're now clear, then finish it up. + if (n === 0 && state.ended) { + if (state.length === 0) endReadable(this); + return null; + } + + // All the actual chunk generation logic needs to be + // *below* the call to _read. The reason is that in certain + // synthetic stream cases, such as passthrough streams, _read + // may be a completely synchronous operation which may change + // the state of the read buffer, providing enough data when + // before there was *not* enough. + // + // So, the steps are: + // 1. Figure out what the state of things will be after we do + // a read from the buffer. + // + // 2. If that resulting state will trigger a _read, then call _read. + // Note that this may be asynchronous, or synchronous. Yes, it is + // deeply ugly to write APIs this way, but that still doesn't mean + // that the Readable class should behave improperly, as streams are + // designed to be sync/async agnostic. + // Take note if the _read call is sync or async (ie, if the read call + // has returned yet), so that we know whether or not it's safe to emit + // 'readable' etc. + // + // 3. Actually pull the requested chunks out of the buffer and return. + + // if we need a readable event, then we need to do some reading. + var doRead = state.needReadable; + debug('need readable', doRead); + + // if we currently have less than the highWaterMark, then also read some + if (state.length === 0 || state.length - n < state.highWaterMark) { + doRead = true; + debug('length less than watermark', doRead); + } + + // however, if we've ended, then there's no point, and if we're already + // reading, then it's unnecessary. + if (state.ended || state.reading) { + doRead = false; + debug('reading or ended', doRead); + } else if (doRead) { + debug('do read'); + state.reading = true; + state.sync = true; + // if the length is currently zero, then we *need* a readable event. + if (state.length === 0) state.needReadable = true; + // call internal read method + this._read(state.highWaterMark); + state.sync = false; + // If _read pushed data synchronously, then `reading` will be false, + // and we need to re-evaluate how much data we can return to the user. + if (!state.reading) n = howMuchToRead(nOrig, state); + } + + var ret; + if (n > 0) ret = fromList(n, state);else ret = null; + + if (ret === null) { + state.needReadable = true; + n = 0; + } else { + state.length -= n; + } + + if (state.length === 0) { + // If we have nothing in the buffer, then we want to know + // as soon as we *do* get something into the buffer. + if (!state.ended) state.needReadable = true; + + // If we tried to read() past the EOF, then emit end on the next tick. + if (nOrig !== n && state.ended) endReadable(this); + } + + if (ret !== null) this.emit('data', ret); + + return ret; +}; + +function chunkInvalid(state, chunk) { + var er = null; + if (!Buffer.isBuffer(chunk) && typeof chunk !== 'string' && chunk !== null && chunk !== undefined && !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + return er; +} + +function onEofChunk(stream, state) { + if (state.ended) return; + if (state.decoder) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) { + state.buffer.push(chunk); + state.length += state.objectMode ? 1 : chunk.length; + } + } + state.ended = true; + + // emit 'readable' now to make sure it gets picked up. + emitReadable(stream); +} + +// Don't emit readable right away in sync mode, because this can trigger +// another read() call => stack overflow. This way, it might trigger +// a nextTick recursion warning, but that's not so bad. +function emitReadable(stream) { + var state = stream._readableState; + state.needReadable = false; + if (!state.emittedReadable) { + debug('emitReadable', state.flowing); + state.emittedReadable = true; + if (state.sync) processNextTick(emitReadable_, stream);else emitReadable_(stream); + } +} + +function emitReadable_(stream) { + debug('emit readable'); + stream.emit('readable'); + flow(stream); +} + +// at this point, the user has presumably seen the 'readable' event, +// and called read() to consume some data. that may have triggered +// in turn another _read(n) call, in which case reading = true if +// it's in progress. +// However, if we're not ended, or reading, and the length < hwm, +// then go ahead and try to read some more preemptively. +function maybeReadMore(stream, state) { + if (!state.readingMore) { + state.readingMore = true; + processNextTick(maybeReadMore_, stream, state); + } +} + +function maybeReadMore_(stream, state) { + var len = state.length; + while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) { + debug('maybeReadMore read 0'); + stream.read(0); + if (len === state.length) + // didn't get any data, stop spinning. + break;else len = state.length; + } + state.readingMore = false; +} + +// abstract method. to be overridden in specific implementation classes. +// call cb(er, data) where data is <= n in length. +// for virtual (non-string, non-buffer) streams, "length" is somewhat +// arbitrary, and perhaps not very meaningful. +Readable.prototype._read = function (n) { + this.emit('error', new Error('not implemented')); +}; + +Readable.prototype.pipe = function (dest, pipeOpts) { + var src = this; + var state = this._readableState; + + switch (state.pipesCount) { + case 0: + state.pipes = dest; + break; + case 1: + state.pipes = [state.pipes, dest]; + break; + default: + state.pipes.push(dest); + break; + } + state.pipesCount += 1; + debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); + + var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; + + var endFn = doEnd ? onend : cleanup; + if (state.endEmitted) processNextTick(endFn);else src.once('end', endFn); + + dest.on('unpipe', onunpipe); + function onunpipe(readable) { + debug('onunpipe'); + if (readable === src) { + cleanup(); + } + } + + function onend() { + debug('onend'); + dest.end(); + } + + // when the dest drains, it reduces the awaitDrain counter + // on the source. This would be more elegant with a .once() + // handler in flow(), but adding and removing repeatedly is + // too slow. + var ondrain = pipeOnDrain(src); + dest.on('drain', ondrain); + + var cleanedUp = false; + function cleanup() { + debug('cleanup'); + // cleanup event handlers once the pipe is broken + dest.removeListener('close', onclose); + dest.removeListener('finish', onfinish); + dest.removeListener('drain', ondrain); + dest.removeListener('error', onerror); + dest.removeListener('unpipe', onunpipe); + src.removeListener('end', onend); + src.removeListener('end', cleanup); + src.removeListener('data', ondata); + + cleanedUp = true; + + // if the reader is waiting for a drain event from this + // specific writer, then it would cause it to never start + // flowing again. + // So, if this is awaiting a drain, then we just call it now. + // If we don't know, then assume that we are waiting for one. + if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain(); + } + + // If the user pushes more data while we're writing to dest then we'll end up + // in ondata again. However, we only want to increase awaitDrain once because + // dest will only emit one 'drain' event for the multiple writes. + // => Introduce a guard on increasing awaitDrain. + var increasedAwaitDrain = false; + src.on('data', ondata); + function ondata(chunk) { + debug('ondata'); + increasedAwaitDrain = false; + var ret = dest.write(chunk); + if (false === ret && !increasedAwaitDrain) { + // If the user unpiped during `dest.write()`, it is possible + // to get stuck in a permanently paused state if that write + // also returned false. + // => Check whether `dest` is still a piping destination. + if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) { + debug('false write response, pause', src._readableState.awaitDrain); + src._readableState.awaitDrain++; + increasedAwaitDrain = true; + } + src.pause(); + } + } + + // if the dest has an error, then stop piping into it. + // however, don't suppress the throwing behavior for this. + function onerror(er) { + debug('onerror', er); + unpipe(); + dest.removeListener('error', onerror); + if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); + } + + // Make sure our error handler is attached before userland ones. + prependListener(dest, 'error', onerror); + + // Both close and finish should trigger unpipe, but only once. + function onclose() { + dest.removeListener('finish', onfinish); + unpipe(); + } + dest.once('close', onclose); + function onfinish() { + debug('onfinish'); + dest.removeListener('close', onclose); + unpipe(); + } + dest.once('finish', onfinish); + + function unpipe() { + debug('unpipe'); + src.unpipe(dest); + } + + // tell the dest that it's being piped to + dest.emit('pipe', src); + + // start the flow if it hasn't been started already. + if (!state.flowing) { + debug('pipe resume'); + src.resume(); + } + + return dest; +}; + +function pipeOnDrain(src) { + return function () { + var state = src._readableState; + debug('pipeOnDrain', state.awaitDrain); + if (state.awaitDrain) state.awaitDrain--; + if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) { + state.flowing = true; + flow(src); + } + }; +} + +Readable.prototype.unpipe = function (dest) { + var state = this._readableState; + + // if we're not piping anywhere, then do nothing. + if (state.pipesCount === 0) return this; + + // just one destination. most common case. + if (state.pipesCount === 1) { + // passed in one, but it's not the right one. + if (dest && dest !== state.pipes) return this; + + if (!dest) dest = state.pipes; + + // got a match. + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + if (dest) dest.emit('unpipe', this); + return this; + } + + // slow case. multiple pipe destinations. + + if (!dest) { + // remove all. + var dests = state.pipes; + var len = state.pipesCount; + state.pipes = null; + state.pipesCount = 0; + state.flowing = false; + + for (var _i = 0; _i < len; _i++) { + dests[_i].emit('unpipe', this); + }return this; + } + + // try to find the right one. + var i = indexOf(state.pipes, dest); + if (i === -1) return this; + + state.pipes.splice(i, 1); + state.pipesCount -= 1; + if (state.pipesCount === 1) state.pipes = state.pipes[0]; + + dest.emit('unpipe', this); + + return this; +}; + +// set up data events if they are asked for +// Ensure readable listeners eventually get something +Readable.prototype.on = function (ev, fn) { + var res = Stream.prototype.on.call(this, ev, fn); + + if (ev === 'data') { + // Start flowing on next tick if stream isn't explicitly paused + if (this._readableState.flowing !== false) this.resume(); + } else if (ev === 'readable') { + var state = this._readableState; + if (!state.endEmitted && !state.readableListening) { + state.readableListening = state.needReadable = true; + state.emittedReadable = false; + if (!state.reading) { + processNextTick(nReadingNextTick, this); + } else if (state.length) { + emitReadable(this, state); + } + } + } + + return res; +}; +Readable.prototype.addListener = Readable.prototype.on; + +function nReadingNextTick(self) { + debug('readable nexttick read 0'); + self.read(0); +} + +// pause() and resume() are remnants of the legacy readable stream API +// If the user uses them, then switch into old mode. +Readable.prototype.resume = function () { + var state = this._readableState; + if (!state.flowing) { + debug('resume'); + state.flowing = true; + resume(this, state); + } + return this; +}; + +function resume(stream, state) { + if (!state.resumeScheduled) { + state.resumeScheduled = true; + processNextTick(resume_, stream, state); + } +} + +function resume_(stream, state) { + if (!state.reading) { + debug('resume read 0'); + stream.read(0); + } + + state.resumeScheduled = false; + state.awaitDrain = 0; + stream.emit('resume'); + flow(stream); + if (state.flowing && !state.reading) stream.read(0); +} + +Readable.prototype.pause = function () { + debug('call pause flowing=%j', this._readableState.flowing); + if (false !== this._readableState.flowing) { + debug('pause'); + this._readableState.flowing = false; + this.emit('pause'); + } + return this; +}; + +function flow(stream) { + var state = stream._readableState; + debug('flow', state.flowing); + while (state.flowing && stream.read() !== null) {} +} + +// wrap an old-style stream as the async data source. +// This is *not* part of the readable stream interface. +// It is an ugly unfortunate mess of history. +Readable.prototype.wrap = function (stream) { + var state = this._readableState; + var paused = false; + + var self = this; + stream.on('end', function () { + debug('wrapped end'); + if (state.decoder && !state.ended) { + var chunk = state.decoder.end(); + if (chunk && chunk.length) self.push(chunk); + } + + self.push(null); + }); + + stream.on('data', function (chunk) { + debug('wrapped data'); + if (state.decoder) chunk = state.decoder.write(chunk); + + // don't skip over falsy values in objectMode + if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return; + + var ret = self.push(chunk); + if (!ret) { + paused = true; + stream.pause(); + } + }); + + // proxy all the other methods. + // important when wrapping filters and duplexes. + for (var i in stream) { + if (this[i] === undefined && typeof stream[i] === 'function') { + this[i] = function (method) { + return function () { + return stream[method].apply(stream, arguments); + }; + }(i); + } + } + + // proxy certain important events. + var events = ['error', 'close', 'destroy', 'pause', 'resume']; + forEach(events, function (ev) { + stream.on(ev, self.emit.bind(self, ev)); + }); + + // when we try to consume some more bytes, simply unpause the + // underlying stream. + self._read = function (n) { + debug('wrapped _read', n); + if (paused) { + paused = false; + stream.resume(); + } + }; + + return self; +}; + +// exposed for testing purposes only. +Readable._fromList = fromList; + +// Pluck off n bytes from an array of buffers. +// Length is the combined lengths of all the buffers in the list. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function fromList(n, state) { + // nothing buffered + if (state.length === 0) return null; + + var ret; + if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) { + // read it all, truncate the list + if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length); + state.buffer.clear(); + } else { + // read part of list + ret = fromListPartial(n, state.buffer, state.decoder); + } + + return ret; +} + +// Extracts only enough buffered data to satisfy the amount requested. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function fromListPartial(n, list, hasStrings) { + var ret; + if (n < list.head.data.length) { + // slice is the same for buffers and strings + ret = list.head.data.slice(0, n); + list.head.data = list.head.data.slice(n); + } else if (n === list.head.data.length) { + // first chunk is a perfect match + ret = list.shift(); + } else { + // result spans more than one buffer + ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list); + } + return ret; +} + +// Copies a specified amount of characters from the list of buffered data +// chunks. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function copyFromBufferString(n, list) { + var p = list.head; + var c = 1; + var ret = p.data; + n -= ret.length; + while (p = p.next) { + var str = p.data; + var nb = n > str.length ? str.length : n; + if (nb === str.length) ret += str;else ret += str.slice(0, n); + n -= nb; + if (n === 0) { + if (nb === str.length) { + ++c; + if (p.next) list.head = p.next;else list.head = list.tail = null; + } else { + list.head = p; + p.data = str.slice(nb); + } + break; + } + ++c; + } + list.length -= c; + return ret; +} + +// Copies a specified amount of bytes from the list of buffered data chunks. +// This function is designed to be inlinable, so please take care when making +// changes to the function body. +function copyFromBuffer(n, list) { + var ret = bufferShim.allocUnsafe(n); + var p = list.head; + var c = 1; + p.data.copy(ret); + n -= p.data.length; + while (p = p.next) { + var buf = p.data; + var nb = n > buf.length ? buf.length : n; + buf.copy(ret, ret.length - n, 0, nb); + n -= nb; + if (n === 0) { + if (nb === buf.length) { + ++c; + if (p.next) list.head = p.next;else list.head = list.tail = null; + } else { + list.head = p; + p.data = buf.slice(nb); + } + break; + } + ++c; + } + list.length -= c; + return ret; +} + +function endReadable(stream) { + var state = stream._readableState; + + // If we get here before consuming all the bytes, then that is a + // bug in node. Should never happen. + if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream'); + + if (!state.endEmitted) { + state.ended = true; + processNextTick(endReadableNT, state, stream); + } +} + +function endReadableNT(state, stream) { + // Check that we didn't get one last unshift. + if (!state.endEmitted && state.length === 0) { + state.endEmitted = true; + stream.readable = false; + stream.emit('end'); + } +} + +function forEach(xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); + } +} + +function indexOf(xs, x) { + for (var i = 0, l = xs.length; i < l; i++) { + if (xs[i] === x) return i; + } + return -1; +} +}).call(this,require('_process')) +},{"./_stream_duplex":12,"./internal/streams/BufferList":17,"_process":10,"buffer":3,"buffer-shims":18,"core-util-is":19,"events":7,"inherits":8,"isarray":20,"process-nextick-args":21,"string_decoder/":28,"util":2}],15:[function(require,module,exports){ +// a transform stream is a readable/writable stream where you do +// something with the data. Sometimes it's called a "filter", +// but that's not a great name for it, since that implies a thing where +// some bits pass through, and others are simply ignored. (That would +// be a valid example of a transform, of course.) +// +// While the output is causally related to the input, it's not a +// necessarily symmetric or synchronous transformation. For example, +// a zlib stream might take multiple plain-text writes(), and then +// emit a single compressed chunk some time in the future. +// +// Here's how this works: +// +// The Transform stream has all the aspects of the readable and writable +// stream classes. When you write(chunk), that calls _write(chunk,cb) +// internally, and returns false if there's a lot of pending writes +// buffered up. When you call read(), that calls _read(n) until +// there's enough pending readable data buffered up. +// +// In a transform stream, the written data is placed in a buffer. When +// _read(n) is called, it transforms the queued up data, calling the +// buffered _write cb's as it consumes chunks. If consuming a single +// written chunk would result in multiple output chunks, then the first +// outputted bit calls the readcb, and subsequent chunks just go into +// the read buffer, and will cause it to emit 'readable' if necessary. +// +// This way, back-pressure is actually determined by the reading side, +// since _read has to be called to start processing a new chunk. However, +// a pathological inflate type of transform can cause excessive buffering +// here. For example, imagine a stream where every byte of input is +// interpreted as an integer from 0-255, and then results in that many +// bytes of output. Writing the 4 bytes {ff,ff,ff,ff} would result in +// 1kb of data being output. In this case, you could write a very small +// amount of input, and end up with a very large amount of output. In +// such a pathological inflating mechanism, there'd be no way to tell +// the system to stop doing the transform. A single 4MB write could +// cause the system to run out of memory. +// +// However, even in such a pathological case, only a single written chunk +// would be consumed, and then the rest would wait (un-transformed) until +// the results of the previous transformed chunk were consumed. + +'use strict'; + +module.exports = Transform; + +var Duplex = require('./_stream_duplex'); + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +util.inherits(Transform, Duplex); + +function TransformState(stream) { + this.afterTransform = function (er, data) { + return afterTransform(stream, er, data); + }; + + this.needTransform = false; + this.transforming = false; + this.writecb = null; + this.writechunk = null; + this.writeencoding = null; +} + +function afterTransform(stream, er, data) { + var ts = stream._transformState; + ts.transforming = false; + + var cb = ts.writecb; + + if (!cb) return stream.emit('error', new Error('no writecb in Transform class')); + + ts.writechunk = null; + ts.writecb = null; + + if (data !== null && data !== undefined) stream.push(data); + + cb(er); + + var rs = stream._readableState; + rs.reading = false; + if (rs.needReadable || rs.length < rs.highWaterMark) { + stream._read(rs.highWaterMark); + } +} + +function Transform(options) { + if (!(this instanceof Transform)) return new Transform(options); + + Duplex.call(this, options); + + this._transformState = new TransformState(this); + + // when the writable side finishes, then flush out anything remaining. + var stream = this; + + // start out asking for a readable event once data is transformed. + this._readableState.needReadable = true; + + // we have implemented the _read method, and done the other things + // that Readable wants before the first _read call, so unset the + // sync guard flag. + this._readableState.sync = false; + + if (options) { + if (typeof options.transform === 'function') this._transform = options.transform; + + if (typeof options.flush === 'function') this._flush = options.flush; + } + + this.once('prefinish', function () { + if (typeof this._flush === 'function') this._flush(function (er) { + done(stream, er); + });else done(stream); + }); +} + +Transform.prototype.push = function (chunk, encoding) { + this._transformState.needTransform = false; + return Duplex.prototype.push.call(this, chunk, encoding); +}; + +// This is the part where you do stuff! +// override this function in implementation classes. +// 'chunk' is an input chunk. +// +// Call `push(newChunk)` to pass along transformed output +// to the readable side. You may call 'push' zero or more times. +// +// Call `cb(err)` when you are done with this chunk. If you pass +// an error, then that'll put the hurt on the whole operation. If you +// never call cb(), then you'll never get another chunk. +Transform.prototype._transform = function (chunk, encoding, cb) { + throw new Error('Not implemented'); +}; + +Transform.prototype._write = function (chunk, encoding, cb) { + var ts = this._transformState; + ts.writecb = cb; + ts.writechunk = chunk; + ts.writeencoding = encoding; + if (!ts.transforming) { + var rs = this._readableState; + if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark); + } +}; + +// Doesn't matter what the args are here. +// _transform does all the work. +// That we got here means that the readable side wants more data. +Transform.prototype._read = function (n) { + var ts = this._transformState; + + if (ts.writechunk !== null && ts.writecb && !ts.transforming) { + ts.transforming = true; + this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform); + } else { + // mark that we need a transform, so that any data that comes in + // will get processed, now that we've asked for it. + ts.needTransform = true; + } +}; + +function done(stream, er) { + if (er) return stream.emit('error', er); + + // if there's nothing in the write buffer, then that means + // that nothing more will ever be provided + var ws = stream._writableState; + var ts = stream._transformState; + + if (ws.length) throw new Error('Calling transform done when ws.length != 0'); + + if (ts.transforming) throw new Error('Calling transform done when still transforming'); + + return stream.push(null); +} +},{"./_stream_duplex":12,"core-util-is":19,"inherits":8}],16:[function(require,module,exports){ +(function (process){ +// A bit simpler than readable streams. +// Implement an async ._write(chunk, encoding, cb), and it'll handle all +// the drain event emission and buffering. + +'use strict'; + +module.exports = Writable; + +/**/ +var processNextTick = require('process-nextick-args'); +/**/ + +/**/ +var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : processNextTick; +/**/ + +Writable.WritableState = WritableState; + +/**/ +var util = require('core-util-is'); +util.inherits = require('inherits'); +/**/ + +/**/ +var internalUtil = { + deprecate: require('util-deprecate') +}; +/**/ + +/**/ +var Stream; +(function () { + try { + Stream = require('st' + 'ream'); + } catch (_) {} finally { + if (!Stream) Stream = require('events').EventEmitter; + } +})(); +/**/ + +var Buffer = require('buffer').Buffer; +/**/ +var bufferShim = require('buffer-shims'); +/**/ + +util.inherits(Writable, Stream); + +function nop() {} + +function WriteReq(chunk, encoding, cb) { + this.chunk = chunk; + this.encoding = encoding; + this.callback = cb; + this.next = null; +} + +var Duplex; +function WritableState(options, stream) { + Duplex = Duplex || require('./_stream_duplex'); + + options = options || {}; + + // object stream flag to indicate whether or not this stream + // contains buffers or objects. + this.objectMode = !!options.objectMode; + + if (stream instanceof Duplex) this.objectMode = this.objectMode || !!options.writableObjectMode; + + // the point at which write() starts returning false + // Note: 0 is a valid value, means that we always return false if + // the entire buffer is not flushed immediately on write() + var hwm = options.highWaterMark; + var defaultHwm = this.objectMode ? 16 : 16 * 1024; + this.highWaterMark = hwm || hwm === 0 ? hwm : defaultHwm; + + // cast to ints. + this.highWaterMark = ~ ~this.highWaterMark; + + this.needDrain = false; + // at the start of calling end() + this.ending = false; + // when end() has been called, and returned + this.ended = false; + // when 'finish' is emitted + this.finished = false; + + // should we decode strings into buffers before passing to _write? + // this is here so that some node-core streams can optimize string + // handling at a lower level. + var noDecode = options.decodeStrings === false; + this.decodeStrings = !noDecode; + + // Crypto is kind of old and crusty. Historically, its default string + // encoding is 'binary' so we have to make this configurable. + // Everything else in the universe uses 'utf8', though. + this.defaultEncoding = options.defaultEncoding || 'utf8'; + + // not an actual buffer we keep track of, but a measurement + // of how much we're waiting to get pushed to some underlying + // socket or file. + this.length = 0; + + // a flag to see when we're in the middle of a write. + this.writing = false; + + // when true all writes will be buffered until .uncork() call + this.corked = 0; + + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. + this.sync = true; + + // a flag to know if we're processing previously buffered items, which + // may call the _write() callback in the same tick, so that we don't + // end up in an overlapped onwrite situation. + this.bufferProcessing = false; + + // the callback that's passed to _write(chunk,cb) + this.onwrite = function (er) { + onwrite(stream, er); + }; + + // the callback that the user supplies to write(chunk,encoding,cb) + this.writecb = null; + + // the amount that is being written when _write is called. + this.writelen = 0; + + this.bufferedRequest = null; + this.lastBufferedRequest = null; + + // number of pending user-supplied write callbacks + // this must be 0 before 'finish' can be emitted + this.pendingcb = 0; + + // emit prefinish if the only thing we're waiting for is _write cbs + // This is relevant for synchronous Transform streams + this.prefinished = false; + + // True if the error was already emitted and should not be thrown again + this.errorEmitted = false; + + // count buffered requests + this.bufferedRequestCount = 0; + + // allocate the first CorkedRequest, there is always + // one allocated and free to use, and we maintain at most two + this.corkedRequestsFree = new CorkedRequest(this); +} + +WritableState.prototype.getBuffer = function writableStateGetBuffer() { + var current = this.bufferedRequest; + var out = []; + while (current) { + out.push(current); + current = current.next; + } + return out; +}; + +(function () { + try { + Object.defineProperty(WritableState.prototype, 'buffer', { + get: internalUtil.deprecate(function () { + return this.getBuffer(); + }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.') + }); + } catch (_) {} +})(); + +var Duplex; +function Writable(options) { + Duplex = Duplex || require('./_stream_duplex'); + + // Writable ctor is applied to Duplexes, though they're not + // instanceof Writable, they're instanceof Readable. + if (!(this instanceof Writable) && !(this instanceof Duplex)) return new Writable(options); + + this._writableState = new WritableState(options, this); + + // legacy. + this.writable = true; + + if (options) { + if (typeof options.write === 'function') this._write = options.write; + + if (typeof options.writev === 'function') this._writev = options.writev; + } + + Stream.call(this); +} + +// Otherwise people can pipe Writable streams, which is just wrong. +Writable.prototype.pipe = function () { + this.emit('error', new Error('Cannot pipe, not readable')); +}; + +function writeAfterEnd(stream, cb) { + var er = new Error('write after end'); + // TODO: defer error events consistently everywhere, not just the cb + stream.emit('error', er); + processNextTick(cb, er); +} + +// If we get something that is not a buffer, string, null, or undefined, +// and we're not in objectMode, then that's an error. +// Otherwise stream chunks are all considered to be of length=1, and the +// watermarks determine how many objects to keep in the buffer, rather than +// how many bytes or characters. +function validChunk(stream, state, chunk, cb) { + var valid = true; + var er = false; + // Always throw error if a null is written + // if we are not in object mode then throw + // if it is not a buffer, string, or undefined. + if (chunk === null) { + er = new TypeError('May not write null values to stream'); + } else if (!Buffer.isBuffer(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + if (er) { + stream.emit('error', er); + processNextTick(cb, er); + valid = false; + } + return valid; +} + +Writable.prototype.write = function (chunk, encoding, cb) { + var state = this._writableState; + var ret = false; + + if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (Buffer.isBuffer(chunk)) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding; + + if (typeof cb !== 'function') cb = nop; + + if (state.ended) writeAfterEnd(this, cb);else if (validChunk(this, state, chunk, cb)) { + state.pendingcb++; + ret = writeOrBuffer(this, state, chunk, encoding, cb); + } + + return ret; +}; + +Writable.prototype.cork = function () { + var state = this._writableState; + + state.corked++; +}; + +Writable.prototype.uncork = function () { + var state = this._writableState; + + if (state.corked) { + state.corked--; + + if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state); + } +}; + +Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { + // node::ParseEncoding() requires lower case. + if (typeof encoding === 'string') encoding = encoding.toLowerCase(); + if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding); + this._writableState.defaultEncoding = encoding; + return this; +}; + +function decodeChunk(state, chunk, encoding) { + if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { + chunk = bufferShim.from(chunk, encoding); + } + return chunk; +} + +// if we're already writing something, then just put this +// in the queue, and wait our turn. Otherwise, call _write +// If we return false, then we need a drain event, so set that flag. +function writeOrBuffer(stream, state, chunk, encoding, cb) { + chunk = decodeChunk(state, chunk, encoding); + + if (Buffer.isBuffer(chunk)) encoding = 'buffer'; + var len = state.objectMode ? 1 : chunk.length; + + state.length += len; + + var ret = state.length < state.highWaterMark; + // we must ensure that previous needDrain will not be reset to false. + if (!ret) state.needDrain = true; + + if (state.writing || state.corked) { + var last = state.lastBufferedRequest; + state.lastBufferedRequest = new WriteReq(chunk, encoding, cb); + if (last) { + last.next = state.lastBufferedRequest; + } else { + state.bufferedRequest = state.lastBufferedRequest; + } + state.bufferedRequestCount += 1; + } else { + doWrite(stream, state, false, len, chunk, encoding, cb); + } + + return ret; +} + +function doWrite(stream, state, writev, len, chunk, encoding, cb) { + state.writelen = len; + state.writecb = cb; + state.writing = true; + state.sync = true; + if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite); + state.sync = false; +} + +function onwriteError(stream, state, sync, er, cb) { + --state.pendingcb; + if (sync) processNextTick(cb, er);else cb(er); + + stream._writableState.errorEmitted = true; + stream.emit('error', er); +} + +function onwriteStateUpdate(state) { + state.writing = false; + state.writecb = null; + state.length -= state.writelen; + state.writelen = 0; +} + +function onwrite(stream, er) { + var state = stream._writableState; + var sync = state.sync; + var cb = state.writecb; + + onwriteStateUpdate(state); + + if (er) onwriteError(stream, state, sync, er, cb);else { + // Check if we're actually ready to finish, but don't emit yet + var finished = needFinish(state); + + if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) { + clearBuffer(stream, state); + } + + if (sync) { + /**/ + asyncWrite(afterWrite, stream, state, finished, cb); + /**/ + } else { + afterWrite(stream, state, finished, cb); + } + } +} + +function afterWrite(stream, state, finished, cb) { + if (!finished) onwriteDrain(stream, state); + state.pendingcb--; + cb(); + finishMaybe(stream, state); +} + +// Must force callback to be called on nextTick, so that we don't +// emit 'drain' before the write() consumer gets the 'false' return +// value, and has a chance to attach a 'drain' listener. +function onwriteDrain(stream, state) { + if (state.length === 0 && state.needDrain) { + state.needDrain = false; + stream.emit('drain'); + } +} + +// if there's something in the buffer waiting, then process it +function clearBuffer(stream, state) { + state.bufferProcessing = true; + var entry = state.bufferedRequest; + + if (stream._writev && entry && entry.next) { + // Fast case, write everything using _writev() + var l = state.bufferedRequestCount; + var buffer = new Array(l); + var holder = state.corkedRequestsFree; + holder.entry = entry; + + var count = 0; + while (entry) { + buffer[count] = entry; + entry = entry.next; + count += 1; + } + + doWrite(stream, state, true, state.length, buffer, '', holder.finish); + + // doWrite is almost always async, defer these to save a bit of time + // as the hot path ends with doWrite + state.pendingcb++; + state.lastBufferedRequest = null; + if (holder.next) { + state.corkedRequestsFree = holder.next; + holder.next = null; + } else { + state.corkedRequestsFree = new CorkedRequest(state); + } + } else { + // Slow case, write chunks one-by-one + while (entry) { + var chunk = entry.chunk; + var encoding = entry.encoding; + var cb = entry.callback; + var len = state.objectMode ? 1 : chunk.length; + + doWrite(stream, state, false, len, chunk, encoding, cb); + entry = entry.next; + // if we didn't call the onwrite immediately, then + // it means that we need to wait until it does. + // also, that means that the chunk and cb are currently + // being processed, so move the buffer counter past them. + if (state.writing) { + break; + } + } + + if (entry === null) state.lastBufferedRequest = null; + } + + state.bufferedRequestCount = 0; + state.bufferedRequest = entry; + state.bufferProcessing = false; +} + +Writable.prototype._write = function (chunk, encoding, cb) { + cb(new Error('not implemented')); +}; + +Writable.prototype._writev = null; + +Writable.prototype.end = function (chunk, encoding, cb) { + var state = this._writableState; + + if (typeof chunk === 'function') { + cb = chunk; + chunk = null; + encoding = null; + } else if (typeof encoding === 'function') { + cb = encoding; + encoding = null; + } + + if (chunk !== null && chunk !== undefined) this.write(chunk, encoding); + + // .end() fully uncorks + if (state.corked) { + state.corked = 1; + this.uncork(); + } + + // ignore unnecessary end() calls. + if (!state.ending && !state.finished) endWritable(this, state, cb); +}; + +function needFinish(state) { + return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing; +} + +function prefinish(stream, state) { + if (!state.prefinished) { + state.prefinished = true; + stream.emit('prefinish'); + } +} + +function finishMaybe(stream, state) { + var need = needFinish(state); + if (need) { + if (state.pendingcb === 0) { + prefinish(stream, state); + state.finished = true; + stream.emit('finish'); + } else { + prefinish(stream, state); + } + } + return need; +} + +function endWritable(stream, state, cb) { + state.ending = true; + finishMaybe(stream, state); + if (cb) { + if (state.finished) processNextTick(cb);else stream.once('finish', cb); + } + state.ended = true; + stream.writable = false; +} + +// It seems a linked list but it is not +// there will be only 2 of these for each stream +function CorkedRequest(state) { + var _this = this; + + this.next = null; + this.entry = null; + + this.finish = function (err) { + var entry = _this.entry; + _this.entry = null; + while (entry) { + var cb = entry.callback; + state.pendingcb--; + cb(err); + entry = entry.next; + } + if (state.corkedRequestsFree) { + state.corkedRequestsFree.next = _this; + } else { + state.corkedRequestsFree = _this; + } + }; +} +}).call(this,require('_process')) +},{"./_stream_duplex":12,"_process":10,"buffer":3,"buffer-shims":18,"core-util-is":19,"events":7,"inherits":8,"process-nextick-args":21,"util-deprecate":22}],17:[function(require,module,exports){ +'use strict'; + +var Buffer = require('buffer').Buffer; +/**/ +var bufferShim = require('buffer-shims'); +/**/ + +module.exports = BufferList; + +function BufferList() { + this.head = null; + this.tail = null; + this.length = 0; +} + +BufferList.prototype.push = function (v) { + var entry = { data: v, next: null }; + if (this.length > 0) this.tail.next = entry;else this.head = entry; + this.tail = entry; + ++this.length; +}; + +BufferList.prototype.unshift = function (v) { + var entry = { data: v, next: this.head }; + if (this.length === 0) this.tail = entry; + this.head = entry; + ++this.length; +}; + +BufferList.prototype.shift = function () { + if (this.length === 0) return; + var ret = this.head.data; + if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; + --this.length; + return ret; +}; + +BufferList.prototype.clear = function () { + this.head = this.tail = null; + this.length = 0; +}; + +BufferList.prototype.join = function (s) { + if (this.length === 0) return ''; + var p = this.head; + var ret = '' + p.data; + while (p = p.next) { + ret += s + p.data; + }return ret; +}; + +BufferList.prototype.concat = function (n) { + if (this.length === 0) return bufferShim.alloc(0); + if (this.length === 1) return this.head.data; + var ret = bufferShim.allocUnsafe(n >>> 0); + var p = this.head; + var i = 0; + while (p) { + p.data.copy(ret, i); + i += p.data.length; + p = p.next; + } + return ret; +}; +},{"buffer":3,"buffer-shims":18}],18:[function(require,module,exports){ +(function (global){ +'use strict'; + +var buffer = require('buffer'); +var Buffer = buffer.Buffer; +var SlowBuffer = buffer.SlowBuffer; +var MAX_LEN = buffer.kMaxLength || 2147483647; +exports.alloc = function alloc(size, fill, encoding) { + if (typeof Buffer.alloc === 'function') { + return Buffer.alloc(size, fill, encoding); + } + if (typeof encoding === 'number') { + throw new TypeError('encoding must not be number'); + } + if (typeof size !== 'number') { + throw new TypeError('size must be a number'); + } + if (size > MAX_LEN) { + throw new RangeError('size is too large'); + } + var enc = encoding; + var _fill = fill; + if (_fill === undefined) { + enc = undefined; + _fill = 0; + } + var buf = new Buffer(size); + if (typeof _fill === 'string') { + var fillBuf = new Buffer(_fill, enc); + var flen = fillBuf.length; + var i = -1; + while (++i < size) { + buf[i] = fillBuf[i % flen]; + } + } else { + buf.fill(_fill); + } + return buf; +} +exports.allocUnsafe = function allocUnsafe(size) { + if (typeof Buffer.allocUnsafe === 'function') { + return Buffer.allocUnsafe(size); + } + if (typeof size !== 'number') { + throw new TypeError('size must be a number'); + } + if (size > MAX_LEN) { + throw new RangeError('size is too large'); + } + return new Buffer(size); +} +exports.from = function from(value, encodingOrOffset, length) { + if (typeof Buffer.from === 'function' && (!global.Uint8Array || Uint8Array.from !== Buffer.from)) { + return Buffer.from(value, encodingOrOffset, length); + } + if (typeof value === 'number') { + throw new TypeError('"value" argument must not be a number'); + } + if (typeof value === 'string') { + return new Buffer(value, encodingOrOffset); + } + if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) { + var offset = encodingOrOffset; + if (arguments.length === 1) { + return new Buffer(value); + } + if (typeof offset === 'undefined') { + offset = 0; + } + var len = length; + if (typeof len === 'undefined') { + len = value.byteLength - offset; + } + if (offset >= value.byteLength) { + throw new RangeError('\'offset\' is out of bounds'); + } + if (len > value.byteLength - offset) { + throw new RangeError('\'length\' is out of bounds'); + } + return new Buffer(value.slice(offset, offset + len)); + } + if (Buffer.isBuffer(value)) { + var out = new Buffer(value.length); + value.copy(out, 0, 0, value.length); + return out; + } + if (value) { + if (Array.isArray(value) || (typeof ArrayBuffer !== 'undefined' && value.buffer instanceof ArrayBuffer) || 'length' in value) { + return new Buffer(value); + } + if (value.type === 'Buffer' && Array.isArray(value.data)) { + return new Buffer(value.data); + } + } + + throw new TypeError('First argument must be a string, Buffer, ' + 'ArrayBuffer, Array, or array-like object.'); +} +exports.allocUnsafeSlow = function allocUnsafeSlow(size) { + if (typeof Buffer.allocUnsafeSlow === 'function') { + return Buffer.allocUnsafeSlow(size); + } + if (typeof size !== 'number') { + throw new TypeError('size must be a number'); + } + if (size >= MAX_LEN) { + throw new RangeError('size is too large'); + } + return new SlowBuffer(size); +} + +}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) +},{"buffer":3}],19:[function(require,module,exports){ +(function (Buffer){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +// NOTE: These type checking functions intentionally don't use `instanceof` +// because it is fragile and can be easily faked with `Object.create()`. + +function isArray(arg) { + if (Array.isArray) { + return Array.isArray(arg); + } + return objectToString(arg) === '[object Array]'; +} +exports.isArray = isArray; + +function isBoolean(arg) { + return typeof arg === 'boolean'; +} +exports.isBoolean = isBoolean; + +function isNull(arg) { + return arg === null; +} +exports.isNull = isNull; + +function isNullOrUndefined(arg) { + return arg == null; +} +exports.isNullOrUndefined = isNullOrUndefined; + +function isNumber(arg) { + return typeof arg === 'number'; +} +exports.isNumber = isNumber; + +function isString(arg) { + return typeof arg === 'string'; +} +exports.isString = isString; + +function isSymbol(arg) { + return typeof arg === 'symbol'; +} +exports.isSymbol = isSymbol; + +function isUndefined(arg) { + return arg === void 0; +} +exports.isUndefined = isUndefined; + +function isRegExp(re) { + return objectToString(re) === '[object RegExp]'; +} +exports.isRegExp = isRegExp; + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} +exports.isObject = isObject; + +function isDate(d) { + return objectToString(d) === '[object Date]'; +} +exports.isDate = isDate; + +function isError(e) { + return (objectToString(e) === '[object Error]' || e instanceof Error); +} +exports.isError = isError; + +function isFunction(arg) { + return typeof arg === 'function'; +} +exports.isFunction = isFunction; + +function isPrimitive(arg) { + return arg === null || + typeof arg === 'boolean' || + typeof arg === 'number' || + typeof arg === 'string' || + typeof arg === 'symbol' || // ES6 symbol + typeof arg === 'undefined'; +} +exports.isPrimitive = isPrimitive; + +exports.isBuffer = Buffer.isBuffer; + +function objectToString(o) { + return Object.prototype.toString.call(o); +} + +}).call(this,{"isBuffer":require("../../../../insert-module-globals/node_modules/is-buffer/index.js")}) +},{"../../../../insert-module-globals/node_modules/is-buffer/index.js":9}],20:[function(require,module,exports){ +arguments[4][6][0].apply(exports,arguments) +},{"dup":6}],21:[function(require,module,exports){ +(function (process){ +'use strict'; + +if (!process.version || + process.version.indexOf('v0.') === 0 || + process.version.indexOf('v1.') === 0 && process.version.indexOf('v1.8.') !== 0) { + module.exports = nextTick; +} else { + module.exports = process.nextTick; +} + +function nextTick(fn, arg1, arg2, arg3) { + if (typeof fn !== 'function') { + throw new TypeError('"callback" argument must be a function'); + } + var len = arguments.length; + var args, i; + switch (len) { + case 0: + case 1: + return process.nextTick(fn); + case 2: + return process.nextTick(function afterTickOne() { + fn.call(null, arg1); + }); + case 3: + return process.nextTick(function afterTickTwo() { + fn.call(null, arg1, arg2); + }); + case 4: + return process.nextTick(function afterTickThree() { + fn.call(null, arg1, arg2, arg3); + }); + default: + args = new Array(len - 1); + i = 0; + while (i < args.length) { + args[i++] = arguments[i]; + } + return process.nextTick(function afterTick() { + fn.apply(null, args); + }); + } +} + +}).call(this,require('_process')) +},{"_process":10}],22:[function(require,module,exports){ +(function (global){ + +/** + * Module exports. + */ + +module.exports = deprecate; + +/** + * Mark that a method should not be used. + * Returns a modified function which warns once by default. + * + * If `localStorage.noDeprecation = true` is set, then it is a no-op. + * + * If `localStorage.throwDeprecation = true` is set, then deprecated functions + * will throw an Error when invoked. + * + * If `localStorage.traceDeprecation = true` is set, then deprecated functions + * will invoke `console.trace()` instead of `console.error()`. + * + * @param {Function} fn - the function to deprecate + * @param {String} msg - the string to print to the console when `fn` is invoked + * @returns {Function} a new "deprecated" version of `fn` + * @api public + */ + +function deprecate (fn, msg) { + if (config('noDeprecation')) { + return fn; + } + + var warned = false; + function deprecated() { + if (!warned) { + if (config('throwDeprecation')) { + throw new Error(msg); + } else if (config('traceDeprecation')) { + console.trace(msg); + } else { + console.warn(msg); + } + warned = true; + } + return fn.apply(this, arguments); + } + + return deprecated; +} + +/** + * Checks `localStorage` for boolean values for the given `name`. + * + * @param {String} name + * @returns {Boolean} + * @api private + */ + +function config (name) { + // accessing global.localStorage can trigger a DOMException in sandboxed iframes + try { + if (!global.localStorage) return false; + } catch (_) { + return false; + } + var val = global.localStorage[name]; + if (null == val) return false; + return String(val).toLowerCase() === 'true'; +} + +}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) +},{}],23:[function(require,module,exports){ +module.exports = require("./lib/_stream_passthrough.js") + +},{"./lib/_stream_passthrough.js":13}],24:[function(require,module,exports){ +(function (process){ +var Stream = (function (){ + try { + return require('st' + 'ream'); // hack to fix a circular dependency issue when used with browserify + } catch(_){} +}()); +exports = module.exports = require('./lib/_stream_readable.js'); +exports.Stream = Stream || exports; +exports.Readable = exports; +exports.Writable = require('./lib/_stream_writable.js'); +exports.Duplex = require('./lib/_stream_duplex.js'); +exports.Transform = require('./lib/_stream_transform.js'); +exports.PassThrough = require('./lib/_stream_passthrough.js'); + +if (!process.browser && process.env.READABLE_STREAM === 'disable' && Stream) { + module.exports = Stream; +} + +}).call(this,require('_process')) +},{"./lib/_stream_duplex.js":12,"./lib/_stream_passthrough.js":13,"./lib/_stream_readable.js":14,"./lib/_stream_transform.js":15,"./lib/_stream_writable.js":16,"_process":10}],25:[function(require,module,exports){ +module.exports = require("./lib/_stream_transform.js") + +},{"./lib/_stream_transform.js":15}],26:[function(require,module,exports){ +module.exports = require("./lib/_stream_writable.js") + +},{"./lib/_stream_writable.js":16}],27:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +module.exports = Stream; + +var EE = require('events').EventEmitter; +var inherits = require('inherits'); + +inherits(Stream, EE); +Stream.Readable = require('readable-stream/readable.js'); +Stream.Writable = require('readable-stream/writable.js'); +Stream.Duplex = require('readable-stream/duplex.js'); +Stream.Transform = require('readable-stream/transform.js'); +Stream.PassThrough = require('readable-stream/passthrough.js'); + +// Backwards-compat with node 0.4.x +Stream.Stream = Stream; + + + +// old-style streams. Note that the pipe method (the only relevant +// part of this class) is overridden in the Readable class. + +function Stream() { + EE.call(this); +} + +Stream.prototype.pipe = function(dest, options) { + var source = this; + + function ondata(chunk) { + if (dest.writable) { + if (false === dest.write(chunk) && source.pause) { + source.pause(); + } + } + } + + source.on('data', ondata); + + function ondrain() { + if (source.readable && source.resume) { + source.resume(); + } + } + + dest.on('drain', ondrain); + + // If the 'end' option is not supplied, dest.end() will be called when + // source gets the 'end' or 'close' events. Only dest.end() once. + if (!dest._isStdio && (!options || options.end !== false)) { + source.on('end', onend); + source.on('close', onclose); + } + + var didOnEnd = false; + function onend() { + if (didOnEnd) return; + didOnEnd = true; + + dest.end(); + } + + + function onclose() { + if (didOnEnd) return; + didOnEnd = true; + + if (typeof dest.destroy === 'function') dest.destroy(); + } + + // don't leave dangling pipes when there are errors. + function onerror(er) { + cleanup(); + if (EE.listenerCount(this, 'error') === 0) { + throw er; // Unhandled stream error in pipe. + } + } + + source.on('error', onerror); + dest.on('error', onerror); + + // remove all the event listeners that were added. + function cleanup() { + source.removeListener('data', ondata); + dest.removeListener('drain', ondrain); + + source.removeListener('end', onend); + source.removeListener('close', onclose); + + source.removeListener('error', onerror); + dest.removeListener('error', onerror); + + source.removeListener('end', cleanup); + source.removeListener('close', cleanup); + + dest.removeListener('close', cleanup); + } + + source.on('end', cleanup); + source.on('close', cleanup); + + dest.on('close', cleanup); + + dest.emit('pipe', source); + + // Allow for unix-like usage: A.pipe(B).pipe(C) + return dest; +}; + +},{"events":7,"inherits":8,"readable-stream/duplex.js":11,"readable-stream/passthrough.js":23,"readable-stream/readable.js":24,"readable-stream/transform.js":25,"readable-stream/writable.js":26}],28:[function(require,module,exports){ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +var Buffer = require('buffer').Buffer; + +var isBufferEncoding = Buffer.isEncoding + || function(encoding) { + switch (encoding && encoding.toLowerCase()) { + case 'hex': case 'utf8': case 'utf-8': case 'ascii': case 'binary': case 'base64': case 'ucs2': case 'ucs-2': case 'utf16le': case 'utf-16le': case 'raw': return true; + default: return false; + } + } + + +function assertEncoding(encoding) { + if (encoding && !isBufferEncoding(encoding)) { + throw new Error('Unknown encoding: ' + encoding); + } +} + +// StringDecoder provides an interface for efficiently splitting a series of +// buffers into a series of JS strings without breaking apart multi-byte +// characters. CESU-8 is handled as part of the UTF-8 encoding. +// +// @TODO Handling all encodings inside a single object makes it very difficult +// to reason about this code, so it should be split up in the future. +// @TODO There should be a utf8-strict encoding that rejects invalid UTF-8 code +// points as used by CESU-8. +var StringDecoder = exports.StringDecoder = function(encoding) { + this.encoding = (encoding || 'utf8').toLowerCase().replace(/[-_]/, ''); + assertEncoding(encoding); + switch (this.encoding) { + case 'utf8': + // CESU-8 represents each of Surrogate Pair by 3-bytes + this.surrogateSize = 3; + break; + case 'ucs2': + case 'utf16le': + // UTF-16 represents each of Surrogate Pair by 2-bytes + this.surrogateSize = 2; + this.detectIncompleteChar = utf16DetectIncompleteChar; + break; + case 'base64': + // Base-64 stores 3 bytes in 4 chars, and pads the remainder. + this.surrogateSize = 3; + this.detectIncompleteChar = base64DetectIncompleteChar; + break; + default: + this.write = passThroughWrite; + return; + } + + // Enough space to store all bytes of a single character. UTF-8 needs 4 + // bytes, but CESU-8 may require up to 6 (3 bytes per surrogate). + this.charBuffer = new Buffer(6); + // Number of bytes received for the current incomplete multi-byte character. + this.charReceived = 0; + // Number of bytes expected for the current incomplete multi-byte character. + this.charLength = 0; +}; + + +// write decodes the given buffer and returns it as JS string that is +// guaranteed to not contain any partial multi-byte characters. Any partial +// character found at the end of the buffer is buffered up, and will be +// returned when calling write again with the remaining bytes. +// +// Note: Converting a Buffer containing an orphan surrogate to a String +// currently works, but converting a String to a Buffer (via `new Buffer`, or +// Buffer#write) will replace incomplete surrogates with the unicode +// replacement character. See https://codereview.chromium.org/121173009/ . +StringDecoder.prototype.write = function(buffer) { + var charStr = ''; + // if our last write ended with an incomplete multibyte character + while (this.charLength) { + // determine how many remaining bytes this buffer has to offer for this char + var available = (buffer.length >= this.charLength - this.charReceived) ? + this.charLength - this.charReceived : + buffer.length; + + // add the new bytes to the char buffer + buffer.copy(this.charBuffer, this.charReceived, 0, available); + this.charReceived += available; + + if (this.charReceived < this.charLength) { + // still not enough chars in this buffer? wait for more ... + return ''; + } + + // remove bytes belonging to the current character from the buffer + buffer = buffer.slice(available, buffer.length); + + // get the character that was split + charStr = this.charBuffer.slice(0, this.charLength).toString(this.encoding); + + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character + var charCode = charStr.charCodeAt(charStr.length - 1); + if (charCode >= 0xD800 && charCode <= 0xDBFF) { + this.charLength += this.surrogateSize; + charStr = ''; + continue; + } + this.charReceived = this.charLength = 0; + + // if there are no more bytes in this buffer, just emit our char + if (buffer.length === 0) { + return charStr; + } + break; + } + + // determine and set charLength / charReceived + this.detectIncompleteChar(buffer); + + var end = buffer.length; + if (this.charLength) { + // buffer the incomplete character bytes we got + buffer.copy(this.charBuffer, 0, buffer.length - this.charReceived, end); + end -= this.charReceived; + } + + charStr += buffer.toString(this.encoding, 0, end); + + var end = charStr.length - 1; + var charCode = charStr.charCodeAt(end); + // CESU-8: lead surrogate (D800-DBFF) is also the incomplete character + if (charCode >= 0xD800 && charCode <= 0xDBFF) { + var size = this.surrogateSize; + this.charLength += size; + this.charReceived += size; + this.charBuffer.copy(this.charBuffer, size, 0, size); + buffer.copy(this.charBuffer, 0, 0, size); + return charStr.substring(0, end); + } + + // or just emit the charStr + return charStr; +}; + +// detectIncompleteChar determines if there is an incomplete UTF-8 character at +// the end of the given buffer. If so, it sets this.charLength to the byte +// length that character, and sets this.charReceived to the number of bytes +// that are available for this character. +StringDecoder.prototype.detectIncompleteChar = function(buffer) { + // determine how many bytes we have to check at the end of this buffer + var i = (buffer.length >= 3) ? 3 : buffer.length; + + // Figure out if one of the last i bytes of our buffer announces an + // incomplete char. + for (; i > 0; i--) { + var c = buffer[buffer.length - i]; + + // See http://en.wikipedia.org/wiki/UTF-8#Description + + // 110XXXXX + if (i == 1 && c >> 5 == 0x06) { + this.charLength = 2; + break; + } + + // 1110XXXX + if (i <= 2 && c >> 4 == 0x0E) { + this.charLength = 3; + break; + } + + // 11110XXX + if (i <= 3 && c >> 3 == 0x1E) { + this.charLength = 4; + break; + } + } + this.charReceived = i; +}; + +StringDecoder.prototype.end = function(buffer) { + var res = ''; + if (buffer && buffer.length) + res = this.write(buffer); + + if (this.charReceived) { + var cr = this.charReceived; + var buf = this.charBuffer; + var enc = this.encoding; + res += buf.slice(0, cr).toString(enc); + } + + return res; +}; + +function passThroughWrite(buffer) { + return buffer.toString(this.encoding); +} + +function utf16DetectIncompleteChar(buffer) { + this.charReceived = buffer.length % 2; + this.charLength = this.charReceived ? 2 : 0; +} + +function base64DetectIncompleteChar(buffer) { + this.charReceived = buffer.length % 3; + this.charLength = this.charReceived ? 3 : 0; +} + +},{"buffer":3}],29:[function(require,module,exports){ +(function (process,Buffer){ +var createHmac = require('create-hmac') +var checkParameters = require('./precondition') + +exports.pbkdf2 = function (password, salt, iterations, keylen, digest, callback) { + if (typeof digest === 'function') { + callback = digest + digest = undefined + } + + checkParameters(iterations, keylen) + if (typeof callback !== 'function') throw new Error('No callback provided to pbkdf2') + + setTimeout(function () { + callback(null, exports.pbkdf2Sync(password, salt, iterations, keylen, digest)) + }) +} + +var defaultEncoding +if (process.browser) { + defaultEncoding = 'utf-8' +} else { + var pVersionMajor = parseInt(process.version.split('.')[0].slice(1), 10) + + defaultEncoding = pVersionMajor >= 6 ? 'utf-8' : 'binary' +} + +exports.pbkdf2Sync = function (password, salt, iterations, keylen, digest) { + if (!Buffer.isBuffer(password)) password = new Buffer(password, defaultEncoding) + if (!Buffer.isBuffer(salt)) salt = new Buffer(salt, defaultEncoding) + + checkParameters(iterations, keylen) + + digest = digest || 'sha1' + + var hLen + var l = 1 + var DK = new Buffer(keylen) + var block1 = new Buffer(salt.length + 4) + salt.copy(block1, 0, 0, salt.length) + + var r + var T + + for (var i = 1; i <= l; i++) { + block1.writeUInt32BE(i, salt.length) + var U = createHmac(digest, password).update(block1).digest() + + if (!hLen) { + hLen = U.length + T = new Buffer(hLen) + l = Math.ceil(keylen / hLen) + r = keylen - (l - 1) * hLen + } + + U.copy(T, 0, 0, hLen) + + for (var j = 1; j < iterations; j++) { + U = createHmac(digest, password).update(U).digest() + for (var k = 0; k < hLen; k++) T[k] ^= U[k] + } + + var destPos = (i - 1) * hLen + var len = (i === l ? r : hLen) + T.copy(DK, destPos, 0, len) + } + + return DK +} + +}).call(this,require('_process'),require("buffer").Buffer) +},{"./precondition":45,"_process":10,"buffer":3,"create-hmac":30}],30:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var createHash = require('create-hash/browser'); +var inherits = require('inherits') + +var Transform = require('stream').Transform + +var ZEROS = new Buffer(128) +ZEROS.fill(0) + +function Hmac(alg, key) { + Transform.call(this) + alg = alg.toLowerCase() + if (typeof key === 'string') { + key = new Buffer(key) + } + + var blocksize = (alg === 'sha512' || alg === 'sha384') ? 128 : 64 + + this._alg = alg + this._key = key + + if (key.length > blocksize) { + key = createHash(alg).update(key).digest() + + } else if (key.length < blocksize) { + key = Buffer.concat([key, ZEROS], blocksize) + } + + var ipad = this._ipad = new Buffer(blocksize) + var opad = this._opad = new Buffer(blocksize) + + for (var i = 0; i < blocksize; i++) { + ipad[i] = key[i] ^ 0x36 + opad[i] = key[i] ^ 0x5C + } + + this._hash = createHash(alg).update(ipad) +} + +inherits(Hmac, Transform) + +Hmac.prototype.update = function (data, enc) { + this._hash.update(data, enc) + + return this +} + +Hmac.prototype._transform = function (data, _, next) { + this._hash.update(data) + + next() +} + +Hmac.prototype._flush = function (next) { + this.push(this.digest()) + + next() +} + +Hmac.prototype.digest = function (enc) { + var h = this._hash.digest() + + return createHash(this._alg).update(this._opad).update(h).digest(enc) +} + +module.exports = function createHmac(alg, key) { + return new Hmac(alg, key) +} + +}).call(this,require("buffer").Buffer) +},{"buffer":3,"create-hash/browser":31,"inherits":44,"stream":27}],31:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var inherits = require('inherits') +var md5 = require('./md5') +var rmd160 = require('ripemd160') +var sha = require('sha.js') + +var Base = require('cipher-base') + +function HashNoConstructor(hash) { + Base.call(this, 'digest') + + this._hash = hash + this.buffers = [] +} + +inherits(HashNoConstructor, Base) + +HashNoConstructor.prototype._update = function (data) { + this.buffers.push(data) +} + +HashNoConstructor.prototype._final = function () { + var buf = Buffer.concat(this.buffers) + var r = this._hash(buf) + this.buffers = null + + return r +} + +function Hash(hash) { + Base.call(this, 'digest') + + this._hash = hash +} + +inherits(Hash, Base) + +Hash.prototype._update = function (data) { + this._hash.update(data) +} + +Hash.prototype._final = function () { + return this._hash.digest() +} + +module.exports = function createHash (alg) { + alg = alg.toLowerCase() + if ('md5' === alg) return new HashNoConstructor(md5) + if ('rmd160' === alg || 'ripemd160' === alg) return new HashNoConstructor(rmd160) + + return new Hash(sha(alg)) +} + +}).call(this,require("buffer").Buffer) +},{"./md5":33,"buffer":3,"cipher-base":34,"inherits":44,"ripemd160":35,"sha.js":37}],32:[function(require,module,exports){ +(function (Buffer){ +'use strict'; +var intSize = 4; +var zeroBuffer = new Buffer(intSize); zeroBuffer.fill(0); +var chrsz = 8; + +function toArray(buf, bigEndian) { + if ((buf.length % intSize) !== 0) { + var len = buf.length + (intSize - (buf.length % intSize)); + buf = Buffer.concat([buf, zeroBuffer], len); + } + + var arr = []; + var fn = bigEndian ? buf.readInt32BE : buf.readInt32LE; + for (var i = 0; i < buf.length; i += intSize) { + arr.push(fn.call(buf, i)); + } + return arr; +} + +function toBuffer(arr, size, bigEndian) { + var buf = new Buffer(size); + var fn = bigEndian ? buf.writeInt32BE : buf.writeInt32LE; + for (var i = 0; i < arr.length; i++) { + fn.call(buf, arr[i], i * 4, true); + } + return buf; +} + +function hash(buf, fn, hashSize, bigEndian) { + if (!Buffer.isBuffer(buf)) buf = new Buffer(buf); + var arr = fn(toArray(buf, bigEndian), buf.length * chrsz); + return toBuffer(arr, hashSize, bigEndian); +} +exports.hash = hash; +}).call(this,require("buffer").Buffer) +},{"buffer":3}],33:[function(require,module,exports){ +'use strict'; +/* + * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message + * Digest Algorithm, as defined in RFC 1321. + * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for more info. + */ + +var helpers = require('./helpers'); + +/* + * Calculate the MD5 of an array of little-endian words, and a bit length + */ +function core_md5(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << ((len) % 32); + x[(((len + 64) >>> 9) << 4) + 14] = len; + + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + + a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); + d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); + d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); + d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i+10], 17, -42063); + b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); + d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); + d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); + c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); + a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); + d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); + c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); + d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); + c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); + d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); + c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); + d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); + d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); + d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); + c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); + d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); + d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); + d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); + d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); + d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + } + return Array(a, b, c, d); + +} + +/* + * These functions implement the four basic operations the algorithm uses. + */ +function md5_cmn(q, a, b, x, s, t) +{ + return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b); +} +function md5_ff(a, b, c, d, x, s, t) +{ + return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); +} +function md5_gg(a, b, c, d, x, s, t) +{ + return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); +} +function md5_hh(a, b, c, d, x, s, t) +{ + return md5_cmn(b ^ c ^ d, a, b, x, s, t); +} +function md5_ii(a, b, c, d, x, s, t) +{ + return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function safe_add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left. + */ +function bit_rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + +module.exports = function md5(buf) { + return helpers.hash(buf, core_md5, 16); +}; +},{"./helpers":32}],34:[function(require,module,exports){ +(function (Buffer){ +var Transform = require('stream').Transform +var inherits = require('inherits') +var StringDecoder = require('string_decoder').StringDecoder +module.exports = CipherBase +inherits(CipherBase, Transform) +function CipherBase (hashMode) { + Transform.call(this) + this.hashMode = typeof hashMode === 'string' + if (this.hashMode) { + this[hashMode] = this._finalOrDigest + } else { + this.final = this._finalOrDigest + } + this._decoder = null + this._encoding = null +} +CipherBase.prototype.update = function (data, inputEnc, outputEnc) { + if (typeof data === 'string') { + data = new Buffer(data, inputEnc) + } + var outData = this._update(data) + if (this.hashMode) { + return this + } + if (outputEnc) { + outData = this._toString(outData, outputEnc) + } + return outData +} + +CipherBase.prototype.setAutoPadding = function () {} + +CipherBase.prototype.getAuthTag = function () { + throw new Error('trying to get auth tag in unsupported state') +} + +CipherBase.prototype.setAuthTag = function () { + throw new Error('trying to set auth tag in unsupported state') +} + +CipherBase.prototype.setAAD = function () { + throw new Error('trying to set aad in unsupported state') +} + +CipherBase.prototype._transform = function (data, _, next) { + var err + try { + if (this.hashMode) { + this._update(data) + } else { + this.push(this._update(data)) + } + } catch (e) { + err = e + } finally { + next(err) + } +} +CipherBase.prototype._flush = function (done) { + var err + try { + this.push(this._final()) + } catch (e) { + err = e + } finally { + done(err) + } +} +CipherBase.prototype._finalOrDigest = function (outputEnc) { + var outData = this._final() || new Buffer('') + if (outputEnc) { + outData = this._toString(outData, outputEnc, true) + } + return outData +} + +CipherBase.prototype._toString = function (value, enc, fin) { + if (!this._decoder) { + this._decoder = new StringDecoder(enc) + this._encoding = enc + } + if (this._encoding !== enc) { + throw new Error('can\'t switch encodings') + } + var out = this._decoder.write(value) + if (fin) { + out += this._decoder.end() + } + return out +} + +}).call(this,require("buffer").Buffer) +},{"buffer":3,"inherits":44,"stream":27,"string_decoder":28}],35:[function(require,module,exports){ +(function (Buffer){ +/* +CryptoJS v3.1.2 +code.google.com/p/crypto-js +(c) 2009-2013 by Jeff Mott. All rights reserved. +code.google.com/p/crypto-js/wiki/License +*/ +/** @preserve +(c) 2012 by Cédric Mesnil. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +// constants table +var zl = [ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8, + 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12, + 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2, + 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 +] + +var zr = [ + 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12, + 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2, + 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13, + 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14, + 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 +] + +var sl = [ + 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8, + 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12, + 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5, + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 +] + +var sr = [ + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, + 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, + 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, + 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 +] + +var hl = [0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E] +var hr = [0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000] + +function bytesToWords (bytes) { + var words = [] + for (var i = 0, b = 0; i < bytes.length; i++, b += 8) { + words[b >>> 5] |= bytes[i] << (24 - b % 32) + } + return words +} + +function wordsToBytes (words) { + var bytes = [] + for (var b = 0; b < words.length * 32; b += 8) { + bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF) + } + return bytes +} + +function processBlock (H, M, offset) { + // swap endian + for (var i = 0; i < 16; i++) { + var offset_i = offset + i + var M_offset_i = M[offset_i] + + // Swap + M[offset_i] = ( + (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) | + (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00) + ) + } + + // Working variables + var al, bl, cl, dl, el + var ar, br, cr, dr, er + + ar = al = H[0] + br = bl = H[1] + cr = cl = H[2] + dr = dl = H[3] + er = el = H[4] + + // computation + var t + for (i = 0; i < 80; i += 1) { + t = (al + M[offset + zl[i]]) | 0 + if (i < 16) { + t += f1(bl, cl, dl) + hl[0] + } else if (i < 32) { + t += f2(bl, cl, dl) + hl[1] + } else if (i < 48) { + t += f3(bl, cl, dl) + hl[2] + } else if (i < 64) { + t += f4(bl, cl, dl) + hl[3] + } else {// if (i<80) { + t += f5(bl, cl, dl) + hl[4] + } + t = t | 0 + t = rotl(t, sl[i]) + t = (t + el) | 0 + al = el + el = dl + dl = rotl(cl, 10) + cl = bl + bl = t + + t = (ar + M[offset + zr[i]]) | 0 + if (i < 16) { + t += f5(br, cr, dr) + hr[0] + } else if (i < 32) { + t += f4(br, cr, dr) + hr[1] + } else if (i < 48) { + t += f3(br, cr, dr) + hr[2] + } else if (i < 64) { + t += f2(br, cr, dr) + hr[3] + } else {// if (i<80) { + t += f1(br, cr, dr) + hr[4] + } + + t = t | 0 + t = rotl(t, sr[i]) + t = (t + er) | 0 + ar = er + er = dr + dr = rotl(cr, 10) + cr = br + br = t + } + + // intermediate hash value + t = (H[1] + cl + dr) | 0 + H[1] = (H[2] + dl + er) | 0 + H[2] = (H[3] + el + ar) | 0 + H[3] = (H[4] + al + br) | 0 + H[4] = (H[0] + bl + cr) | 0 + H[0] = t +} + +function f1 (x, y, z) { + return ((x) ^ (y) ^ (z)) +} + +function f2 (x, y, z) { + return (((x) & (y)) | ((~x) & (z))) +} + +function f3 (x, y, z) { + return (((x) | (~(y))) ^ (z)) +} + +function f4 (x, y, z) { + return (((x) & (z)) | ((y) & (~(z)))) +} + +function f5 (x, y, z) { + return ((x) ^ ((y) | (~(z)))) +} + +function rotl (x, n) { + return (x << n) | (x >>> (32 - n)) +} + +function ripemd160 (message) { + var H = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0] + + if (typeof message === 'string') { + message = new Buffer(message, 'utf8') + } + + var m = bytesToWords(message) + + var nBitsLeft = message.length * 8 + var nBitsTotal = message.length * 8 + + // Add padding + m[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32) + m[(((nBitsLeft + 64) >>> 9) << 4) + 14] = ( + (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) | + (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00) + ) + + for (var i = 0; i < m.length; i += 16) { + processBlock(H, m, i) + } + + // swap endian + for (i = 0; i < 5; i++) { + // shortcut + var H_i = H[i] + + // Swap + H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) | + (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00) + } + + var digestbytes = wordsToBytes(H) + return new Buffer(digestbytes) +} + +module.exports = ripemd160 + +}).call(this,require("buffer").Buffer) +},{"buffer":3}],36:[function(require,module,exports){ +(function (Buffer){ +// prototype class for hash functions +function Hash (blockSize, finalSize) { + this._block = new Buffer(blockSize) + this._finalSize = finalSize + this._blockSize = blockSize + this._len = 0 + this._s = 0 +} + +Hash.prototype.update = function (data, enc) { + if (typeof data === 'string') { + enc = enc || 'utf8' + data = new Buffer(data, enc) + } + + var l = this._len += data.length + var s = this._s || 0 + var f = 0 + var buffer = this._block + + while (s < l) { + var t = Math.min(data.length, f + this._blockSize - (s % this._blockSize)) + var ch = (t - f) + + for (var i = 0; i < ch; i++) { + buffer[(s % this._blockSize) + i] = data[i + f] + } + + s += ch + f += ch + + if ((s % this._blockSize) === 0) { + this._update(buffer) + } + } + this._s = s + + return this +} + +Hash.prototype.digest = function (enc) { + // Suppose the length of the message M, in bits, is l + var l = this._len * 8 + + // Append the bit 1 to the end of the message + this._block[this._len % this._blockSize] = 0x80 + + // and then k zero bits, where k is the smallest non-negative solution to the equation (l + 1 + k) === finalSize mod blockSize + this._block.fill(0, this._len % this._blockSize + 1) + + if (l % (this._blockSize * 8) >= this._finalSize * 8) { + this._update(this._block) + this._block.fill(0) + } + + // to this append the block which is equal to the number l written in binary + // TODO: handle case where l is > Math.pow(2, 29) + this._block.writeInt32BE(l, this._blockSize - 4) + + var hash = this._update(this._block) || this._hash() + + return enc ? hash.toString(enc) : hash +} + +Hash.prototype._update = function () { + throw new Error('_update must be implemented by subclass') +} + +module.exports = Hash + +}).call(this,require("buffer").Buffer) +},{"buffer":3}],37:[function(require,module,exports){ +var exports = module.exports = function SHA (algorithm) { + algorithm = algorithm.toLowerCase() + + var Algorithm = exports[algorithm] + if (!Algorithm) throw new Error(algorithm + ' is not supported (we accept pull requests)') + + return new Algorithm() +} + +exports.sha = require('./sha') +exports.sha1 = require('./sha1') +exports.sha224 = require('./sha224') +exports.sha256 = require('./sha256') +exports.sha384 = require('./sha384') +exports.sha512 = require('./sha512') + +},{"./sha":38,"./sha1":39,"./sha224":40,"./sha256":41,"./sha384":42,"./sha512":43}],38:[function(require,module,exports){ +(function (Buffer){ +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-0, as defined + * in FIPS PUB 180-1 + * This source code is derived from sha1.js of the same repository. + * The difference between SHA-0 and SHA-1 is just a bitwise rotate left + * operation was added. + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0 +] + +var W = new Array(80) + +function Sha () { + this.init() + this._w = W + + Hash.call(this, 64, 56) +} + +inherits(Sha, Hash) + +Sha.prototype.init = function () { + this._a = 0x67452301 + this._b = 0xefcdab89 + this._c = 0x98badcfe + this._d = 0x10325476 + this._e = 0xc3d2e1f0 + + return this +} + +function rotl5 (num) { + return (num << 5) | (num >>> 27) +} + +function rotl30 (num) { + return (num << 30) | (num >>> 2) +} + +function ft (s, b, c, d) { + if (s === 0) return (b & c) | ((~b) & d) + if (s === 2) return (b & c) | (b & d) | (c & d) + return b ^ c ^ d +} + +Sha.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 80; ++i) W[i] = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16] + + for (var j = 0; j < 80; ++j) { + var s = ~~(j / 20) + var t = (rotl5(a) + ft(s, b, c, d) + e + W[j] + K[s]) | 0 + + e = d + d = c + c = rotl30(b) + b = a + a = t + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 +} + +Sha.prototype._hash = function () { + var H = new Buffer(20) + + H.writeInt32BE(this._a | 0, 0) + H.writeInt32BE(this._b | 0, 4) + H.writeInt32BE(this._c | 0, 8) + H.writeInt32BE(this._d | 0, 12) + H.writeInt32BE(this._e | 0, 16) + + return H +} + +module.exports = Sha + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"buffer":3,"inherits":44}],39:[function(require,module,exports){ +(function (Buffer){ +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined + * in FIPS PUB 180-1 + * Version 2.1a Copyright Paul Johnston 2000 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for details. + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc | 0, 0xca62c1d6 | 0 +] + +var W = new Array(80) + +function Sha1 () { + this.init() + this._w = W + + Hash.call(this, 64, 56) +} + +inherits(Sha1, Hash) + +Sha1.prototype.init = function () { + this._a = 0x67452301 + this._b = 0xefcdab89 + this._c = 0x98badcfe + this._d = 0x10325476 + this._e = 0xc3d2e1f0 + + return this +} + +function rotl1 (num) { + return (num << 1) | (num >>> 31) +} + +function rotl5 (num) { + return (num << 5) | (num >>> 27) +} + +function rotl30 (num) { + return (num << 30) | (num >>> 2) +} + +function ft (s, b, c, d) { + if (s === 0) return (b & c) | ((~b) & d) + if (s === 2) return (b & c) | (b & d) | (c & d) + return b ^ c ^ d +} + +Sha1.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 80; ++i) W[i] = rotl1(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16]) + + for (var j = 0; j < 80; ++j) { + var s = ~~(j / 20) + var t = (rotl5(a) + ft(s, b, c, d) + e + W[j] + K[s]) | 0 + + e = d + d = c + c = rotl30(b) + b = a + a = t + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 +} + +Sha1.prototype._hash = function () { + var H = new Buffer(20) + + H.writeInt32BE(this._a | 0, 0) + H.writeInt32BE(this._b | 0, 4) + H.writeInt32BE(this._c | 0, 8) + H.writeInt32BE(this._d | 0, 12) + H.writeInt32BE(this._e | 0, 16) + + return H +} + +module.exports = Sha1 + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"buffer":3,"inherits":44}],40:[function(require,module,exports){ +(function (Buffer){ +/** + * A JavaScript implementation of the Secure Hash Algorithm, SHA-256, as defined + * in FIPS 180-2 + * Version 2.2-beta Copyright Angel Marin, Paul Johnston 2000 - 2009. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * + */ + +var inherits = require('inherits') +var Sha256 = require('./sha256') +var Hash = require('./hash') + +var W = new Array(64) + +function Sha224 () { + this.init() + + this._w = W // new Array(64) + + Hash.call(this, 64, 56) +} + +inherits(Sha224, Sha256) + +Sha224.prototype.init = function () { + this._a = 0xc1059ed8 + this._b = 0x367cd507 + this._c = 0x3070dd17 + this._d = 0xf70e5939 + this._e = 0xffc00b31 + this._f = 0x68581511 + this._g = 0x64f98fa7 + this._h = 0xbefa4fa4 + + return this +} + +Sha224.prototype._hash = function () { + var H = new Buffer(28) + + H.writeInt32BE(this._a, 0) + H.writeInt32BE(this._b, 4) + H.writeInt32BE(this._c, 8) + H.writeInt32BE(this._d, 12) + H.writeInt32BE(this._e, 16) + H.writeInt32BE(this._f, 20) + H.writeInt32BE(this._g, 24) + + return H +} + +module.exports = Sha224 + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"./sha256":41,"buffer":3,"inherits":44}],41:[function(require,module,exports){ +(function (Buffer){ +/** + * A JavaScript implementation of the Secure Hash Algorithm, SHA-256, as defined + * in FIPS 180-2 + * Version 2.2-beta Copyright Angel Marin, Paul Johnston 2000 - 2009. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * + */ + +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5, + 0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5, + 0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3, + 0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174, + 0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC, + 0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA, + 0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7, + 0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967, + 0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13, + 0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85, + 0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3, + 0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070, + 0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, + 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, + 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208, + 0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2 +] + +var W = new Array(64) + +function Sha256 () { + this.init() + + this._w = W // new Array(64) + + Hash.call(this, 64, 56) +} + +inherits(Sha256, Hash) + +Sha256.prototype.init = function () { + this._a = 0x6a09e667 + this._b = 0xbb67ae85 + this._c = 0x3c6ef372 + this._d = 0xa54ff53a + this._e = 0x510e527f + this._f = 0x9b05688c + this._g = 0x1f83d9ab + this._h = 0x5be0cd19 + + return this +} + +function ch (x, y, z) { + return z ^ (x & (y ^ z)) +} + +function maj (x, y, z) { + return (x & y) | (z & (x | y)) +} + +function sigma0 (x) { + return (x >>> 2 | x << 30) ^ (x >>> 13 | x << 19) ^ (x >>> 22 | x << 10) +} + +function sigma1 (x) { + return (x >>> 6 | x << 26) ^ (x >>> 11 | x << 21) ^ (x >>> 25 | x << 7) +} + +function gamma0 (x) { + return (x >>> 7 | x << 25) ^ (x >>> 18 | x << 14) ^ (x >>> 3) +} + +function gamma1 (x) { + return (x >>> 17 | x << 15) ^ (x >>> 19 | x << 13) ^ (x >>> 10) +} + +Sha256.prototype._update = function (M) { + var W = this._w + + var a = this._a | 0 + var b = this._b | 0 + var c = this._c | 0 + var d = this._d | 0 + var e = this._e | 0 + var f = this._f | 0 + var g = this._g | 0 + var h = this._h | 0 + + for (var i = 0; i < 16; ++i) W[i] = M.readInt32BE(i * 4) + for (; i < 64; ++i) W[i] = (gamma1(W[i - 2]) + W[i - 7] + gamma0(W[i - 15]) + W[i - 16]) | 0 + + for (var j = 0; j < 64; ++j) { + var T1 = (h + sigma1(e) + ch(e, f, g) + K[j] + W[j]) | 0 + var T2 = (sigma0(a) + maj(a, b, c)) | 0 + + h = g + g = f + f = e + e = (d + T1) | 0 + d = c + c = b + b = a + a = (T1 + T2) | 0 + } + + this._a = (a + this._a) | 0 + this._b = (b + this._b) | 0 + this._c = (c + this._c) | 0 + this._d = (d + this._d) | 0 + this._e = (e + this._e) | 0 + this._f = (f + this._f) | 0 + this._g = (g + this._g) | 0 + this._h = (h + this._h) | 0 +} + +Sha256.prototype._hash = function () { + var H = new Buffer(32) + + H.writeInt32BE(this._a, 0) + H.writeInt32BE(this._b, 4) + H.writeInt32BE(this._c, 8) + H.writeInt32BE(this._d, 12) + H.writeInt32BE(this._e, 16) + H.writeInt32BE(this._f, 20) + H.writeInt32BE(this._g, 24) + H.writeInt32BE(this._h, 28) + + return H +} + +module.exports = Sha256 + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"buffer":3,"inherits":44}],42:[function(require,module,exports){ +(function (Buffer){ +var inherits = require('inherits') +var SHA512 = require('./sha512') +var Hash = require('./hash') + +var W = new Array(160) + +function Sha384 () { + this.init() + this._w = W + + Hash.call(this, 128, 112) +} + +inherits(Sha384, SHA512) + +Sha384.prototype.init = function () { + this._ah = 0xcbbb9d5d + this._bh = 0x629a292a + this._ch = 0x9159015a + this._dh = 0x152fecd8 + this._eh = 0x67332667 + this._fh = 0x8eb44a87 + this._gh = 0xdb0c2e0d + this._hh = 0x47b5481d + + this._al = 0xc1059ed8 + this._bl = 0x367cd507 + this._cl = 0x3070dd17 + this._dl = 0xf70e5939 + this._el = 0xffc00b31 + this._fl = 0x68581511 + this._gl = 0x64f98fa7 + this._hl = 0xbefa4fa4 + + return this +} + +Sha384.prototype._hash = function () { + var H = new Buffer(48) + + function writeInt64BE (h, l, offset) { + H.writeInt32BE(h, offset) + H.writeInt32BE(l, offset + 4) + } + + writeInt64BE(this._ah, this._al, 0) + writeInt64BE(this._bh, this._bl, 8) + writeInt64BE(this._ch, this._cl, 16) + writeInt64BE(this._dh, this._dl, 24) + writeInt64BE(this._eh, this._el, 32) + writeInt64BE(this._fh, this._fl, 40) + + return H +} + +module.exports = Sha384 + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"./sha512":43,"buffer":3,"inherits":44}],43:[function(require,module,exports){ +(function (Buffer){ +var inherits = require('inherits') +var Hash = require('./hash') + +var K = [ + 0x428a2f98, 0xd728ae22, 0x71374491, 0x23ef65cd, + 0xb5c0fbcf, 0xec4d3b2f, 0xe9b5dba5, 0x8189dbbc, + 0x3956c25b, 0xf348b538, 0x59f111f1, 0xb605d019, + 0x923f82a4, 0xaf194f9b, 0xab1c5ed5, 0xda6d8118, + 0xd807aa98, 0xa3030242, 0x12835b01, 0x45706fbe, + 0x243185be, 0x4ee4b28c, 0x550c7dc3, 0xd5ffb4e2, + 0x72be5d74, 0xf27b896f, 0x80deb1fe, 0x3b1696b1, + 0x9bdc06a7, 0x25c71235, 0xc19bf174, 0xcf692694, + 0xe49b69c1, 0x9ef14ad2, 0xefbe4786, 0x384f25e3, + 0x0fc19dc6, 0x8b8cd5b5, 0x240ca1cc, 0x77ac9c65, + 0x2de92c6f, 0x592b0275, 0x4a7484aa, 0x6ea6e483, + 0x5cb0a9dc, 0xbd41fbd4, 0x76f988da, 0x831153b5, + 0x983e5152, 0xee66dfab, 0xa831c66d, 0x2db43210, + 0xb00327c8, 0x98fb213f, 0xbf597fc7, 0xbeef0ee4, + 0xc6e00bf3, 0x3da88fc2, 0xd5a79147, 0x930aa725, + 0x06ca6351, 0xe003826f, 0x14292967, 0x0a0e6e70, + 0x27b70a85, 0x46d22ffc, 0x2e1b2138, 0x5c26c926, + 0x4d2c6dfc, 0x5ac42aed, 0x53380d13, 0x9d95b3df, + 0x650a7354, 0x8baf63de, 0x766a0abb, 0x3c77b2a8, + 0x81c2c92e, 0x47edaee6, 0x92722c85, 0x1482353b, + 0xa2bfe8a1, 0x4cf10364, 0xa81a664b, 0xbc423001, + 0xc24b8b70, 0xd0f89791, 0xc76c51a3, 0x0654be30, + 0xd192e819, 0xd6ef5218, 0xd6990624, 0x5565a910, + 0xf40e3585, 0x5771202a, 0x106aa070, 0x32bbd1b8, + 0x19a4c116, 0xb8d2d0c8, 0x1e376c08, 0x5141ab53, + 0x2748774c, 0xdf8eeb99, 0x34b0bcb5, 0xe19b48a8, + 0x391c0cb3, 0xc5c95a63, 0x4ed8aa4a, 0xe3418acb, + 0x5b9cca4f, 0x7763e373, 0x682e6ff3, 0xd6b2b8a3, + 0x748f82ee, 0x5defb2fc, 0x78a5636f, 0x43172f60, + 0x84c87814, 0xa1f0ab72, 0x8cc70208, 0x1a6439ec, + 0x90befffa, 0x23631e28, 0xa4506ceb, 0xde82bde9, + 0xbef9a3f7, 0xb2c67915, 0xc67178f2, 0xe372532b, + 0xca273ece, 0xea26619c, 0xd186b8c7, 0x21c0c207, + 0xeada7dd6, 0xcde0eb1e, 0xf57d4f7f, 0xee6ed178, + 0x06f067aa, 0x72176fba, 0x0a637dc5, 0xa2c898a6, + 0x113f9804, 0xbef90dae, 0x1b710b35, 0x131c471b, + 0x28db77f5, 0x23047d84, 0x32caab7b, 0x40c72493, + 0x3c9ebe0a, 0x15c9bebc, 0x431d67c4, 0x9c100d4c, + 0x4cc5d4be, 0xcb3e42b6, 0x597f299c, 0xfc657e2a, + 0x5fcb6fab, 0x3ad6faec, 0x6c44198c, 0x4a475817 +] + +var W = new Array(160) + +function Sha512 () { + this.init() + this._w = W + + Hash.call(this, 128, 112) +} + +inherits(Sha512, Hash) + +Sha512.prototype.init = function () { + this._ah = 0x6a09e667 + this._bh = 0xbb67ae85 + this._ch = 0x3c6ef372 + this._dh = 0xa54ff53a + this._eh = 0x510e527f + this._fh = 0x9b05688c + this._gh = 0x1f83d9ab + this._hh = 0x5be0cd19 + + this._al = 0xf3bcc908 + this._bl = 0x84caa73b + this._cl = 0xfe94f82b + this._dl = 0x5f1d36f1 + this._el = 0xade682d1 + this._fl = 0x2b3e6c1f + this._gl = 0xfb41bd6b + this._hl = 0x137e2179 + + return this +} + +function Ch (x, y, z) { + return z ^ (x & (y ^ z)) +} + +function maj (x, y, z) { + return (x & y) | (z & (x | y)) +} + +function sigma0 (x, xl) { + return (x >>> 28 | xl << 4) ^ (xl >>> 2 | x << 30) ^ (xl >>> 7 | x << 25) +} + +function sigma1 (x, xl) { + return (x >>> 14 | xl << 18) ^ (x >>> 18 | xl << 14) ^ (xl >>> 9 | x << 23) +} + +function Gamma0 (x, xl) { + return (x >>> 1 | xl << 31) ^ (x >>> 8 | xl << 24) ^ (x >>> 7) +} + +function Gamma0l (x, xl) { + return (x >>> 1 | xl << 31) ^ (x >>> 8 | xl << 24) ^ (x >>> 7 | xl << 25) +} + +function Gamma1 (x, xl) { + return (x >>> 19 | xl << 13) ^ (xl >>> 29 | x << 3) ^ (x >>> 6) +} + +function Gamma1l (x, xl) { + return (x >>> 19 | xl << 13) ^ (xl >>> 29 | x << 3) ^ (x >>> 6 | xl << 26) +} + +function getCarry (a, b) { + return (a >>> 0) < (b >>> 0) ? 1 : 0 +} + +Sha512.prototype._update = function (M) { + var W = this._w + + var ah = this._ah | 0 + var bh = this._bh | 0 + var ch = this._ch | 0 + var dh = this._dh | 0 + var eh = this._eh | 0 + var fh = this._fh | 0 + var gh = this._gh | 0 + var hh = this._hh | 0 + + var al = this._al | 0 + var bl = this._bl | 0 + var cl = this._cl | 0 + var dl = this._dl | 0 + var el = this._el | 0 + var fl = this._fl | 0 + var gl = this._gl | 0 + var hl = this._hl | 0 + + for (var i = 0; i < 32; i += 2) { + W[i] = M.readInt32BE(i * 4) + W[i + 1] = M.readInt32BE(i * 4 + 4) + } + for (; i < 160; i += 2) { + var xh = W[i - 15 * 2] + var xl = W[i - 15 * 2 + 1] + var gamma0 = Gamma0(xh, xl) + var gamma0l = Gamma0l(xl, xh) + + xh = W[i - 2 * 2] + xl = W[i - 2 * 2 + 1] + var gamma1 = Gamma1(xh, xl) + var gamma1l = Gamma1l(xl, xh) + + // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16] + var Wi7h = W[i - 7 * 2] + var Wi7l = W[i - 7 * 2 + 1] + + var Wi16h = W[i - 16 * 2] + var Wi16l = W[i - 16 * 2 + 1] + + var Wil = (gamma0l + Wi7l) | 0 + var Wih = (gamma0 + Wi7h + getCarry(Wil, gamma0l)) | 0 + Wil = (Wil + gamma1l) | 0 + Wih = (Wih + gamma1 + getCarry(Wil, gamma1l)) | 0 + Wil = (Wil + Wi16l) | 0 + Wih = (Wih + Wi16h + getCarry(Wil, Wi16l)) | 0 + + W[i] = Wih + W[i + 1] = Wil + } + + for (var j = 0; j < 160; j += 2) { + Wih = W[j] + Wil = W[j + 1] + + var majh = maj(ah, bh, ch) + var majl = maj(al, bl, cl) + + var sigma0h = sigma0(ah, al) + var sigma0l = sigma0(al, ah) + var sigma1h = sigma1(eh, el) + var sigma1l = sigma1(el, eh) + + // t1 = h + sigma1 + ch + K[j] + W[j] + var Kih = K[j] + var Kil = K[j + 1] + + var chh = Ch(eh, fh, gh) + var chl = Ch(el, fl, gl) + + var t1l = (hl + sigma1l) | 0 + var t1h = (hh + sigma1h + getCarry(t1l, hl)) | 0 + t1l = (t1l + chl) | 0 + t1h = (t1h + chh + getCarry(t1l, chl)) | 0 + t1l = (t1l + Kil) | 0 + t1h = (t1h + Kih + getCarry(t1l, Kil)) | 0 + t1l = (t1l + Wil) | 0 + t1h = (t1h + Wih + getCarry(t1l, Wil)) | 0 + + // t2 = sigma0 + maj + var t2l = (sigma0l + majl) | 0 + var t2h = (sigma0h + majh + getCarry(t2l, sigma0l)) | 0 + + hh = gh + hl = gl + gh = fh + gl = fl + fh = eh + fl = el + el = (dl + t1l) | 0 + eh = (dh + t1h + getCarry(el, dl)) | 0 + dh = ch + dl = cl + ch = bh + cl = bl + bh = ah + bl = al + al = (t1l + t2l) | 0 + ah = (t1h + t2h + getCarry(al, t1l)) | 0 + } + + this._al = (this._al + al) | 0 + this._bl = (this._bl + bl) | 0 + this._cl = (this._cl + cl) | 0 + this._dl = (this._dl + dl) | 0 + this._el = (this._el + el) | 0 + this._fl = (this._fl + fl) | 0 + this._gl = (this._gl + gl) | 0 + this._hl = (this._hl + hl) | 0 + + this._ah = (this._ah + ah + getCarry(this._al, al)) | 0 + this._bh = (this._bh + bh + getCarry(this._bl, bl)) | 0 + this._ch = (this._ch + ch + getCarry(this._cl, cl)) | 0 + this._dh = (this._dh + dh + getCarry(this._dl, dl)) | 0 + this._eh = (this._eh + eh + getCarry(this._el, el)) | 0 + this._fh = (this._fh + fh + getCarry(this._fl, fl)) | 0 + this._gh = (this._gh + gh + getCarry(this._gl, gl)) | 0 + this._hh = (this._hh + hh + getCarry(this._hl, hl)) | 0 +} + +Sha512.prototype._hash = function () { + var H = new Buffer(64) + + function writeInt64BE (h, l, offset) { + H.writeInt32BE(h, offset) + H.writeInt32BE(l, offset + 4) + } + + writeInt64BE(this._ah, this._al, 0) + writeInt64BE(this._bh, this._bl, 8) + writeInt64BE(this._ch, this._cl, 16) + writeInt64BE(this._dh, this._dl, 24) + writeInt64BE(this._eh, this._el, 32) + writeInt64BE(this._fh, this._fl, 40) + writeInt64BE(this._gh, this._gl, 48) + writeInt64BE(this._hh, this._hl, 56) + + return H +} + +module.exports = Sha512 + +}).call(this,require("buffer").Buffer) +},{"./hash":36,"buffer":3,"inherits":44}],44:[function(require,module,exports){ +arguments[4][8][0].apply(exports,arguments) +},{"dup":8}],45:[function(require,module,exports){ +var MAX_ALLOC = Math.pow(2, 30) - 1 // default in iojs +module.exports = function (iterations, keylen) { + if (typeof iterations !== 'number') { + throw new TypeError('Iterations not a number') + } + + if (iterations < 0) { + throw new TypeError('Bad iterations') + } + + if (typeof keylen !== 'number') { + throw new TypeError('Key length not a number') + } + + if (keylen < 0 || keylen > MAX_ALLOC || keylen !== keylen) { /* eslint no-self-compare: 0 */ + throw new TypeError('Bad key length') + } +} + +},{}]},{},[1]); diff --git a/angular-pbkdf2/index.js b/angular-pbkdf2/index.js deleted file mode 100644 index 4e1e0d9b9..000000000 --- a/angular-pbkdf2/index.js +++ /dev/null @@ -1,18 +0,0 @@ -var pbkdf2Module = angular.module('pbkdf2Module', []); -var pbkdf2Sync = require('../node_modules/pbkdf2').pbkdf2Sync; - -pbkdf2Module.constant('MODULE_VERSION', '1.0.0'); - -pbkdf2Module.provider("pbkdf2Service", function() { - var provider = {}; - - provider.$get = function() { - var service = {}; - - service.pbkdf2Sync = pbkdf2Sync; - - return service; - }; - - return provider; -}); diff --git a/app-template/apply.js b/app-template/apply.js index 14fdaab57..f641e72cd 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -5,6 +5,7 @@ // var templates = { + 'package.json': '/', 'Makefile': 'cordova/', 'ProjectMakefile': 'cordova/', 'config-template.xml': '/', @@ -12,11 +13,11 @@ var templates = { 'Package.appxmanifest': 'cordova/wp/', '.desktop': 'webkitbuilds/', 'setup-win.iss': 'webkitbuilds/', - 'manifest.json': 'chrome-app/', + 'build-macos.sh': 'webkitbuilds/', // 'bower.json': '/', }; var configDir = process.argv[2] || 'copay'; -var JSONheader = ' { ' + "\n" + ' "//":"PLEASE! Do not edit this file directly",' + "\n" + ' "//":" Modify it at app-template/", ' + "\n"; +var JSONheader = ' { ' + "\n" + ' "//":"Changes to this file will be overwritten",' + "\n" + ' "//":" Modify it in the app-template directory", ' + "\n"; var MakefileHeader = "# PLEASE! Do not edit this file directly \n# Modify it at app-template/\n"; @@ -116,6 +117,6 @@ function copyDir(from, to, cb) { } -copyDir(configDir + '/img/', '../www/img/', function() { +copyDir(configDir + '/img/', '../www/img/app/', function() { console.log("apply.js finished. \n\n"); }); diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 79eb58f52..99c45da61 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -5,18 +5,20 @@ "purposeLine": "Secure Bitcoin Wallet", "bundleName": "wallet", "appUri": "bitpay", - "name": "bitpay", "nameNoSpace": "bitpay", "nameCase": "BitPay", "nameCaseNoSpace": "BitPay", "gitHubRepoName": "bitpay-wallet", + "gitHubRepoUrl": "git://github.com/bitpay/bitpay-wallet.git", + "gitHubRepoBugs": "https://github.com/bitpay/bitpay-wallet/issues", "disclaimerUrl": "", "url": "https://bitpay.com", "appDescription": "Secure Bitcoin Wallet", "winAppName": "BitPayWallet", "wpPublisherId": "{}", "wpProductId": "{}", + "windowsAppId": "", "pushSenderId": "1036948132229", "description": "Secure Bitcoin Wallet", "version": "0.14.0", diff --git a/app-template/bitpay/img/128x128.png b/app-template/bitpay/img/128x128.png new file mode 100755 index 000000000..0a03f7ed3 Binary files /dev/null and b/app-template/bitpay/img/128x128.png differ diff --git a/app-template/bitpay/img/16x16.png b/app-template/bitpay/img/16x16.png new file mode 100755 index 000000000..973de1c65 Binary files /dev/null and b/app-template/bitpay/img/16x16.png differ diff --git a/app-template/bitpay/img/24x24.png b/app-template/bitpay/img/24x24.png new file mode 100755 index 000000000..7ec13aba4 Binary files /dev/null and b/app-template/bitpay/img/24x24.png differ diff --git a/app-template/bitpay/img/256x256.png b/app-template/bitpay/img/256x256.png new file mode 100755 index 000000000..c2d0ac1d8 Binary files /dev/null and b/app-template/bitpay/img/256x256.png differ diff --git a/app-template/bitpay/img/32x32.png b/app-template/bitpay/img/32x32.png new file mode 100755 index 000000000..74816f940 Binary files /dev/null and b/app-template/bitpay/img/32x32.png differ diff --git a/app-template/bitpay/img/48x48.png b/app-template/bitpay/img/48x48.png new file mode 100755 index 000000000..1544ac1f1 Binary files /dev/null and b/app-template/bitpay/img/48x48.png differ diff --git a/app-template/bitpay/img/512x512.png b/app-template/bitpay/img/512x512.png new file mode 100755 index 000000000..19185804c Binary files /dev/null and b/app-template/bitpay/img/512x512.png differ diff --git a/app-template/bitpay/img/64x64.png b/app-template/bitpay/img/64x64.png new file mode 100755 index 000000000..ed9b64f6c Binary files /dev/null and b/app-template/bitpay/img/64x64.png differ diff --git a/app-template/bitpay/img/96x96.png b/app-template/bitpay/img/96x96.png new file mode 100755 index 000000000..8d473f1c8 Binary files /dev/null and b/app-template/bitpay/img/96x96.png differ diff --git a/app-template/bitpay/img/Background.png b/app-template/bitpay/img/Background.png new file mode 100644 index 000000000..7056c17cb Binary files /dev/null and b/app-template/bitpay/img/Background.png differ diff --git a/app-template/bitpay/img/favicon.ico b/app-template/bitpay/img/favicon.ico new file mode 100644 index 000000000..166c0bcaf Binary files /dev/null and b/app-template/bitpay/img/favicon.ico differ diff --git a/app-template/bitpay/img/logo.icns b/app-template/bitpay/img/logo.icns new file mode 100644 index 000000000..d8f330e8f Binary files /dev/null and b/app-template/bitpay/img/logo.icns differ diff --git a/app-template/bitpay/img/logo.ico b/app-template/bitpay/img/logo.ico new file mode 100644 index 000000000..f91c730f2 Binary files /dev/null and b/app-template/bitpay/img/logo.ico differ diff --git a/webkitbuilds/build-osx.sh b/app-template/build-macos.sh similarity index 96% rename from webkitbuilds/build-osx.sh rename to app-template/build-macos.sh index 7e46354f5..2df04ef3a 100755 --- a/webkitbuilds/build-osx.sh +++ b/app-template/build-macos.sh @@ -1,7 +1,7 @@ #!/bin/bash SHOULD_SIGN=$1 -if [ "$SHOULD_SIGN" ] +if [ "$SHOULD_SIGN" ] then echo "Will sign the APP" fi @@ -16,10 +16,10 @@ if [ -d "$dir" ]; then fi # set up your app name, architecture, and background image file name -APP_NAME="Copay" +APP_NAME="*USERVISIBLENAME*" DMG_BACKGROUND_IMG="Background.png" -PATH_NAME="Copay/osx64/" +PATH_NAME="${APP_NAME}/osx64/" # you should not need to change these APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs" @@ -35,11 +35,11 @@ _BACKGROUND_IMAGE_DPI_W=`sips -g dpiWidth ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9 if [ $(echo " $_BACKGROUND_IMAGE_DPI_H != 72.0 " | bc) -eq 1 -o $(echo " $_BACKGROUND_IMAGE_DPI_W != 72.0 " | bc) -eq 1 ]; then echo "WARNING: The background image's DPI is not 72. This will result in distorted backgrounds on Mac OS X 10.7+." echo " I will convert it to 72 DPI for you." - + _DMG_BACKGROUND_TMP="${DMG_BACKGROUND_IMG%.*}"_dpifix."${DMG_BACKGROUND_IMG##*.}" sips -s dpiWidth 72 -s dpiHeight 72 ${DMG_BACKGROUND_IMG} --out ${_DMG_BACKGROUND_TMP} - + DMG_BACKGROUND_IMG="${_DMG_BACKGROUND_TMP}" fi @@ -66,11 +66,11 @@ if [ $? -ne 0 ]; then # Sign Code (MATIAS) if [ $SHOULD_SIGN ] then - echo "Signing Copay DMG" + echo "Signing ${APP_NAME} DMG" export IDENTITY="3rd Party Mac Developer Application: BitPay, Inc. (884JRH5R93)" - # not need for 'out of app store' distribution (?) + # not need for 'out of app store' distribution (?) # export PARENT_PLIST=parent.plist # export CHILD_PLIST=child.plist export APP_PATH=${STAGING_DIR}/${APP_NAME}.app diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 1db63c59a..1d646660f 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -16,7 +16,8 @@ - + + @@ -56,8 +57,9 @@ - - + + + diff --git a/app-template/copay/androidRes/drawable-hdpi/icon.png b/app-template/copay/androidRes/drawable-hdpi/icon.png deleted file mode 100644 index 004d81868..000000000 Binary files a/app-template/copay/androidRes/drawable-hdpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-hdpi/push.png b/app-template/copay/androidRes/drawable-hdpi/push.png deleted file mode 100644 index b94b59608..000000000 Binary files a/app-template/copay/androidRes/drawable-hdpi/push.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-ldpi/icon.png b/app-template/copay/androidRes/drawable-ldpi/icon.png deleted file mode 100644 index 1db5b04b5..000000000 Binary files a/app-template/copay/androidRes/drawable-ldpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-ldpi/push.png b/app-template/copay/androidRes/drawable-ldpi/push.png deleted file mode 100644 index 6f9fac799..000000000 Binary files a/app-template/copay/androidRes/drawable-ldpi/push.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-mdpi/icon.png b/app-template/copay/androidRes/drawable-mdpi/icon.png deleted file mode 100644 index df8674d24..000000000 Binary files a/app-template/copay/androidRes/drawable-mdpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-mdpi/push.png b/app-template/copay/androidRes/drawable-mdpi/push.png deleted file mode 100644 index 837d5b9b4..000000000 Binary files a/app-template/copay/androidRes/drawable-mdpi/push.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-hdpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-hdpi/copayscreen.png deleted file mode 100644 index ef3bd780e..000000000 Binary files a/app-template/copay/androidRes/drawable-port-hdpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-ldpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-ldpi/copayscreen.png deleted file mode 100644 index 8befc7e2e..000000000 Binary files a/app-template/copay/androidRes/drawable-port-ldpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-mdpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-mdpi/copayscreen.png deleted file mode 100644 index de74c2442..000000000 Binary files a/app-template/copay/androidRes/drawable-port-mdpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-xhdpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-xhdpi/copayscreen.png deleted file mode 100644 index 76cf0abf6..000000000 Binary files a/app-template/copay/androidRes/drawable-port-xhdpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-xxhdpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-xxhdpi/copayscreen.png deleted file mode 100644 index 3ccb207e8..000000000 Binary files a/app-template/copay/androidRes/drawable-port-xxhdpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-port-xxxhdpi/copayscreen.png b/app-template/copay/androidRes/drawable-port-xxxhdpi/copayscreen.png deleted file mode 100644 index f8770abc6..000000000 Binary files a/app-template/copay/androidRes/drawable-port-xxxhdpi/copayscreen.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-xhdpi/icon.png b/app-template/copay/androidRes/drawable-xhdpi/icon.png deleted file mode 100644 index 699245f5d..000000000 Binary files a/app-template/copay/androidRes/drawable-xhdpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-xhdpi/push.png b/app-template/copay/androidRes/drawable-xhdpi/push.png deleted file mode 100644 index f79e1986a..000000000 Binary files a/app-template/copay/androidRes/drawable-xhdpi/push.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-xxhdpi/icon.png b/app-template/copay/androidRes/drawable-xxhdpi/icon.png deleted file mode 100644 index e63d54900..000000000 Binary files a/app-template/copay/androidRes/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-xxhdpi/push.png b/app-template/copay/androidRes/drawable-xxhdpi/push.png deleted file mode 100644 index c3fe8d003..000000000 Binary files a/app-template/copay/androidRes/drawable-xxhdpi/push.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable-xxxhdpi/icon.png b/app-template/copay/androidRes/drawable-xxxhdpi/icon.png deleted file mode 100644 index 4bb14b580..000000000 Binary files a/app-template/copay/androidRes/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable/icon.png b/app-template/copay/androidRes/drawable/icon.png deleted file mode 100644 index d4025ae34..000000000 Binary files a/app-template/copay/androidRes/drawable/icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable/launcher_icon.png b/app-template/copay/androidRes/drawable/launcher_icon.png deleted file mode 100644 index fc5fafcf0..000000000 Binary files a/app-template/copay/androidRes/drawable/launcher_icon.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable/share_via_barcode.png b/app-template/copay/androidRes/drawable/share_via_barcode.png deleted file mode 100644 index 56c344929..000000000 Binary files a/app-template/copay/androidRes/drawable/share_via_barcode.png and /dev/null differ diff --git a/app-template/copay/androidRes/drawable/shopper_icon.png b/app-template/copay/androidRes/drawable/shopper_icon.png deleted file mode 100644 index 63346faab..000000000 Binary files a/app-template/copay/androidRes/drawable/shopper_icon.png and /dev/null differ diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 7a6ee7ef3..f0bea8816 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -3,20 +3,22 @@ "packageDescription": "Copay Bitcoin Wallet", "userVisibleName": "Copay", "purposeLine": "Copay Bitcoin Wallet", + "bundleName": "copay", "appUri": "copay", - "name": "copay", "nameNoSpace": "copay", "nameCase": "Copay", "nameCaseNoSpace": "Copay", - "bundleName": "copay", "gitHubRepoName": "copay", + "gitHubRepoUrl": "git://github.com/bitpay/copay.git", + "gitHubRepoBugs": "https://github.com/bitpay/copay/issues", "disclaimerUrl": "https://copay.io/disclaimer", "url": "https://copay.io", "appDescription": "Copay Bitcoin Wallet", "winAppName": "CopayWallet", "wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}", "wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}", + "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", "version": "2.5.0", diff --git a/app-template/copay/img/128x128.png b/app-template/copay/img/128x128.png new file mode 100755 index 000000000..e2a715a69 Binary files /dev/null and b/app-template/copay/img/128x128.png differ diff --git a/app-template/copay/img/16x16.png b/app-template/copay/img/16x16.png new file mode 100755 index 000000000..66a7f6960 Binary files /dev/null and b/app-template/copay/img/16x16.png differ diff --git a/app-template/copay/img/24x24.png b/app-template/copay/img/24x24.png new file mode 100755 index 000000000..f857b2562 Binary files /dev/null and b/app-template/copay/img/24x24.png differ diff --git a/app-template/copay/img/256x256.png b/app-template/copay/img/256x256.png new file mode 100755 index 000000000..8f2f6d5c9 Binary files /dev/null and b/app-template/copay/img/256x256.png differ diff --git a/app-template/copay/img/32x32.png b/app-template/copay/img/32x32.png new file mode 100755 index 000000000..6111d3120 Binary files /dev/null and b/app-template/copay/img/32x32.png differ diff --git a/app-template/copay/img/48x48.png b/app-template/copay/img/48x48.png new file mode 100755 index 000000000..b8206bd53 Binary files /dev/null and b/app-template/copay/img/48x48.png differ diff --git a/app-template/copay/img/512x512.png b/app-template/copay/img/512x512.png new file mode 100755 index 000000000..8df121629 Binary files /dev/null and b/app-template/copay/img/512x512.png differ diff --git a/app-template/copay/img/64x64.png b/app-template/copay/img/64x64.png new file mode 100755 index 000000000..87985f3e4 Binary files /dev/null and b/app-template/copay/img/64x64.png differ diff --git a/app-template/copay/img/96x96.png b/app-template/copay/img/96x96.png new file mode 100755 index 000000000..047a88431 Binary files /dev/null and b/app-template/copay/img/96x96.png differ diff --git a/app-template/copay/img/Background.png b/app-template/copay/img/Background.png new file mode 100644 index 000000000..8e7f9a152 Binary files /dev/null and b/app-template/copay/img/Background.png differ diff --git a/www/img/favicon.ico b/app-template/copay/img/favicon.ico similarity index 100% rename from www/img/favicon.ico rename to app-template/copay/img/favicon.ico diff --git a/app-template/copay/img/icon-chrome-128.png b/app-template/copay/img/icon-chrome-128.png deleted file mode 100644 index 0044af9ca..000000000 Binary files a/app-template/copay/img/icon-chrome-128.png and /dev/null differ diff --git a/app-template/copay/img/logo.icns b/app-template/copay/img/logo.icns new file mode 100644 index 000000000..b19117e91 Binary files /dev/null and b/app-template/copay/img/logo.icns differ diff --git a/app-template/copay/img/logo.ico b/app-template/copay/img/logo.ico new file mode 100644 index 000000000..32a1d2291 Binary files /dev/null and b/app-template/copay/img/logo.ico differ diff --git a/app-template/copay/iosIcons/icon-300.png b/app-template/copay/iosIcons/icon-300.png deleted file mode 100644 index f9b681b5d..000000000 Binary files a/app-template/copay/iosIcons/icon-300.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-40.png b/app-template/copay/iosIcons/icon-40.png deleted file mode 100644 index b16e80b00..000000000 Binary files a/app-template/copay/iosIcons/icon-40.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-40@2x.png b/app-template/copay/iosIcons/icon-40@2x.png deleted file mode 100644 index 01628c8b3..000000000 Binary files a/app-template/copay/iosIcons/icon-40@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-50.png b/app-template/copay/iosIcons/icon-50.png deleted file mode 100644 index 2ba791c15..000000000 Binary files a/app-template/copay/iosIcons/icon-50.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-50@2x.png b/app-template/copay/iosIcons/icon-50@2x.png deleted file mode 100644 index e67e71721..000000000 Binary files a/app-template/copay/iosIcons/icon-50@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-57.png b/app-template/copay/iosIcons/icon-57.png deleted file mode 100644 index 5f215482a..000000000 Binary files a/app-template/copay/iosIcons/icon-57.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-57@2x.png b/app-template/copay/iosIcons/icon-57@2x.png deleted file mode 100644 index c12a5abfb..000000000 Binary files a/app-template/copay/iosIcons/icon-57@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-60@2x.png b/app-template/copay/iosIcons/icon-60@2x.png deleted file mode 100644 index cc0ff23b0..000000000 Binary files a/app-template/copay/iosIcons/icon-60@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-60@3x.png b/app-template/copay/iosIcons/icon-60@3x.png deleted file mode 100644 index 3e4deb286..000000000 Binary files a/app-template/copay/iosIcons/icon-60@3x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-72.png b/app-template/copay/iosIcons/icon-72.png deleted file mode 100644 index d88522212..000000000 Binary files a/app-template/copay/iosIcons/icon-72.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-72@2x.png b/app-template/copay/iosIcons/icon-72@2x.png deleted file mode 100644 index 8dea55a88..000000000 Binary files a/app-template/copay/iosIcons/icon-72@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-76.png b/app-template/copay/iosIcons/icon-76.png deleted file mode 100644 index ab0ec65ed..000000000 Binary files a/app-template/copay/iosIcons/icon-76.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-76@2x.png b/app-template/copay/iosIcons/icon-76@2x.png deleted file mode 100644 index 4507b4f6a..000000000 Binary files a/app-template/copay/iosIcons/icon-76@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-83.5@2x.png b/app-template/copay/iosIcons/icon-83.5@2x.png deleted file mode 100644 index 9b2972b2f..000000000 Binary files a/app-template/copay/iosIcons/icon-83.5@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-small.png b/app-template/copay/iosIcons/icon-small.png deleted file mode 100644 index 27517022a..000000000 Binary files a/app-template/copay/iosIcons/icon-small.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-small@2x.png b/app-template/copay/iosIcons/icon-small@2x.png deleted file mode 100644 index d76c5db41..000000000 Binary files a/app-template/copay/iosIcons/icon-small@2x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon-small@3x.png b/app-template/copay/iosIcons/icon-small@3x.png deleted file mode 100644 index 719fddebf..000000000 Binary files a/app-template/copay/iosIcons/icon-small@3x.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon.png b/app-template/copay/iosIcons/icon.png deleted file mode 100644 index 0e532917a..000000000 Binary files a/app-template/copay/iosIcons/icon.png and /dev/null differ diff --git a/app-template/copay/iosIcons/icon@2x.png b/app-template/copay/iosIcons/icon@2x.png deleted file mode 100644 index 147c21e54..000000000 Binary files a/app-template/copay/iosIcons/icon@2x.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default-568h@2x~iphone.png b/app-template/copay/iosSplash/Default-568h@2x~iphone.png deleted file mode 100644 index 9174abe81..000000000 Binary files a/app-template/copay/iosSplash/Default-568h@2x~iphone.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default-667h.png b/app-template/copay/iosSplash/Default-667h.png deleted file mode 100644 index b64cf0aa5..000000000 Binary files a/app-template/copay/iosSplash/Default-667h.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default-736h.png b/app-template/copay/iosSplash/Default-736h.png deleted file mode 100644 index 3ab52f2bb..000000000 Binary files a/app-template/copay/iosSplash/Default-736h.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default-Portrait@2x~ipad.png b/app-template/copay/iosSplash/Default-Portrait@2x~ipad.png deleted file mode 100644 index 2fbffbfd2..000000000 Binary files a/app-template/copay/iosSplash/Default-Portrait@2x~ipad.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default-Portrait~ipad.png b/app-template/copay/iosSplash/Default-Portrait~ipad.png deleted file mode 100644 index 27cc0bdb1..000000000 Binary files a/app-template/copay/iosSplash/Default-Portrait~ipad.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default@2x~iphone.png b/app-template/copay/iosSplash/Default@2x~iphone.png deleted file mode 100644 index d4a59247a..000000000 Binary files a/app-template/copay/iosSplash/Default@2x~iphone.png and /dev/null differ diff --git a/app-template/copay/iosSplash/Default~iphone.png b/app-template/copay/iosSplash/Default~iphone.png deleted file mode 100644 index f1a78c6c1..000000000 Binary files a/app-template/copay/iosSplash/Default~iphone.png and /dev/null differ diff --git a/app-template/copay/wpAssets/173x173@1.png b/app-template/copay/wpAssets/173x173@1.png deleted file mode 100755 index 131b0018a..000000000 Binary files a/app-template/copay/wpAssets/173x173@1.png and /dev/null differ diff --git a/app-template/copay/wpAssets/173x173@2.png b/app-template/copay/wpAssets/173x173@2.png deleted file mode 100755 index 88ae68c8e..000000000 Binary files a/app-template/copay/wpAssets/173x173@2.png and /dev/null differ diff --git a/app-template/copay/wpAssets/200x200@1.png b/app-template/copay/wpAssets/200x200@1.png deleted file mode 100644 index da5084c46..000000000 Binary files a/app-template/copay/wpAssets/200x200@1.png and /dev/null differ diff --git a/app-template/copay/wpAssets/200x200@2.png b/app-template/copay/wpAssets/200x200@2.png deleted file mode 100644 index af14aaa49..000000000 Binary files a/app-template/copay/wpAssets/200x200@2.png and /dev/null differ diff --git a/app-template/copay/wpAssets/62x62@1.png b/app-template/copay/wpAssets/62x62@1.png deleted file mode 100755 index 093b8e4ac..000000000 Binary files a/app-template/copay/wpAssets/62x62@1.png and /dev/null differ diff --git a/app-template/copay/wpAssets/62x62@2.png b/app-template/copay/wpAssets/62x62@2.png deleted file mode 100755 index 28148de00..000000000 Binary files a/app-template/copay/wpAssets/62x62@2.png and /dev/null differ diff --git a/app-template/copay/wpAssets/99x99@1.png b/app-template/copay/wpAssets/99x99@1.png deleted file mode 100755 index a813b5122..000000000 Binary files a/app-template/copay/wpAssets/99x99@1.png and /dev/null differ diff --git a/app-template/copay/wpAssets/99x99@2.png b/app-template/copay/wpAssets/99x99@2.png deleted file mode 100755 index e9a930b04..000000000 Binary files a/app-template/copay/wpAssets/99x99@2.png and /dev/null differ diff --git a/app-template/copay/wpAssets/BadgeLogo.png b/app-template/copay/wpAssets/BadgeLogo.png deleted file mode 100644 index 24974c15d..000000000 Binary files a/app-template/copay/wpAssets/BadgeLogo.png and /dev/null differ diff --git a/app-template/copay/wpAssets/Logo.png b/app-template/copay/wpAssets/Logo.png deleted file mode 100644 index 7e8875a97..000000000 Binary files a/app-template/copay/wpAssets/Logo.png and /dev/null differ diff --git a/app-template/copay/wpAssets/SplashScreen.png b/app-template/copay/wpAssets/SplashScreen.png deleted file mode 100644 index cb5a52389..000000000 Binary files a/app-template/copay/wpAssets/SplashScreen.png and /dev/null differ diff --git a/app-template/copay/wpAssets/SquareTile150x150.png b/app-template/copay/wpAssets/SquareTile150x150.png deleted file mode 100644 index e0e097239..000000000 Binary files a/app-template/copay/wpAssets/SquareTile150x150.png and /dev/null differ diff --git a/app-template/copay/wpAssets/SquareTile71x71.png b/app-template/copay/wpAssets/SquareTile71x71.png deleted file mode 100644 index fdab02ed9..000000000 Binary files a/app-template/copay/wpAssets/SquareTile71x71.png and /dev/null differ diff --git a/app-template/copay/wpAssets/StoreLogo.png b/app-template/copay/wpAssets/StoreLogo.png deleted file mode 100644 index 363182bb7..000000000 Binary files a/app-template/copay/wpAssets/StoreLogo.png and /dev/null differ diff --git a/app-template/copay/wpAssets/WideLogo.png b/app-template/copay/wpAssets/WideLogo.png deleted file mode 100644 index bf104ae25..000000000 Binary files a/app-template/copay/wpAssets/WideLogo.png and /dev/null differ diff --git a/app-template/copay/wpAssets/icon-300.png b/app-template/copay/wpAssets/icon-300.png deleted file mode 100644 index f9b681b5d..000000000 Binary files a/app-template/copay/wpAssets/icon-300.png and /dev/null differ diff --git a/app-template/copay/wpAssets/icon@1.png b/app-template/copay/wpAssets/icon@1.png deleted file mode 100755 index c070f8b26..000000000 Binary files a/app-template/copay/wpAssets/icon@1.png and /dev/null differ diff --git a/app-template/copay/wpAssets/icon@2.png b/app-template/copay/wpAssets/icon@2.png deleted file mode 100644 index 0a696d2ad..000000000 Binary files a/app-template/copay/wpAssets/icon@2.png and /dev/null differ diff --git a/app-template/copay/wpAssets/icon@2x.png b/app-template/copay/wpAssets/icon@2x.png deleted file mode 100644 index 147c21e54..000000000 Binary files a/app-template/copay/wpAssets/icon@2x.png and /dev/null differ diff --git a/app-template/copay/wpImg/ApplicationIcon.png b/app-template/copay/wpImg/ApplicationIcon.png deleted file mode 100755 index 6db598fa9..000000000 Binary files a/app-template/copay/wpImg/ApplicationIcon.png and /dev/null differ diff --git a/app-template/copay/wpImg/Background.png b/app-template/copay/wpImg/Background.png deleted file mode 100755 index 5fd762d99..000000000 Binary files a/app-template/copay/wpImg/Background.png and /dev/null differ diff --git a/app-template/copay/wpImg/SplashScreenImage-original.jpg b/app-template/copay/wpImg/SplashScreenImage-original.jpg deleted file mode 100644 index b25cf2851..000000000 Binary files a/app-template/copay/wpImg/SplashScreenImage-original.jpg and /dev/null differ diff --git a/app-template/copay/wpImg/SplashScreenImage.jpg b/app-template/copay/wpImg/SplashScreenImage.jpg deleted file mode 100644 index 69bda60a2..000000000 Binary files a/app-template/copay/wpImg/SplashScreenImage.jpg and /dev/null differ diff --git a/app-template/package.json b/app-template/package.json index d62d1ff5d..afd2928f4 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -12,16 +12,17 @@ "bitcore" ], "main": "www/index.html", + "title": "*USERVISIBLENAME*", "window": { "title": "*USERVISIBLENAME* - *PURPOSELINE*", - "icon": "./www/img/icons/icon-256.png", + "icon": "www/img/icons/logo.ico", "toolbar": false, "show": true, "visible": true, "resizable": true, "frame": true, "width": 400, - "height": 600, + "height": 650, "position": "center", "fullscreen": false }, @@ -32,25 +33,27 @@ }, "dom_storage_quota": 200, "id": "jid1-x7bV5evAaI1P9Q", - "homepage": "https://github.com/bitpay/copay", + "homepage": "*URL*", "license": "MIT", "repository": { - "url": "git://github.com/bitpay/copay.git", + "url": "*GITHUBREPOURL*", "type": "git" }, "bugs": { - "url": "https://github.com/bitpay/copay/issues" + "url": "*GITHUBREPOBUGS*" }, "dependencies": { "adm-zip": "^0.4.7", "angular": "1.4.6", "angular-mocks": "1.4.10", + "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", - "bitcore-wallet-client": "4.2.1", + "bitauth": "^0.3.2", + "bitcore-wallet-client": "4.3.2", "bower": "^1.7.9", "chai": "^3.5.0", - "cordova": "5.4.1", "cordova-android": "5.1.1", + "cordova-custom-config": "^3.0.5", "cordova-plugin-qrscanner": "^2.3.1", "coveralls": "^2.11.9", "express": "^4.11.2", @@ -65,39 +68,46 @@ "grunt-contrib-uglify": "^2.0.0", "grunt-contrib-watch": "^1.0.0", "grunt-exec": "^1.0.0", - "grunt-karma": "^2.0.0", - "grunt-karma-coveralls": "^2.5.4", "grunt-nw-builder": "^2.0.3", "grunt-sass": "^1.2.0", - "karma": "^0.13.22", - "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^1.0.1", - "karma-cli": "^1.0.0", - "karma-coverage": "^1.0.0", - "karma-mocha": "^1.0.1", - "karma-mocha-reporter": "^2.0.3", - "karma-phantomjs-launcher": "^1.0.0", - "karma-sinon": "^1.0.5", "load-grunt-tasks": "^3.5.0", "mocha": "^2.4.5", - "pbkdf2": "^3.0.4", "phantomjs-prebuilt": "^2.1.7", - "shelljs": "^0.3.0", - "xcode": "^0.8.2" + "shelljs": "^0.3.0" }, "scripts": { - "preinstall": "bower install && npm i fs-extra", - "build": "grunt", - "apply:copay": "cd app-template && node apply.js", - "apply:bitpay-wallet": "cd app-template && node apply.js bitpay-wallet", - "start": "npm run build && node app.js", - "watch": "grunt watch", - "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "git clean -dfx", - "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj", - "start:android": "npm run build && cd cordova && trash project-android && make android && open -a /Applications/Android\\ Studio.app project-android/platforms/android" + "preinstall": "bower install && npm install fs-extra", + "postinstall": "echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", + "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", + "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", + "start:android": "npm run build:www && npm run build:android && npm run run:android", + "watch": "grunt watch", + "build:www": "grunt", + "build:www-release": "grunt prod", + "build:ios": "cordova prepare ios && cordova build ios --debug", + "build:android": "cordova prepare android && cordova build android --debug", + "build:ios-release": "cordova prepare ios && cordova build ios --release", + "build:android-release": "cordova prepare android && cordova build android --release", + "build:desktop": "grunt desktop", + "build:macos": "grunt macos", + "open:ios": "open platforms/ios/*.xcodeproj", + "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", + "final:www": "npm run build:www-release", + "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", + "final:android": "npm run final:www && npm run build:android-release && npm run run:android", + "run:android": "cordova run android --device", + "log:android": "adb logcat | grep chromium", + "apply:copay": "cd app-template && node apply.js copay && cordova prepare", + "apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", + "test": "./node_modules/.bin/grunt test-coveralls", + "clean": "trash platforms && trash plugins && cordova prepare", + "clean-all": "git clean -dfx && npm install" }, "devDependencies": { - "trash-cli": "^1.4.0" + "cordova": "^6.3.1", + "grunt": "^1.0.1", + "ionic": "^2.1.0", + "trash-cli": "^1.4.0", + "lodash": "^4.3.0" } } diff --git a/app-template/setup-win.iss b/app-template/setup-win.iss index d9f6eaa30..762d1434e 100755 --- a/app-template/setup-win.iss +++ b/app-template/setup-win.iss @@ -5,10 +5,11 @@ #define MyAppVersion "*VERSION*" #define MyAppPublisher "BitPay" #define MyAppURL "*URL*" -#define MyAppExeName "*PACKAGENAME.exe" +#define MyAppExeName "*PACKAGENAME*.exe" +#define AppId "*WINDOWSAPPID*" [Setup] -AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} +AppId={#AppId} AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json deleted file mode 100644 index 04adf21e5..000000000 --- a/chrome-app/manifest.json +++ /dev/null @@ -1,24 +0,0 @@ - { - "//":"PLEASE! Do not edit this file directly", - "//":" Modify it at app-template/", - - "manifest_version": 2, - "name": "bitpay", - "description": "Secure Bitcoin Wallet", - "version": "0.14.0", - "permissions": [ - "storage", - "unlimitedStorage", - "notifications", - "videoCapture", - "webview" - ], - "app": { - "background": { - "scripts": ["initial.js"] - } - }, - "icons": { - "128": "img/icon-chrome-128.png" - } -} diff --git a/package.json b/package.json index c690d4989..8f5f3d3db 100644 --- a/package.json +++ b/package.json @@ -1,98 +1,18 @@ { - "author": "BitPay", - "version": "0.14.0", - "keywords": [ - "bitcoin", - "wallet", - "bitpay", - "copay", - "multisignature", - "bitcore" - ], - "homepage": "https://github.com/bitpay/copay", + "name": "distribution-not-selected", + "description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.", + "primary-package-json": "See the tempate in app-template/package.json", + "scripts": { + "postinstall": "npm run apply:copay && npm install", + "apply:copay": "cd app-template && node apply.js copay", + "apply:bitpay": "cd app-template && node apply.js bitpay" + }, + "dependencies": { + "fs-extra": "^0.30.0" + }, "license": "MIT", "repository": { "url": "git://github.com/bitpay/copay.git", "type": "git" - }, - "bugs": { - "url": "https://github.com/bitpay/copay/issues" - }, - "dependencies": { - "adm-zip": "^0.4.7", - "angular": "1.4.6", - "angular-mocks": "1.4.10", - "bezier-easing": "^2.0.3", - "bhttp": "^1.2.1", - "bitcore-wallet-client": "4.3.1", - "bower": "^1.7.9", - "chai": "^3.5.0", - "cordova-android": "5.1.1", - "cordova-custom-config": "^3.0.5", - "cordova-plugin-qrscanner": "^2.3.1", - "coveralls": "^2.11.9", - "express": "^4.11.2", - "fs": "0.0.2", - "fs-extra": "^0.30.0", - "grunt-angular-gettext": "^2.2.3", - "grunt-browserify": "^5.0.0", - "grunt-cli": "^1.2.0", - "grunt-contrib-compress": "^1.3.0", - "grunt-contrib-concat": "^1.0.1", - "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-uglify": "^2.0.0", - "grunt-contrib-watch": "^1.0.0", - "grunt-exec": "^1.0.0", - "grunt-karma": "^2.0.0", - "grunt-karma-coveralls": "^2.5.4", - "grunt-nw-builder": "^2.0.3", - "grunt-sass": "^1.2.0", - "karma": "^0.13.22", - "karma-chai": "^0.1.0", - "karma-chrome-launcher": "^1.0.1", - "karma-cli": "^1.0.0", - "karma-coverage": "^1.0.0", - "karma-mocha": "^1.0.1", - "karma-mocha-reporter": "^2.0.3", - "karma-phantomjs-launcher": "^1.0.0", - "karma-sinon": "^1.0.5", - "load-grunt-tasks": "^3.5.0", - "mocha": "^2.4.5", - "pbkdf2": "^3.0.4", - "phantomjs-prebuilt": "^2.1.7", - "shelljs": "^0.3.0" - }, - "scripts": { - "preinstall": "bower install && npm i fs-extra", - "postinstall": "npm run apply:bitpay && cordova prepare", - "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", - "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", - "start:android": "npm run build:www && npm run build:android && npm run run:android", - "watch": "grunt watch", - "build:www": "grunt", - "build:www-release": "grunt prod", - "build:ios": "cordova prepare ios && cordova build ios --debug", - "build:android": "cordova prepare android && cordova build android --debug", - "build:ios-release": "cordova prepare ios && cordova build ios --release", - "build:android-release": "cordova prepare android && cordova build android --release", - "open:ios": "open platforms/ios/*.xcodeproj", - "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", - "final:www": "npm run clean-all && npm run build:www-release", - "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", - "final:android": "npm run final:www && npm run build:android-release && npm run run:android", - "run:android": "cordova run android --device", - "log:android": "adb logcat | grep chromium", - "apply:copay": "cd app-template && node apply.js copay", - "apply:bitpay": "cd app-template && node apply.js bitpay", - "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "trash platforms && trash plugins && npm run postinstall", - "clean-all": "git clean -dfx && npm install" - }, - "devDependencies": { - "cordova": "^6.3.1", - "grunt": "^1.0.1", - "ionic": "^2.1.0", - "trash-cli": "^1.4.0", - "lodash": "^4.3.0" } } diff --git a/resources/bitpay/android/icon/drawable-hdpi-icon.png b/resources/bitpay/android/icon/drawable-hdpi-icon.png index 5e2c1bba9..3ef114537 100644 Binary files a/resources/bitpay/android/icon/drawable-hdpi-icon.png and b/resources/bitpay/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-ldpi-icon.png b/resources/bitpay/android/icon/drawable-ldpi-icon.png index 04572fa99..ddf74e8d6 100644 Binary files a/resources/bitpay/android/icon/drawable-ldpi-icon.png and b/resources/bitpay/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-mdpi-icon.png b/resources/bitpay/android/icon/drawable-mdpi-icon.png index e36aad45c..27f8f741f 100644 Binary files a/resources/bitpay/android/icon/drawable-mdpi-icon.png and b/resources/bitpay/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xhdpi-icon.png b/resources/bitpay/android/icon/drawable-xhdpi-icon.png index d40ce7d17..cfbc36d36 100644 Binary files a/resources/bitpay/android/icon/drawable-xhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xxhdpi-icon.png b/resources/bitpay/android/icon/drawable-xxhdpi-icon.png index ec5cd1fd2..f39e59957 100644 Binary files a/resources/bitpay/android/icon/drawable-xxhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png b/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png index dc44643c2..9b657ae10 100644 Binary files a/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/bitpay/ios/app-store/feature-graphic-1024.png b/resources/bitpay/ios/app-store/feature-graphic-1024.png new file mode 100644 index 000000000..2d73d59e7 Binary files /dev/null and b/resources/bitpay/ios/app-store/feature-graphic-1024.png differ diff --git a/resources/bitpay/ios/app-store/icon-1024.png b/resources/bitpay/ios/app-store/icon-1024.png new file mode 100644 index 000000000..dcd084afb Binary files /dev/null and b/resources/bitpay/ios/app-store/icon-1024.png differ diff --git a/resources/bitpay/ios/icon/icon-40.png b/resources/bitpay/ios/icon/icon-40.png index f65dfe487..553a27377 100644 Binary files a/resources/bitpay/ios/icon/icon-40.png and b/resources/bitpay/ios/icon/icon-40.png differ diff --git a/resources/bitpay/ios/icon/icon-40@2x.png b/resources/bitpay/ios/icon/icon-40@2x.png index 3ed465c36..bae535524 100644 Binary files a/resources/bitpay/ios/icon/icon-40@2x.png and b/resources/bitpay/ios/icon/icon-40@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-50.png b/resources/bitpay/ios/icon/icon-50.png index e7f790afb..96b4f2662 100644 Binary files a/resources/bitpay/ios/icon/icon-50.png and b/resources/bitpay/ios/icon/icon-50.png differ diff --git a/resources/bitpay/ios/icon/icon-50@2x.png b/resources/bitpay/ios/icon/icon-50@2x.png index 7fa0ea569..4a7e23e13 100644 Binary files a/resources/bitpay/ios/icon/icon-50@2x.png and b/resources/bitpay/ios/icon/icon-50@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-60.png b/resources/bitpay/ios/icon/icon-60.png index d1f077f5e..813581fec 100644 Binary files a/resources/bitpay/ios/icon/icon-60.png and b/resources/bitpay/ios/icon/icon-60.png differ diff --git a/resources/bitpay/ios/icon/icon-60@2x.png b/resources/bitpay/ios/icon/icon-60@2x.png index babf93c85..00bc353fd 100644 Binary files a/resources/bitpay/ios/icon/icon-60@2x.png and b/resources/bitpay/ios/icon/icon-60@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-60@3x.png b/resources/bitpay/ios/icon/icon-60@3x.png index ee1cd9a6d..404e2fc9e 100644 Binary files a/resources/bitpay/ios/icon/icon-60@3x.png and b/resources/bitpay/ios/icon/icon-60@3x.png differ diff --git a/resources/bitpay/ios/icon/icon-72.png b/resources/bitpay/ios/icon/icon-72.png index 5e2c1bba9..3ef114537 100644 Binary files a/resources/bitpay/ios/icon/icon-72.png and b/resources/bitpay/ios/icon/icon-72.png differ diff --git a/resources/bitpay/ios/icon/icon-72@2x.png b/resources/bitpay/ios/icon/icon-72@2x.png index ec5cd1fd2..f39e59957 100644 Binary files a/resources/bitpay/ios/icon/icon-72@2x.png and b/resources/bitpay/ios/icon/icon-72@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-76.png b/resources/bitpay/ios/icon/icon-76.png index 9ecf2ae27..b28169454 100644 Binary files a/resources/bitpay/ios/icon/icon-76.png and b/resources/bitpay/ios/icon/icon-76.png differ diff --git a/resources/bitpay/ios/icon/icon-76@2x.png b/resources/bitpay/ios/icon/icon-76@2x.png index bf6ab2321..184ec5213 100644 Binary files a/resources/bitpay/ios/icon/icon-76@2x.png and b/resources/bitpay/ios/icon/icon-76@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-83.5@2x.png b/resources/bitpay/ios/icon/icon-83.5@2x.png index 8ec494da6..430be7d10 100644 Binary files a/resources/bitpay/ios/icon/icon-83.5@2x.png and b/resources/bitpay/ios/icon/icon-83.5@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-small.png b/resources/bitpay/ios/icon/icon-small.png index 2ce1ef1ae..5be9f2a06 100644 Binary files a/resources/bitpay/ios/icon/icon-small.png and b/resources/bitpay/ios/icon/icon-small.png differ diff --git a/resources/bitpay/ios/icon/icon-small@2x.png b/resources/bitpay/ios/icon/icon-small@2x.png index 3a4a307a6..299a2b5cf 100644 Binary files a/resources/bitpay/ios/icon/icon-small@2x.png and b/resources/bitpay/ios/icon/icon-small@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-small@3x.png b/resources/bitpay/ios/icon/icon-small@3x.png index d4505b846..099c921f4 100644 Binary files a/resources/bitpay/ios/icon/icon-small@3x.png and b/resources/bitpay/ios/icon/icon-small@3x.png differ diff --git a/resources/bitpay/ios/icon/icon.png b/resources/bitpay/ios/icon/icon.png index d4b88b135..347b6bca4 100644 Binary files a/resources/bitpay/ios/icon/icon.png and b/resources/bitpay/ios/icon/icon.png differ diff --git a/resources/bitpay/ios/icon/icon@2x.png b/resources/bitpay/ios/icon/icon@2x.png index 81ffd74dd..2bdc07fa3 100644 Binary files a/resources/bitpay/ios/icon/icon@2x.png and b/resources/bitpay/ios/icon/icon@2x.png differ diff --git a/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png b/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png index 1635d650d..187ff1800 100644 Binary files a/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png and b/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png b/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png index 9771627b2..83b663430 100644 Binary files a/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png and b/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png b/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png index 073ce9357..26b06d14d 100644 Binary files a/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png and b/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png b/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png index ccad7e4b6..8157616e8 100644 Binary files a/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png and b/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png b/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png index a7535fce9..5673d3057 100644 Binary files a/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png and b/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png b/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png index ef57cfdf4..ee6eb9a41 100644 Binary files a/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png and b/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png b/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png index af729753b..57bec2759 100644 Binary files a/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png and b/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png b/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png index 41d8453a1..f78ce0516 100644 Binary files a/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png and b/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png b/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png index b067db17b..2ebebf328 100644 Binary files a/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png and b/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/StoreLogo.scale-100.png b/resources/bitpay/windows/icon/StoreLogo.scale-100.png index e7f790afb..96b4f2662 100644 Binary files a/resources/bitpay/windows/icon/StoreLogo.scale-100.png and b/resources/bitpay/windows/icon/StoreLogo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/StoreLogo.scale-240.png b/resources/bitpay/windows/icon/StoreLogo.scale-240.png index babf93c85..00bc353fd 100644 Binary files a/resources/bitpay/windows/icon/StoreLogo.scale-240.png and b/resources/bitpay/windows/icon/StoreLogo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png b/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png index 8a6dd5ac4..63b58bb24 100644 Binary files a/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png and b/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png b/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png index d5cdfe5fb..5772b37ed 100644 Binary files a/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png and b/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png differ diff --git a/resources/copay/android/app-store/feature-graphic-1024.png b/resources/copay/android/app-store/feature-graphic-1024.png new file mode 100644 index 000000000..2fafddae7 Binary files /dev/null and b/resources/copay/android/app-store/feature-graphic-1024.png differ diff --git a/resources/copay/ios/app-store/icon-1024.png b/resources/copay/ios/app-store/icon-1024.png new file mode 100644 index 000000000..fa9f82a11 Binary files /dev/null and b/resources/copay/ios/app-store/icon-1024.png differ diff --git a/resources/src.sketch b/resources/src.sketch index 5548d3d02..d46ff0573 100644 Binary files a/resources/src.sketch and b/resources/src.sketch differ diff --git a/src/js/app.js b/src/js/app.js index 91466a757..784745fdd 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -12,7 +12,7 @@ var modules = [ 'ngCsv', 'angular-md5', 'bwcModule', - 'pbkdf2Module', + 'bitauthModule', 'copayApp.filters', 'copayApp.services', 'copayApp.controllers', diff --git a/src/js/controllers/activity.js b/src/js/controllers/activity.js index e9c140449..304e5b62b 100644 --- a/src/js/controllers/activity.js +++ b/src/js/controllers/activity.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('activityController', $scope.openTxpModal = txpModalService.open; $scope.fetchingNotifications = true; - $scope.$on("$ionicView.enter", function(event, data){ + $scope.$on("$ionicView.enter", function(event, data) { profileService.getNotifications(50, function(err, n) { if (err) { $log.error(err); @@ -74,7 +74,7 @@ angular.module('copayApp.controllers').controller('activityController', }); walletService.getTxNote(wallet, n.txid, function(err, note) { - if (err) $log.debug('Could not fetch transaction note'); + if (err) $log.warn('Could not fetch transaction note: ' + err); $scope.btx.note = note; }); }); diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js index a87d23bec..236070e59 100644 --- a/src/js/controllers/addressbookView.js +++ b/src/js/controllers/addressbookView.js @@ -2,33 +2,10 @@ angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, $stateParams, lodash, addressbookService, popupService, $ionicHistory) { - $scope.$on("$ionicView.beforeEnter", function(event, data){ - var address = data.stateParams.address; - - if (!address) { - $ionicHistory.back(); - return; - } - - addressbookService.get(address, function(err, obj) { - if (err) { - popupService.showAlert(err); - return; - } - if (!lodash.isObject(obj)) { - var name = obj; - obj = { - 'name': name, - 'address': address, - 'email': '' - }; - } - $scope.addressbookEntry = obj; - $timeout(function() { - $scope.$apply(); - }); - }); - }); + $scope.addressbookEntry = {}; + $scope.addressbookEntry.name = $stateParams.name; + $scope.addressbookEntry.email = $stateParams.email; + $scope.addressbookEntry.address = $stateParams.address; $scope.sendTo = function() { $ionicHistory.removeBackView(); diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index 954c35c24..453cced4e 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('amazonController', $scope.network = amazonService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; var initAmazon = function() { @@ -83,7 +83,7 @@ angular.module('copayApp.controllers').controller('amazonController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initAmazon(); }); }); diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index dd8623cfa..41e56543a 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -17,13 +17,14 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isWallet = data.stateParams.isWallet; - $scope.isCard = data.stateParams.isCard; + $scope.cardId = data.stateParams.cardId; $scope.toAddress = data.stateParams.toAddress; $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; - $scope.showAlternativeAmount = !!$scope.isCard; + $scope.showAlternativeAmount = !!$scope.cardId; + $scope.toColor = data.stateParams.toColor; - if (!$scope.isCard && !$stateParams.toAddress) { + if (!$scope.cardId && !$stateParams.toAddress) { $log.error('Bad params at amount') throw ('bad params'); } @@ -93,7 +94,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.pushDigit = function(digit) { if ($scope.amount && $scope.amount.length >= LENGTH_EXPRESSION_LIMIT) return; if ($scope.amount.indexOf('.') > -1 && digit == '.') return; - if($scope.showAlternativeAmount && $scope.amount.indexOf('.') > -1 && $scope.amount[$scope.amount.indexOf('.') + 2]) return; + if ($scope.showAlternativeAmount && $scope.amount.indexOf('.') > -1 && $scope.amount[$scope.amount.indexOf('.') + 2]) return; $scope.amount = ($scope.amount + digit).replace('..', '.'); checkFontSize(); @@ -189,7 +190,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.finish = function() { var _amount = evaluate(format($scope.amount)); - if ($scope.isCard) { + if ($scope.cardId) { var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount)); var dataSrc = { @@ -199,7 +200,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ ongoingProcess.set('Processing Transaction...', true); $timeout(function() { - bitpayCardService.topUp(dataSrc, function(err, invoiceId) { + bitpayCardService.topUp($scope.cardId, dataSrc, function(err, invoiceId) { if (err) { ongoingProcess.set('Processing Transaction...', false); popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); @@ -215,7 +216,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ var payProUrl = data.paymentUrls.BIP73; $state.transitionTo('tabs.bitpayCard.confirm', { - isCard: $scope.isCard, + cardId: $scope.cardId, toName: $scope.toName, paypro: payProUrl }); diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index f40af13d8..324372323 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -131,6 +131,7 @@ angular.module('copayApp.controllers').controller('backupController', } profileService.setBackupFlag(wallet.credentials.walletId); + profileService.setBackupNeededModalFlag(wallet.credentials.walletId); return cb(); }, 1); }; diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 54a9c09a5..9f0e15c74 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -1,39 +1,19 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) { +angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) { var self = this; - $scope.dateRange = 'last30Days'; + $scope.dateRange = { value: 'last30Days'}; $scope.network = bitpayCardService.getEnvironment(); - bitpayCardService.getCacheData(function(err, data) { - if (err || lodash.isEmpty(data)) return; - $scope.bitpayCardCached = true; - self.bitpayCardTransactionHistory = data.transactions; - self.bitpayCardCurrentBalance = data.balance; - }); - - var processTransactions = function(invoices, history) { - for (var i = 0; i < invoices.length; i++) { - var matched = false; - for (var j = 0; j < history.length; j++) { - if (history[j].description[0].indexOf(invoices[i].id) > -1) { - matched = true; - } - } - if (!matched && ['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) > -1) { - - history.unshift({ - timestamp: invoices[i].invoiceTime, - description: invoices[i].itemDesc, - amount: invoices[i].price, - type: '00611 = Client Funded Deposit', - pending: true, - status: invoices[i].status - }); - } - } - return history; + var updateHistoryFromCache = function(cb) { + bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) { + if (err || lodash.isEmpty(data)) return cb(); + $scope.historyCached = true; + self.bitpayCardTransactionHistory = data.transactions; + self.bitpayCardCurrentBalance = data.balance; + return cb(); + }); }; var setDateRange = function(preset) { @@ -61,120 +41,96 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }; }; + var setGetStarted = function(history, cb) { + if (lodash.isEmpty(history.transactionList)) { + var dateRange = setDateRange('all'); + bitpayCardService.getHistory($scope.cardId, dateRange, function(err, history) { + if (lodash.isEmpty(history.transactionList)) return cb(true); + return cb(false); + }); + } else return cb(false); + }; + this.update = function() { - var dateRange = setDateRange($scope.dateRange); - self.loadingSession = true; - bitpayCardService.isAuthenticated(function(err, bpSession) { - self.loadingSession = false; + var dateRange = setDateRange($scope.dateRange.value); + + $scope.loadingHistory = true; + bitpayCardService.getHistory($scope.cardId, dateRange, function(err, history) { + $scope.loadingHistory = false; + if (err) { + $log.error(err); + $scope.error = gettextCatalog.getString('Could not get transactions'); return; } - self.bitpayCardAuthenticated = bpSession.isAuthenticated; - self.bitpayCardTwoFactorPending = bpSession.twoFactorPending ? true : false; + setGetStarted(history, function(getStarted) { + self.getStarted = getStarted; - if (self.bitpayCardTwoFactorPending) return; + var txs = lodash.clone(history.txs); + for (var i = 0; i < txs.length; i++) { + txs[i] = _getMerchantInfo(txs[i]); + txs[i].icon = _getIconName(txs[i]); + txs[i].desc = _processDescription(txs[i]); + } + self.bitpayCardTransactionHistory = txs; + self.bitpayCardCurrentBalance = history.currentCardBalance; - if (self.bitpayCardAuthenticated) { - $scope.loadingHistory = true; - bitpayCardService.invoiceHistory(function(err, invoices) { - if (err) $log.error(err); - bitpayCardService.transactionHistory(dateRange, function(err, history) { - $scope.loadingHistory = false; - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not get transactions')); - return; - } - - self.bitpayCardTransactionHistory = processTransactions(invoices, history.transactionList); - self.bitpayCardCurrentBalance = history.currentCardBalance; - - var cacheData = { - balance: self.bitpayCardCurrentBalance, - transactions: self.bitpayCardTransactionHistory - }; - bitpayCardService.setCacheData(cacheData, function(err) { - if (err) $log.error(err); - }); + if ($scope.dateRange.value == 'last30Days') { + $log.debug('BitPay Card: store cache history'); + var cacheHistory = { + balance: history.currentCardBalance, + transactions: history.txs + }; + bitpayCardService.setBitpayDebitCardsHistory($scope.cardId, cacheHistory, {}, function(err) { + if (err) $log.error(err); + $scope.historyCached = true; }); + } + $timeout(function() { + $scope.$apply(); }); - } - $timeout(function() { - $scope.$apply(); }); }); }; - this.authenticate = function(email, password) { - - var data = { - emailAddress : email, - hashedPassword : pbkdf2Service.pbkdf2Sync(password, '..............', 200, 64).toString('hex') - }; - - // POST /authenticate - // emailAddress: - // hashedPassword: - self.authenticating = true; - bitpayCardService.authenticate(data, function(err, auth) { - self.authenticating = false; - if (err && err.data && err.data.error && !err.data.error.twoFactorPending) { - popupService.showAlert(gettextCatalog.getString('Error'), err.statusText || err.data.error || 'Authentiation error'); - return; - } - - self.update(); - $timeout(function() { - $scope.$apply(); - }, 100); - }); - }; - - this.authenticate2FA = function(twoFactorCode) { - - var data = { - twoFactorCode : twoFactorCode - }; - - self.authenticating = true; - bitpayCardService.authenticate2FA(data, function(err, auth) { - self.authenticating = false; - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Authentiation error')); - return; - } - - self.update(); - $timeout(function() { - $scope.$apply(); - }, 100); - }); - }; - - this.getMerchantInfo = function(tx) { + var _getMerchantInfo = function(tx) { var bpTranCodes = bitpayCardService.bpTranCodes; lodash.keys(bpTranCodes).forEach(function(code) { if (tx.type.indexOf(code) === 0) { lodash.assign(tx, bpTranCodes[code]); } }); + return tx; }; - this.getIconName = function(tx) { + var _getIconName = function(tx) { var icon = tx.mcc || tx.category || null; if (!icon) return 'default'; return bitpayCardService.iconMap[icon]; }; - this.processDescription = function(tx) { + var _processDescription = function(tx) { if (lodash.isArray(tx.description)) { return tx.description[0]; } return tx.description; }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ - self.update(); + $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.cardId = data.stateParams.id; + if (!$scope.cardId) { + var msg = gettextCatalog.getString('Bad param'); + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home'); + popupService.showAlert(null, msg); + } else { + updateHistoryFromCache(function() { + self.update(); + }); + } }); }); diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js new file mode 100644 index 000000000..5d1c6429c --- /dev/null +++ b/src/js/controllers/bitpayCardIntro.js @@ -0,0 +1,72 @@ +'use strict'; +angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) { + + var checkOtp = function(obj, cb) { + if (obj.otp) { + var msg = gettextCatalog.getString('Enter Two Factor for BitPay Card'); + popupService.showPrompt(null, msg, null, function(res) { + cb(res); + }); + } else { + cb(); + } + }; + + $scope.$on("$ionicView.beforeEnter", function(event, data) { + + if (data.stateParams && data.stateParams.secret) { + var obj = { + secret: data.stateParams.secret, + email: data.stateParams.email, + otp: data.stateParams.otp + }; + checkOtp(obj, function(otp) { + obj.otp = otp; + bitpayCardService.bitAuthPair(obj, function(err, data) { + if (err) { + popupService.showAlert(null, err); + return; + } + var title = gettextCatalog.getString('Add BitPay Card?'); + var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email}); + var ok = gettextCatalog.getString('Add cards'); + var cancel = gettextCatalog.getString('Go back'); + popupService.showConfirm(title, msg, ok, cancel, function(res) { + if (res) { + // Set flag for nextStep + storageService.setNextStep('BitpayCard', true, function(err) {}); + // Save data + bitpayCardService.setBitpayDebitCards(data, function(err) { + if (err) return; + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home').then(function() { + if (data.cards[0]) { + $state.transitionTo('tabs.bitpayCard', {id: data.cards[0].id}); + } + }); + }); + } + }); + }); + }); + } else { + bitpayCardService.getCredentials(function(err, credentials) { + if (err) popupService.showAlert(null, err); + else $log.info('BitPay Debit Card Credentials: Ok.'); + }); + } + }); + + $scope.orderBitPayCard = function() { + var url = 'https://bitpay.com/visa/'; + externalLinkService.open(url); + }; + + $scope.connectBitPayCard = function() { + var url = 'https://bitpay.com/visa/login'; + externalLinkService.open(url); + }; +}); + diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 903e2a682..ca2aede91 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -16,12 +16,14 @@ angular.module('copayApp.controllers').controller('buyAmazonController', $log.debug('Wallet changed: ' + w.name); }); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; this.confirm = function() { - var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.formData.fiat}); + var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', { + amount: $scope.formData.fiat + }); var ok = gettextCatalog.getString('Buy'); popupService.showConfirm(null, message, ok, null, function(res) { if (res) self.createTx(); @@ -209,8 +211,10 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }; - $scope.$on("$ionicView.enter", function(event, data){ - $scope.formData = { fiat: null }; + $scope.$on("$ionicView.enter", function(event, data) { + $scope.formData = { + fiat: null + }; $scope.wallets = profileService.getWallets({ network: network, onlyComplete: true diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index c3b38f587..80179dad2 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isWallet = data.stateParams.isWallet; - $scope.isCard = data.stateParams.isCard; + $scope.cardId = data.stateParams.cardId; $scope.toAmount = data.stateParams.toAmount; $scope.toAddress = data.stateParams.toAddress; $scope.toName = data.stateParams.toName; @@ -226,6 +226,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( var setSendError = function(msg) { $scope.sendStatus = ''; + $timeout(function() { + $scope.$apply(); + }); popupService.showAlert(gettextCatalog.getString('Error at confirm:'), msg); }; @@ -377,11 +380,24 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; $scope.onSuccessConfirm = function() { + var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; + var fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; + $ionicHistory.nextViewOptions({ disableAnimate: true }); + $ionicHistory.removeBackView(); $scope.sendStatus = ''; - $state.go('tabs.send'); + + if (fromBitPayCard) { + $timeout(function() { + $state.transitionTo('tabs.bitpayCard', { + id: $stateParams.cardId + }); + }, 100); + } else { + $state.go('tabs.send'); + } }; function publishAndSign(wallet, txp, onSendStatusChange) { diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index a5a90766b..4c0b8c773 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -15,6 +15,45 @@ angular.module('copayApp.controllers').controller('exportController', }); }; + function getPassword(cb) { + if ($scope.password) return cb(null, $scope.password); + + walletService.prepare(wallet, function(err, password) { + if (err) return cb(err); + $scope.password = password; + return cb(null, password); + }); + }; + + $scope.generateQrCode = function() { + if ($scope.formData.exportWalletInfo || !walletService.isEncrypted(wallet)) { + $scope.file.value = false; + } + + getPassword(function(err, password) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; + } + + walletService.getEncodedWalletInfo(wallet, password, function(err, code) { + if (err) return cb(err); + + if (!code) + $scope.formData.supported = false; + else { + $scope.formData.supported = true; + $scope.formData.exportWalletInfo = code; + } + + $scope.file.value = false; + $timeout(function() { + $scope.$apply(); + }); + }); + }); + }; + var init = function() { $scope.formData = {}; $scope.isEncrypted = wallet.isPrivKeyEncrypted(); @@ -24,24 +63,6 @@ angular.module('copayApp.controllers').controller('exportController', $scope.showAdvanced = false; $scope.wallet = wallet; $scope.canSign = wallet.canSign(); - - walletService.getEncodedWalletInfo(wallet, function(err, code) { - if (err || !code) { - $log.warn(err); - return $ionicHistory.goBack(); - } - - if (!code) - $scope.formData.supported = false; - else { - $scope.formData.supported = true; - $scope.formData.exportWalletInfo = code; - } - - $timeout(function() { - $scope.$apply(); - }, 1); - }); }; /* @@ -67,23 +88,31 @@ angular.module('copayApp.controllers').controller('exportController', }; $scope.downloadWalletBackup = function() { - $scope.getAddressbook(function(err, localAddressBook) { + getPassword(function(err, password) { if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + popupService.showAlert(gettextCatalog.getString('Error'), err); return; } - var opts = { - noSign: $scope.formData.noSignEnabled, - addressBook: localAddressBook - }; - backupService.walletDownload($scope.formData.password, opts, function(err) { + $scope.getAddressbook(function(err, localAddressBook) { if (err) { popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); return; } - $ionicHistory.removeBackView(); - $state.go('tabs.home'); + var opts = { + noSign: $scope.formData.noSignEnabled, + addressBook: localAddressBook, + password: password + }; + + backupService.walletDownload($scope.formData.password, opts, function(err) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + return; + } + $ionicHistory.removeBackView(); + $state.go('tabs.home'); + }); }); }); }; @@ -104,21 +133,29 @@ angular.module('copayApp.controllers').controller('exportController', }; $scope.getBackup = function(cb) { - $scope.getAddressbook(function(err, localAddressBook) { + getPassword(function(err, password) { if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); - return cb(null); + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; } - var opts = { - noSign: $scope.formData.noSignEnabled, - addressBook: localAddressBook - }; - var ew = backupService.walletExport($scope.formData.password, opts); - if (!ew) { - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); - } - return cb(ew); + $scope.getAddressbook(function(err, localAddressBook) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + return cb(null); + } + var opts = { + noSign: $scope.formData.noSignEnabled, + addressBook: localAddressBook, + password: password + }; + + var ew = backupService.walletExport($scope.formData.password, opts); + if (!ew) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export')); + } + return cb(ew); + }); }); }; @@ -171,6 +208,11 @@ angular.module('copayApp.controllers').controller('exportController', $scope.$on("$ionicView.beforeEnter", function(event, data) { init(); + $scope.file = { + value: true + }; + $scope.formData.exportWalletInfo = null; + $scope.password = null; }); }); diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js index 9f701e984..f3fc9af6c 100644 --- a/src/js/controllers/glidera.js +++ b/src/js/controllers/glidera.js @@ -5,12 +5,12 @@ angular.module('copayApp.controllers').controller('glideraController', $scope.network = glideraService.getEnvironment(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url) { + externalLinkService.open(url); }; var initGlidera = function(accessToken) { - $scope.token = null; + $scope.token = accessToken; $scope.permissions = null; $scope.email = null; $scope.personalInfo = null; @@ -27,7 +27,9 @@ angular.module('copayApp.controllers').controller('glideraController', } $scope.token = glidera.token; $scope.permissions = glidera.permissions; - $scope.update({fullUpdate: true}); + $scope.update({ + fullUpdate: true + }); }); }; @@ -113,7 +115,7 @@ angular.module('copayApp.controllers').controller('glideraController', }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { initGlidera(); }); diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js index 9cadccb10..ffe54b713 100644 --- a/src/js/controllers/modals/amazonCardDetails.js +++ b/src/js/controllers/modals/amazonCardDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog) { +angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $log, $timeout, bwcError, amazonService, lodash, ongoingProcess, popupService, gettextCatalog, externalLinkService) { $scope.cancelGiftCard = function() { ongoingProcess.set('Canceling gift card...', true); @@ -62,4 +62,8 @@ angular.module('copayApp.controllers').controller('amazonCardDetailsController', $scope.amazonCardDetailsModal.hide(); }; + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); + }; + }); diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index adb7ddda6..83908e36e 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio function updateMemo() { walletService.getTxNote(wallet, $scope.btx.txid, function(err, note) { if (err) { - $log.warn('Could not fetch transaction note ' + err); + $log.warn('Could not fetch transaction note: ' + err); return; } @@ -139,8 +139,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.getShortNetworkName = function() { diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 853383dd1..1cd3fa2b6 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -96,16 +96,20 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }; $scope.reject = function(txp) { - $scope.loading = true; + var title = gettextCatalog.getString('Warning!'); + var msg = gettextCatalog.getString('Are you sure you want to reject this transaction?'); + popupService.showConfirm(title, msg, null, null, function(res) { + if (res) { + $scope.loading = true; - walletService.reject($scope.wallet, $scope.tx, function(err, txpr) { - if (err) - return setError(err, gettextCatalog.getString('Could not reject payment')); + walletService.reject($scope.wallet, $scope.tx, function(err, txpr) { + if (err) + return setError(err, gettextCatalog.getString('Could not reject payment')); - $scope.close(); + $scope.close(); + }); + } }); - - }; $scope.remove = function() { diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index 0c4773c04..f06b8ca20 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -15,8 +15,8 @@ angular.module('copayApp.controllers').controller('termsController', function($s }); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/preferencesAbout.js b/src/js/controllers/preferencesAbout.js index 64f10de54..e8369abd7 100644 --- a/src/js/controllers/preferencesAbout.js +++ b/src/js/controllers/preferencesAbout.js @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesAbout', $scope.commitHash = $window.commitHash; $scope.name = $window.appConfig.gitHubRepoName; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index 2abf6a8c4..0fb74d228 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -1,17 +1,17 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBitpayCardController', - function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) { + function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService, gettextCatalog) { - $scope.logout = function() { - var title = 'Are you sure you would like to log out of your Bitpay Card account?'; - popupService.showConfirm(title, null, null, null, function(res) { - if (res) logout(); + $scope.remove = function() { + var msg = gettextCatalog.getString('Are you sure you would like to remove your BitPay Card account from this device?'); + popupService.showConfirm(null, msg, null, null, function(res) { + if (res) remove(); }); }; - var logout = function() { - bitpayCardService.logout(function() { + var remove = function() { + bitpayCardService.remove(function() { $ionicHistory.removeBackView(); $timeout(function() { $state.go('tabs.home'); @@ -19,4 +19,11 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll }); }; + $scope.$on("$ionicView.beforeEnter", function(event, data) { + bitpayCardService.getBitpayDebitCards(function(err, data) { + if (err) return; + $scope.bitpayCards = data.cards; + }); + }); + }); diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 60c1a4c2d..9c30fda2e 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -21,7 +21,8 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro if (err) { popupService.showAlert(gettextCatalog.getString('Error'), err.message || err); } else { - $ionicHistory.removeBackView(); + $ionicHistory.clearHistory(); + $ionicHistory.clearCache(); $state.go('tabs.home'); } }); diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js index e4a339ce5..c865c67dc 100644 --- a/src/js/controllers/preferencesEmail.js +++ b/src/js/controllers/preferencesEmail.js @@ -2,23 +2,25 @@ angular.module('copayApp.controllers').controller('preferencesEmailController', function($scope, $ionicHistory, $stateParams, gettextCatalog, profileService, walletService, configService) { - var wallet = profileService.getWallet($stateParams.walletId); - var walletId = wallet.credentials.walletId; + $scope.wallet = profileService.getWallet($stateParams.walletId); + var walletId = $scope.wallet.credentials.walletId; var config = configService.getSync(); config.emailFor = config.emailFor || {}; + $scope.emailForExist = config.emailFor && config.emailFor[walletId]; $scope.email = { value: config.emailFor && config.emailFor[walletId] }; - $scope.save = function() { + + $scope.save = function(val) { var opts = { emailFor: {} }; - opts.emailFor[walletId] = $scope.email.value; + opts.emailFor[walletId] = val; - walletService.updateRemotePreferences(wallet, { - email: $scope.email.value, + walletService.updateRemotePreferences($scope.wallet, { + email: val, }, function(err) { if (err) $log.warn(err); configService.set(opts, function(err) { diff --git a/src/js/controllers/preferencesGlidera.js b/src/js/controllers/preferencesGlidera.js index 2559f129a..ce1945b02 100644 --- a/src/js/controllers/preferencesGlidera.js +++ b/src/js/controllers/preferencesGlidera.js @@ -52,7 +52,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController' $scope.$on("$ionicView.enter", function(event, data){ $scope.network = glideraService.getEnvironment(); - $scope.token = accessToken; + $scope.token = null; $scope.permissions = null; $scope.email = null; $scope.personalInfo = null; diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js index 9fb6f3c7e..68366fd15 100644 --- a/src/js/controllers/preferencesHistory.js +++ b/src/js/controllers/preferencesHistory.js @@ -28,8 +28,14 @@ angular.module('copayApp.controllers').controller('preferencesHistory', $log.debug('Generating CSV from History'); getHistory(function(err, txs) { if (err || lodash.isEmpty(txs)) { - if (err) $log.warn('Failed to generate CSV:', err); - else $log.warn('Failed to generate CSV: no transactions'); + if (err) { + $log.warn('Failed to generate CSV:', err); + $scope.err = err; + } + else { + $log.warn('Failed to generate CSV: no transactions'); + $scope.err = 'no transactions'; + } if (cb) return cb(err); return; } diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index c4fa9b106..0773f68af 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -6,12 +6,12 @@ angular.module('copayApp.controllers').controller('tabHomeController', var listeners = []; var notifications = []; $scope.externalServices = {}; - $scope.bitpayCardEnabled = true; // TODO $scope.openTxpModal = txpModalService.open; $scope.version = $window.version; $scope.name = $window.appConfig.nameCase; $scope.homeTip = $stateParams.fromOnboarding; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); @@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', if (!$scope.homeTip) { storageService.getHomeTipAccepted(function(error, value) { - $scope.homeTip = (value == 'false') ? false : true; + $scope.homeTip = (value == 'accepted') ? false : true; }); } @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); walletService.getTxNote(wallet, n.txid, function(err, note) { - if (err) $log.debug(gettextCatalog.getString('Could not fetch transaction note')); + if (err) $log.warn('Could not fetch transaction note: ' + err); $scope.btx.note = note; }); }); @@ -175,7 +175,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; $scope.hideHomeTip = function() { - storageService.setHomeTipAccepted(false, function(error, value) { + storageService.setHomeTipAccepted('accepted', function() { $scope.homeTip = false; $timeout(function() { $scope.$apply(); @@ -203,19 +203,32 @@ angular.module('copayApp.controllers').controller('tabHomeController', }; var bitpayCardCache = function() { - bitpayCardService.getCacheData(function(err, data) { - if (err ||  lodash.isEmpty(data)) return; - $scope.bitpayCard = data; + bitpayCardService.getBitpayDebitCards(function(err, data) { + if (err) return; + if (lodash.isEmpty(data)) { + $scope.bitpayCards = null; + return; + } + $scope.bitpayCards = data.cards; + }); + bitpayCardService.getBitpayDebitCardsHistory(null, function(err, data) { + if (err) return; + if (lodash.isEmpty(data)) { + $scope.cardsHistory = null; + return; + } + $scope.cardsHistory = data; }); }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); updateAllWallets(); }; $scope.$on("$ionicView.enter", function(event, data) { - $scope.bitpayCard = null; nextStep(); updateAllWallets(); diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index f2cd4472a..733297650 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; - + var showModalTimeout; $scope.shareAddress = function(addr) { if ($scope.generatingAddress) return; @@ -14,16 +14,21 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }; $scope.setAddress = function(forceNew) { - if ($scope.generatingAddress || !$scope.wallet.isComplete()) return; - + if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; $scope.addr = null; $scope.generatingAddress = true; walletService.getAddress($scope.wallet, forceNew, function(err, addr) { $scope.generatingAddress = false; if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); $scope.addr = addr; - if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal(); - $scope.$apply(); + if ($scope.wallet.showBackupNeededModal) { + showModalTimeout = $timeout(function() { + $scope.openBackupNeededModal(); + }, 2000); + } + $timeout(function() { + $scope.$apply(); + }, 10); }); }; @@ -74,6 +79,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $log.debug('No wallet provided'); return; } + if (wallet == $scope.wallet) { + $log.debug('No change in wallet'); + return; + } $scope.wallet = wallet; $log.debug('Wallet changed: ' + wallet.name); $timeout(function() { @@ -81,6 +90,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }, 100); }); + $scope.$on("$ionicView.leave", function(event, data) { + $timeout.cancel(showModalTimeout); + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.wallets = profileService.getWallets(); }); diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 55e64b115..0ea31438b 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, $rootScope) { var originalList; var CONTACTS_SHOW_LIMIT; @@ -102,23 +102,28 @@ angular.module('copayApp.controllers').controller('tabSendController', function( isWallet: item.isWallet, toAddress: addr, toName: item.name, - toEmail: item.email + toEmail: item.email, + toColor: item.color }) }); }); }; - var updateHasFunds = function() { - $scope.hasFunds = null; + + if ($rootScope.everHasFunds) { + $scope.hasFunds = true; + return; + } + + $scope.hasFunds = false; var wallets = profileService.getWallets({ onlyComplete: true, }); if (!wallets || !wallets.length) { - $scope.hasFunds = false; - $timeout(function() { + return $timeout(function() { $scope.$apply(); }); } @@ -132,11 +137,12 @@ angular.module('copayApp.controllers').controller('tabSendController', function( return; } - if (status.availableBalanceSat) { + if (status.availableBalanceSat > 0) { $scope.hasFunds = true; + $rootScope.everHasFunds = true; } + if (index == wallets.length) { - $scope.hasFunds = $scope.hasFunds || false; $timeout(function() { $scope.$apply(); }); diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 2981745ca..773a6a5f3 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -24,8 +24,8 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.wallets = profileService.getWallets(); }; - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.$on("$ionicView.beforeEnter", function(event, data) { diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index 3e93df45d..f3397286b 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro if (!incomingData.redir(data)) { popupService.showAlert(null, gettextCatalog.getString('Invalid data')); } - } + }; $scope.setScanFn = function(scanFn) { $scope.scan = function() { @@ -22,32 +22,8 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro }, 1); }; - var hideTabsViews = [ - 'tabs.send.amount', - 'tabs.send.confirm', - 'tabs.send.addressbook', - 'tabs.addressbook', - 'tabs.addressbook.add', - 'tabs.addressbook.view', - 'tabs.preferences.backupWarning', - 'tabs.preferences.backup', - 'tabs.receive.backupWarning', - 'tabs.receive.backup', - 'tabs.bitpayCard.amount', - 'tabs.bitpayCard.confirm', - ]; - - $rootScope.$on('$ionicView.beforeEnter', function() { - - $rootScope.hideTabs = false; - - var currentState = $state.current.name; - - lodash.each(hideTabsViews, function(view) { - if (currentState === view) { - $rootScope.hideTabs = true; - } - }); + $scope.$on("$ionicView.beforeEnter", function(event, data){ + $rootScope.hideTabs = ''; }); }); diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index ef9f409c1..ecbf9651e 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.completeTxHistory = []; $scope.openTxpModal = txpModalService.open; $scope.isCordova = platformInfo.isCordova; + $scope.isAndroid = platformInfo.isAndroid; $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); @@ -161,7 +162,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; $scope.onRefresh = function() { - $scope.$broadcast('scroll.refreshComplete'); + $timeout(function() { + $scope.$broadcast('scroll.refreshComplete'); + }, 300); $scope.updateAll(true); }; diff --git a/src/js/directives/hideTabs.js b/src/js/directives/hideTabs.js new file mode 100644 index 000000000..47a59a9e0 --- /dev/null +++ b/src/js/directives/hideTabs.js @@ -0,0 +1,15 @@ +'use strict'; +angular.module('copayApp.directives') +.directive('hideTabs', function($rootScope, $timeout) { + return { + restrict: 'A', + link: function($scope, $el) { + $scope.$on("$ionicView.beforeEnter", function(event, data){ + $timeout(function() { + $rootScope.hideTabs = 'tabs-item-hide'; + $rootScope.$apply(); + }); + }); + } + }; +}); diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js index ef0ef46ba..e856aa468 100644 --- a/src/js/directives/incomingDataMenu.js +++ b/src/js/directives/incomingDataMenu.js @@ -21,16 +21,14 @@ angular.module('copayApp.directives') }; scope.sendPaymentToAddress = function(bitcoinAddress) { scope.showMenu = false; - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.amount', {toAddress: bitcoinAddress}); - }, 100); + }); }; scope.addToAddressBook = function(bitcoinAddress) { scope.showMenu = false; $timeout(function() { - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.addressbook', {addressbookEntry: bitcoinAddress}); }); }, 100); diff --git a/src/js/routes.js b/src/js/routes.js index ec6471742..2c45c13c6 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -251,7 +251,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('tabs.send.amount', { - url: '/amount/:isWallet/:toAddress/:toName/:toEmail', + url: '/amount/:isWallet/:toAddress/:toName/:toEmail/:toColor', views: { 'tab-send@tabs': { controller: 'amountController', @@ -571,7 +571,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.addressbook.view', { - url: '/view/:address', + url: '/view/:address/:email/:name', views: { 'tab-settings@tabs': { templateUrl: 'views/addressbook.view.html', @@ -846,8 +846,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.bitpayCard', { - url: '/bitpay-card', + .state('tabs.bitpayCardIntro', { + url: '/bitpay-card-intro/:secret/:email/:otp', + views: { + 'tab-home@tabs': { + controller: 'bitpayCardIntroController', + templateUrl: 'views/bitpayCardIntro.html' + } + } + }) + .state('tabs.bitpayCard', { + url: '/bitpay-card/:id', views: { 'tab-home@tabs': { controller: 'bitpayCardController', @@ -857,7 +866,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.bitpayCard.amount', { - url: '/amount/:isCard/:toName', + url: '/amount/:cardId/:toName', views: { 'tab-home@tabs': { controller: 'amountController', @@ -866,7 +875,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.bitpayCard.confirm', { - url: '/confirm/:isCard/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', + url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', views: { 'tab-home@tabs': { controller: 'confirmController', @@ -878,12 +887,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/preferences', views: { 'tab-home@tabs': { + controller: 'preferencesBitpayCardController', templateUrl: 'views/preferencesBitpayCard.html' } } }); }) - .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService) { + .run(function($rootScope, $state, $location, $log, $timeout, $ionicHistory, $ionicPlatform, $window, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService) { uxLanguage.init(); openURLService.init(); @@ -895,7 +905,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr screen.lockOrientation('portrait'); if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) { - cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true); + cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false); cordova.plugins.Keyboard.disableScroll(true); } @@ -970,8 +980,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (lodash.isEmpty(profileService.getWallets())) { $log.debug('No wallets and no disclaimer... redirecting'); $state.go('onboarding.welcome'); - } - else { + } else { $log.debug('Display disclaimer... redirecting'); $state.go('onboarding.disclaimer', { resume: true @@ -980,8 +989,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } else { throw new Error(err); // TODO } - } - else { + } else { profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); @@ -997,7 +1005,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr type: "menubar" }); try { - nativeMenuBar.createMacBuiltin("Copay"); + nativeMenuBar.createMacBuiltin($window.appConfig.nameCase); } catch (e) { $log.debug('This is not OSX'); } diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index c49bc5ffa..1d83d9ffb 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -1,195 +1,239 @@ 'use strict'; -angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService) { +angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo, moment) { var root = {}; - var credentials = {}; - var bpSession = {}; + var BITPAY_CARD_NETWORK = 'livenet'; + var BITPAY_CARD_API_URL = BITPAY_CARD_NETWORK == 'livenet' ? 'https://bitpay.com' : 'https://test.bitpay.com'; - var _setCredentials = function() { - /* - * Development: 'testnet' - * Production: 'livenet' - */ - credentials.NETWORK = 'livenet'; - if (credentials.NETWORK == 'testnet') { - credentials.BITPAY_API_URL = 'https://test.bitpay.com'; - } - else { - credentials.BITPAY_API_URL = 'https://bitpay.com'; - }; + var _getCredentials = function(cb) { + var pubkey, sin, isNew; + storageService.getBitpayCardCredentials(BITPAY_CARD_NETWORK, function(err, data) { + if (err) return cb(err); + if (lodash.isString(data)) { + data = JSON.parse(data); + } + var credentials = data || {}; + if (lodash.isEmpty(credentials) || (credentials && !credentials.priv)) { + isNew = true; + credentials = bitauthService.generateSin(); + } + try { + pubkey = bitauthService.getPublicKeyFromPrivateKey(credentials.priv); + sin = bitauthService.getSinFromPublicKey(pubkey); + if (isNew) + storageService.setBitpayCardCredentials(BITPAY_CARD_NETWORK, JSON.stringify(credentials), function(err) {}); + } + catch (e) { + $log.error(e); + return cb(e); + }; + return cb(null, credentials); + }); }; var _setError = function(msg, e) { $log.error(msg); - return e; + var error = e.data ? e.data.error : msg; + return error; }; - var _getUser = function(cb) { - _setCredentials(); - storageService.getBitpayCard(credentials.NETWORK, function(err, user) { - if (err) return cb(err); - if (lodash.isString(user)) { - user = JSON.parse(user); - } - return cb(null, user); - }); - }; - - var _setUser = function(user, cb) { - _setCredentials(); - user = JSON.stringify(user); - storageService.setBitpayCard(credentials.NETWORK, user, function(err) { - return cb(err); - }); - // Show pending task from the UI - storageService.setNextStep('BitpayCard', true, function(err) {}); - }; - - var _getSession = function(cb) { - _setCredentials(); - $http({ + var _get = function(endpoint) { + return { method: 'GET', - url: credentials.BITPAY_API_URL + '/visa-api/session', + url: BITPAY_CARD_API_URL + endpoint, headers: { 'content-type': 'application/json' } - }).then(function(data) { - $log.info('BitPay Get Session: SUCCESS'); - bpSession = data.data.data; - return cb(null, bpSession); + }; + }; + + var _post = function(endpoint, json, credentials) { + var dataToSign = BITPAY_CARD_API_URL + endpoint + JSON.stringify(json); + var signedData = bitauthService.sign(dataToSign, credentials.priv); + + return { + method: 'POST', + url: BITPAY_CARD_API_URL + endpoint, + headers: { + 'content-type': 'application/json', + 'x-identity': credentials.pub, + 'x-signature': signedData + }, + data: json + }; + }; + + var _postAuth = function(endpoint, json, credentials) { + json['params'].signature = bitauthService.sign(JSON.stringify(json.params), credentials.priv); + json['params'].pubkey = credentials.pub; + json['params'] = JSON.stringify(json.params); + + var ret = { + method: 'POST', + url: BITPAY_CARD_API_URL + endpoint, + headers: { + 'content-type': 'application/json' + }, + data: json + }; + + $log.debug('post auth:' + JSON.stringify(ret)); + return ret; + }; + + var _afterBitAuthSuccess = function(token, obj, credentials, cb) { + var json = { + method: 'getDebitCards' + }; + // Get Debit Cards + $http(_post('/api/v2/' + token, json, credentials)).then(function(data) { + if (data && data.data.error) return cb(data.data.error); + $log.info('BitPay Get Debit Cards: SUCCESS'); + return cb(data.data.error, {token: token, cards: data.data.data, email: obj.email}); }, function(data) { - return cb(_setError('BitPay Card Error: Get Session', data)); + return cb(_setError('BitPay Card Error: Get Debit Cards', data)); }); }; - var _getBitPay = function(endpoint) { - _setCredentials(); - return { - method: 'GET', - url: credentials.BITPAY_API_URL + endpoint, - headers: { - 'content-type': 'application/json', - 'x-csrf-token': bpSession.csrfToken + var _processTransactions = function(invoices, history) { + invoices = invoices || []; + for (var i = 0; i < invoices.length; i++) { + var matched = false; + for (var j = 0; j < history.length; j++) { + if (history[j].description[0].indexOf(invoices[i].id) > -1) { + matched = true; + } } - }; - }; + var isInvoiceLessThanOneDayOld = moment() < moment(new Date(invoices[i].invoiceTime)).add(1, 'day'); + if (!matched && isInvoiceLessThanOneDayOld) { + var isInvoiceUnderpaid = invoices[i].exceptionStatus === 'paidPartial'; - var _postBitPay = function(endpoint, data) { - _setCredentials(); - return { - method: 'POST', - url: credentials.BITPAY_API_URL + endpoint, - headers: { - 'Content-Type': 'application/json', - 'x-csrf-token': bpSession.csrfToken - }, - data: data - }; + if(['paid', 'confirmed', 'complete'].indexOf(invoices[i].status) >= 0 + || (invoices[i].status === 'invalid' || isInvoiceUnderpaid)) { + + history.unshift({ + timestamp: new Date(invoices[i].invoiceTime), + description: invoices[i].itemDesc, + amount: invoices[i].price, + type: '00611 = Client Funded Deposit', + pending: true, + status: invoices[i].status + }); + } + } + } + return history; }; root.getEnvironment = function() { - _setCredentials(); - return credentials.NETWORK; + return BITPAY_CARD_NETWORK; }; - root.topUp = function(data, cb) { - var dataSrc = { - amount: data.amount, - currency: data.currency - }; - $http(_postBitPay('/visa-api/topUp', dataSrc)).then(function(data) { - $log.info('BitPay TopUp: SUCCESS'); - return cb(null, data.data.data.invoice); - }, function(data) { - return cb(_setError('BitPay Card Error: TopUp', data)); + root.getCredentials = function(cb) { + _getCredentials(function(err, credentials) { + return cb(err, credentials); }); }; - root.transactionHistory = function(dateRange, cb) { - var params; - if (!dateRange.startDate) { - params = ''; - } else { - params = '/?startDate=' + dateRange.startDate + '&endDate=' + dateRange.endDate; + root.bitAuthPair = function(obj, cb) { + var deviceName = 'Unknow device'; + if (platformInfo.isNW) { + deviceName = require('os').platform(); + } else if (platformInfo.isCordova) { + deviceName = device.model; } - $http(_getBitPay('/visa-api/transactionHistory' + params)).then(function(data) { - $log.info('BitPay Get Transaction History: SUCCESS'); - return cb(null, data.data.data); - }, function(data) { - return cb(_setError('BitPay Card Error: Get Transaction History', data)); + var json = { + method: 'createToken', + params: { + secret: obj.secret, + version: 2, + deviceName: deviceName, + code: obj.otp + } + }; + _getCredentials(function(err, credentials) { + if (err) return cb(err); + $http(_postAuth('/api/v2/', json, credentials)).then(function(data) { + if (data && data.data.error) return cb(data.data.error); + $log.info('BitPay Card BitAuth Create Token: SUCCESS'); + _afterBitAuthSuccess(data.data.data, obj, credentials, cb); + }, function(data) { + return cb(_setError('BitPay Card Error Create Token: BitAuth', data)); + }); }); }; - root.invoiceHistory = function(cb) { - $http(_getBitPay('/visa-api/invoiceHistory')).then(function(data) { - $log.info('BitPay Get Invoice History: SUCCESS'); - return cb(null, data.data.data); - }, function(data) { - return cb(_setError('BitPay Card Error: Get Invoice History', data)); + root.getHistory = function(cardId, params, cb) { + var invoices, transactions; + params = params || {}; + var json = { + method: 'getInvoiceHistory', + params: JSON.stringify(params) + }; + _getCredentials(function(err, credentials) { + if (err) return cb(err); + root.getBitpayDebitCards(function(err, data) { + if (err) return cb(err); + var card = lodash.find(data.cards, {id : cardId}); + if (!card) return cb(_setError('Not card found')); + // Get invoices + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay Get Invoices: SUCCESS'); + invoices = data.data.data || []; + if (lodash.isEmpty(invoices)) $log.info('No invoices'); + json = { + method: 'getTransactionHistory', + params: JSON.stringify(params) + }; + // Get transactions list + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay Get Transactions: SUCCESS'); + transactions = data.data.data || {}; + transactions['txs'] = _processTransactions(invoices, transactions.transactionList); + return cb(data.data.error, transactions); + }, function(data) { + return cb(_setError('BitPay Card Error: Get Transactions', data)); + }); + }, function(data) { + return cb(_setError('BitPay Card Error: Get Invoices', data)); + }); + }); + }); + }; + + root.topUp = function(cardId, params, cb) { + params = params || {}; + var json = { + method: 'generateTopUpInvoice', + params: JSON.stringify(params) + }; + _getCredentials(function(err, credentials) { + if (err) return cb(err); + root.getBitpayDebitCards(function(err, data) { + if (err) return cb(err); + var card = lodash.find(data.cards, {id : cardId}); + if (!card) return cb(_setError('Not card found')); + $http(_post('/api/v2/' + card.token, json, credentials)).then(function(data) { + $log.info('BitPay TopUp: SUCCESS'); + return cb(data.data.error, data.data.data.invoice); + }, function(data) { + return cb(_setError('BitPay Card Error: TopUp', data)); + }); + }); }); }; root.getInvoice = function(id, cb) { - $http(_getBitPay('/invoices/' + id)).then(function(data) { + $http(_get('/invoices/' + id)).then(function(data) { $log.info('BitPay Get Invoice: SUCCESS'); - return cb(null, data.data.data); + return cb(data.data.error, data.data.data); }, function(data) { return cb(_setError('BitPay Card Error: Get Invoice', data)); }); }; - root.authenticate = function(userData, cb) { - _setUser(userData, function(err) { - $http(_postBitPay('/visa-api/authenticate', userData)).then(function(data) { - $log.info('BitPay Authenticate: SUCCESS'); - _getSession(function(err, session) { - if (err) return cb(err); - return cb(null, session); - }); - }, function(data) { - if (data && data.data && data.data.error.twoFactorPending) { - $log.error('BitPay Card needs 2FA Authentication'); - _getSession(function(err, session) { - if (err) return cb(err); - return cb(null, session); - }); - } else { - return cb(data); - } - }); - }); - }; - - root.authenticate2FA = function(userData, cb) { - $http(_postBitPay('/visa-api/verify-two-factor', userData)).then(function(data) { - $log.info('BitPay 2FA: SUCCESS'); - return cb(null, data); - }, function(data) { - return cb(_setError('BitPay Card Error: 2FA', data)); - }); - }; - - root.isAuthenticated = function(cb) { - _getSession(function(err, session) { - if (err) return cb(err); - if (!session.isAuthenticated) { - _getUser(function(err, user) { - if (err) return cb(err); - if (lodash.isEmpty(user)) return cb(null, session); - root.authenticate(user, function(err, session) { - if (err) return cb(err); - return cb(null, session); - }); - }); - } else { - return cb(null, session); - } - }); - }; - - root.getCacheData = function(cb) { - _setCredentials(); - storageService.getBitpayCardCache(credentials.NETWORK, function(err, data) { + root.getBitpayDebitCards = function(cb) { + storageService.getBitpayDebitCards(BITPAY_CARD_NETWORK, function(err, data) { if (err) return cb(err); if (lodash.isString(data)) { data = JSON.parse(data); @@ -199,32 +243,54 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; - root.setCacheData = function(data, cb) { - _setCredentials(); + root.setBitpayDebitCards = function(data, cb) { data = JSON.stringify(data); - storageService.setBitpayCardCache(credentials.NETWORK, data, function(err) { + storageService.setBitpayDebitCards(BITPAY_CARD_NETWORK, data, function(err) { if (err) return cb(err); return cb(); }); }; - root.removeCacheData = function(cb) { - _setCredentials(); - storageService.removeBitpayCardCache(credentials.NETWORK, function(err) { + root.getBitpayDebitCardsHistory = function(cardId, cb) { + storageService.getBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err, data) { if (err) return cb(err); - return cb(); + if (lodash.isString(data)) { + data = JSON.parse(data); + } + data = data || {}; + if (cardId) data = data[cardId]; + return cb(null, data); }); }; - root.logout = function(cb) { - _setCredentials(); - root.removeCacheData(function() {}); - storageService.removeBitpayCard(credentials.NETWORK, function(err) { - $http(_getBitPay('/visa-api/logout')).then(function(data) { - $log.info('BitPay Logout: SUCCESS'); - return cb(data); - }, function(data) { - return cb(_setError('BitPay Card Error: Logout ', data)); + root.setBitpayDebitCardsHistory = function(cardId, data, opts, cb) { + storageService.getBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err, oldData) { + if (lodash.isString(oldData)) { + oldData = JSON.parse(oldData); + } + if (lodash.isString(data)) { + data = JSON.parse(data); + } + var inv = oldData || {}; + inv[cardId] = data; + if (opts && opts.remove) { + delete(inv[cardId]); + } + inv = JSON.stringify(inv); + + storageService.setBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, inv, function(err) { + return cb(err); + }); + }); + }; + + root.remove = function(cb) { + storageService.removeBitpayCardCredentials(BITPAY_CARD_NETWORK, function(err) { + storageService.removeBitpayDebitCards(BITPAY_CARD_NETWORK, function(err) { + storageService.removeBitpayDebitCardsHistory(BITPAY_CARD_NETWORK, function(err) { + $log.info('BitPay Debit Cards Removed: SUCCESS'); + return cb(); + }); }); }); }; diff --git a/src/js/services/externalLinkService.js b/src/js/services/externalLinkService.js index 190206dfd..a9818d9df 100644 --- a/src/js/services/externalLinkService.js +++ b/src/js/services/externalLinkService.js @@ -1,8 +1,14 @@ 'use strict'; -angular.module('copayApp.services').service('externalLinkService', function($window, $timeout, $log, platformInfo, nodeWebkitService) { +angular.module('copayApp.services').service('externalLinkService', function(platformInfo, nodeWebkitService, popupService, gettextCatalog, $window, $log, $timeout) { - this.open = function(url, target) { + var _restoreHandleOpenURL = function(old) { + $timeout(function() { + $window.handleOpenURL = old; + }, 500); + }; + + this.open = function(url, optIn, title, message, okText, cancelText) { var old = $window.handleOpenURL; $window.handleOpenURL = function(url) { @@ -10,15 +16,24 @@ angular.module('copayApp.services').service('externalLinkService', function($win $log.debug('Skip: ' + url); }; - $timeout(function() { - $window.handleOpenURL = old; - }, 500); - if (platformInfo.isNW) { nodeWebkitService.openExternalLink(url); + _restoreHandleOpenURL(old); } else { - target = target || '_blank'; - var ref = window.open(url, target, 'location=no'); + if (optIn) { + var message = gettextCatalog.getString(message), + title = gettextCatalog.getString(title), + okText = gettextCatalog.getString(okText), + cancelText = gettextCatalog.getString(cancelText), + openBrowser = function(res) { + if (res) window.open(url, '_system'); + _restoreHandleOpenURL(old); + }; + popupService.showConfirm(title, message, okText, cancelText, openBrowser); + } else { + window.open(url, '_system'); + _restoreHandleOpenURL(old); + } } }; diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 8b66fff24..8785c0145 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog, scannerService, $rootScope) { +angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog, scannerService, $rootScope, lodash) { var root = {}; @@ -14,7 +14,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // }, 2000); root.redir = function(data) { - $log.debug('Processing incoming data:' +data); + $log.debug('Processing incoming data: ' + data); function sanitizeUri(data) { // Fixes when a region uses comma to separate decimals @@ -32,17 +32,25 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni return newUri; } + function getParameterByName(name, url) { + if (!url) return; + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), + results = regex.exec(url); + if (!results) return null; + if (!results[2]) return ''; + return decodeURIComponent(results[2].replace(/\+/g, " ")); + } + // data extensions for Payment Protocol with non-backwards-compatible request if ((/^bitcoin:\?r=[\w+]/).exec(data)) { data = decodeURIComponent(data.replace('bitcoin:?r=', '')); - $state.go('tabs.send'); - $timeout(function() { + $state.go('tabs.send').then(function() { $state.transitionTo('tabs.send.confirm', {paypro: data}); - }, 100); + }); return true; } - data = sanitizeUri(data); data = '1F1tAaz5x1HUXrCNLbtMDqcw6o5GNn4xqX'; @@ -56,6 +64,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni var amount = parsed.amount ? parsed.amount : ''; $state.go('tabs.send'); + // Timeout is required to enable the "Back" button $timeout(function() { if (parsed.r) { $state.transitionTo('tabs.send.confirm', {paypro: parsed.r}); @@ -66,7 +75,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni $state.transitionTo('tabs.send.amount', {toAddress: addr}); } } - }, 100); + }); return true; // Plain URL @@ -91,40 +100,41 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni }); // Plain Address } else if (bitcore.Address.isValid(data, 'livenet')) { - return root.showMenu({data: data, type: 'bitcoinAddress'}); - $state.go('tabs.send'); - $timeout(function() { - $state.transitionTo('tabs.send.amount', {toAddress: data}); - }, 100); - return true; + root.showMenu({data: data, type: 'bitcoinAddress'}); } else if (bitcore.Address.isValid(data, 'testnet')) { - return root.showMenu({data: data, type: 'bitcoinAddress'}); - $state.go('tabs.send'); - $timeout(function() { - $state.transitionTo('tabs.send.amount', {toAddress: data}); - }, 100); - return true; - + root.showMenu({data: data, type: 'bitcoinAddress'}); // Protocol } else if (data && data.indexOf($window.appConfig.name + '://glidera')==0) { return $state.go('uriglidera', {url: data}); } else if (data && data.indexOf($window.appConfig.name + '://coinbase')==0) { return $state.go('uricoinbase', {url: data}); + // BitPayCard Authentication + } else if (data && data.indexOf($window.appConfig.name + '://')==0) { + var secret = getParameterByName('secret', data); + var email = getParameterByName('email', data); + var otp = getParameterByName('otp', data); + $state.go('tabs.home').then(function() { + $state.transitionTo('tabs.bitpayCardIntro', { + secret: secret, + email: email, + otp: otp + }); + }); + return true; + // Join } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - $state.go('tabs.home'); - $timeout(function() { + $state.go('tabs.home').then(function() { $state.transitionTo('tabs.add.join', {url: data}); - }, 100); + }); return true; // Old join } else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - $state.go('tabs.home'); - $timeout(function() { + $state.go('tabs.home').then(function() { $state.transitionTo('tabs.add.join', {url: data}); - }, 100); + }); return true; } diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index 486039a3b..48e09e47b 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -77,7 +77,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni this.showAlert = function(title, msg, cb, buttonName) { var message = (msg && msg.message) ? msg.message : msg; - $log.warn(title + ": " + message); + $log.warn(title ? (title + ': ' + message) : message); if (isCordova) _cordovaAlert(title, message, cb, buttonName); @@ -97,7 +97,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni */ this.showConfirm = function(title, message, okText, cancelText, cb) { - $log.warn(title + ": " + message); + $log.warn(title ? (title + ': ' + message) : message); if (isCordova) _cordovaConfirm(title, message, okText, cancelText, cb); @@ -116,7 +116,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni */ this.showPrompt = function(title, message, opts, cb) { - $log.warn(title + ": " + message); + $log.warn(title ? (title + ': ' + message) : message); if (isCordova && !opts.forceHTMLPrompt) _cordovaPrompt(title, message, opts, cb); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 659f9dd8f..de2c29e98 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -134,8 +134,7 @@ angular.module('copayApp.services') if (n.type == "NewBlock" && n.data.network == "testnet") { throttledBwsEvent(n, wallet); - } - else newBwsEvent(n, wallet); + } else newBwsEvent(n, wallet); }); wallet.on('walletCompleted', function() { @@ -600,6 +599,7 @@ angular.module('copayApp.services') var walletClient = bwcService.getClient(null, opts); $log.debug('Importing Wallet:', opts); + try { walletClient.import(str, { compressed: opts.compressed, @@ -611,6 +611,12 @@ angular.module('copayApp.services') str = JSON.parse(str); + if (str.xPrivKey && str.xPrivKeyEncrypted) { + $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version'); + delete str.xPrivKeyEncrypted; + delete str.mnemonicEncrypted; + } + var addressBook = str.addressBook || {}; addAndBindWalletClient(walletClient, { diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index a0e0f6503..60f01a3c8 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -325,28 +325,40 @@ angular.module('copayApp.services') storage.remove('coinbaseTxs-' + network, cb); }; - root.setBitpayCard = function(network, data, cb) { - storage.set('bitpayCard-' + network, data, cb); + root.setBitpayDebitCardsHistory = function(network, data, cb) { + storage.set('bitpayDebitCardsHistory-' + network, data, cb); }; - root.getBitpayCard = function(network, cb) { - storage.get('bitpayCard-' + network, cb); + root.getBitpayDebitCardsHistory = function(network, cb) { + storage.get('bitpayDebitCardsHistory-' + network, cb); }; - root.removeBitpayCard = function(network, cb) { - storage.remove('bitpayCard-' + network, cb); + root.removeBitpayDebitCardsHistory = function(network, cb) { + storage.remove('bitpayDebitCardsHistory-' + network, cb); }; - root.setBitpayCardCache = function(network, data, cb) { - storage.set('bitpayCardCache-' + network, data, cb); + root.setBitpayDebitCards = function(network, data, cb) { + storage.set('bitpayDebitCards-' + network, data, cb); }; - root.getBitpayCardCache = function(network, cb) { - storage.get('bitpayCardCache-' + network, cb); + root.getBitpayDebitCards = function(network, cb) { + storage.get('bitpayDebitCards-' + network, cb); }; - root.removeBitpayCardCache = function(network, cb) { - storage.remove('bitpayCardCache-' + network, cb); + root.removeBitpayDebitCards = function(network, cb) { + storage.remove('bitpayDebitCards-' + network, cb); + }; + + root.setBitpayCardCredentials = function(network, data, cb) { + storage.set('bitpayCardCredentials-' + network, data, cb); + }; + + root.getBitpayCardCredentials = function(network, cb) { + storage.get('bitpayCardCredentials-' + network, cb); + }; + + root.removeBitpayCardCredentials = function(network, cb) { + storage.remove('bitpayCardCredentials-' + network, cb); }; root.removeAllWalletData = function(walletId, cb) { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 216df83d8..dae6d3ccc 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -507,7 +507,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim wallet.getTxNote({ txid: txid }, function(err, note) { - if (err || !note) return cb(true); + if (err) return cb(err); return cb(null, note); }); }; @@ -869,9 +869,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (!root.isEncrypted(wallet)) return cb(); askPassword(wallet.name, gettext('Enter Spending Password'), function(password) { - if (!password) return cb('no password'); - if (!wallet.checkPassword(password)) return cb('wrong password'); - + if (!password) return cb('No password'); + if (!wallet.checkPassword(password)) return cb('Wrong password'); return cb(null, password); }); @@ -990,8 +989,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; - root.getEncodedWalletInfo = function(wallet, cb) { - + root.getEncodedWalletInfo = function(wallet, password, cb) { var derivationPath = wallet.credentials.getBaseAddressDerivationPath(); var encodingType = { mnemonic: 1, @@ -1002,25 +1000,23 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim // not supported yet if (wallet.credentials.derivationStrategy != 'BIP44' || !wallet.canSign()) - return null; + return cb(gettextCatalog.getString('Exporting via QR not supported for this wallet')); - root.getKeys(wallet, function(err, keys) { - if (err || !keys) return cb(err); + var keys = root.getKeysWithPassword(wallet, password); - if (keys.mnemonic) { - info = { - type: encodingType.mnemonic, - data: keys.mnemonic, - } - } else { - info = { - type: encodingType.xpriv, - data: keys.xPrivKey - } + if (keys.mnemonic) { + info = { + type: encodingType.mnemonic, + data: keys.mnemonic, } - return cb(null, info.type + '|' + info.data + '|' + wallet.credentials.network.toLowerCase() + '|' + derivationPath + '|' + (wallet.credentials.mnemonicHasPassphrase)); + } else { + info = { + type: encodingType.xpriv, + data: keys.xPrivKey + } + } - }); + return cb(null, info.type + '|' + info.data + '|' + wallet.credentials.network.toLowerCase() + '|' + derivationPath + '|' + (wallet.credentials.mnemonicHasPassphrase)); }; root.setTouchId = function(wallet, enabled, cb) { @@ -1055,6 +1051,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; + root.getKeysWithPassword = function(wallet, password) { + try { + return wallet.getKeys(password); + } catch (e) {} + } + root.getViewStatus = function(wallet, txp) { var status = txp.status; var type; diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index f411f087e..7f35657e2 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -37,6 +37,7 @@ click-to-accept { } &.button-primary, &.button-secondary, + &.button-light, &.button-assertive { &.button-standard { @extend %button-standard; diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 4ef73e65a..d1ebde783 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -408,6 +408,14 @@ input[type=file] { line-height: 0px; } +.w100p { + width: 100%; +} + +.pointer { + cursor: pointer; +} + .text-right { text-align: right; } diff --git a/src/sass/variables.scss b/src/sass/variables.scss index 59f4fbd1a..1988be508 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -25,7 +25,7 @@ $font-size-small: 12px; $font-family-sans-serif: $roboto; $font-family-light-sans-serif: $roboto-light; -$button-border-radius: $visible-radius; +$button-border-radius: $subtle-radius; $button-height: 52px; $button-padding: 16px; diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index 5e355544a..dc5c62a96 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -11,6 +11,14 @@ left: 8px; font-size: 24px; } + .big-icon-svg { + left:5px; + & > .bg{ + width:30px; + height:30px; + box-shadow: none; + } + } font-size: 11px; padding-left: 48px; } diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 5d7b045b6..e1714eaad 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -1,14 +1,27 @@ #bitpayCard { + .bar-header { + border: 0; + background: #1e3186; + .title, .button { + color: #fff; + } + .button { + background-color: transparent; + } + } .amount { width: 100%; text-align: center; padding: 2rem 1rem 1.5rem 1rem; - min-height: 140px; + height: 140px; border-color: #172565; background-color: #1e3186; background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); color: #fff; } + .wallet-details-wallet-info { + bottom: 5px; + } strong { line-height: 100%; } diff --git a/src/sass/views/bitpayCardIntro.scss b/src/sass/views/bitpayCardIntro.scss new file mode 100644 index 000000000..3ce232b0f --- /dev/null +++ b/src/sass/views/bitpayCardIntro.scss @@ -0,0 +1,70 @@ +#bitpayCard-intro { + .slider-pager .slider-pager-page { + color: #fff; + } + .cta-button{ + text-align: center; + position: absolute; + bottom: 55px; + padding: 0 1.5rem; + width: 100%; + } + background: rgba(30, 49, 134, 1); + background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1))); + background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + color: #fff; + height: 100%; + .bar.bar-header { + background: rgb(30, 49, 134); + color: #fff; + button { + color: #fff; + } + .secondary-buttons { + button { + color: rgba(255, 255, 255, .5); + } + } + } + .bar.bar-stable{ + border-color: transparent; + border:none; + } + .button-transparent{ + background: none !important; + } + .button-translucent{ + background: rgba(215, 215, 215, 0.1) + } + .button-primary{ + background: rgb(100, 124, 232) !important; + color:#fff; + } + .light-blue{ + color:rgb(100, 124, 232); + } + .text-white{ + color: #ffffff; + } + ion-content { + background: url(../img/onboarding-welcome-bg.png); + background-position: top center; + background-size: contain; + background-repeat: repeat-x; + height: 100%; + .scroll{ + height: 100%; + } + color: #fff; + p { + text-align: center; + margin: 40px 20px; + font-size: 1.2rem; + color: rgba(255, 255, 255, .5); + } + } +} diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index c5d216e8f..dc3ec8817 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -107,12 +107,8 @@ i { color: grey; position: inherit; - left: 25px; - vertical-align: super; - padding-right: 10px; - border-right: 1px solid; - border-color: grey; - font-size: 20px; + padding: 0 10px; + float: right; } contact { margin-left: 15px; diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index cf2626745..eb855a9ca 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -1,15 +1,14 @@ .wallets { .slides { .swiper-container { - width: 75% !important; + width: 85% !important; overflow: visible; } .card { - padding: .7rem; - padding-left: .25rem; - padding-right: .25rem; - border-radius: .25rem; max-width: 350px; + box-shadow:$subtle-box-shadow; + padding:0; + border-radius: 6px; @media (min-width: 500px) { & { width: 350px; @@ -17,6 +16,23 @@ margin: 1.5rem auto 0; } } + .item{ + padding: calc(100vh - 99vh) calc(100vw - 93vw) calc(100vh - 97vh) calc(100vw - 95vw); + i{left:auto;} + span{ + clear:both; + width: 100%; + display: inline-block; + &.wallet-name{ + margin-top:10px; + margin-bottom:5px; + font-size:13px; + } + } + .big-icon-svg{ + & > .bg{padding:.3rem;width: 40px;height:40px;} + } + } } .swiper-slide { width: 100% !important; @@ -37,13 +53,14 @@ } &.swiper-slide-prev, &.swiper-slide-next { - opacity: .2; + opacity: .3; + transform: scale(.8); } &.swiper-slide-prev { - left: -5%; + left: 10vw; } &.swiper-slide-next { - left: 4%; + left: -10vw; } } } diff --git a/src/sass/views/integrations/glidera.scss b/src/sass/views/integrations/glidera.scss new file mode 100644 index 000000000..73ffef029 --- /dev/null +++ b/src/sass/views/integrations/glidera.scss @@ -0,0 +1,14 @@ +#glidera { + .glidera-lead { + margin: 1rem; + color: $mid-gray; + font-size: 18px; + text-align: center; + } + .disclosure { + color: $mid-gray; + font-size: 12px; + text-align: left; + margin: 1rem; + } +} diff --git a/src/sass/views/onboarding/terms-of-use.scss b/src/sass/views/onboarding/terms-of-use.scss index d769dae6a..f7aa7493a 100644 --- a/src/sass/views/onboarding/terms-of-use.scss +++ b/src/sass/views/onboarding/terms-of-use.scss @@ -11,6 +11,7 @@ ion-content{ padding-top: 1.5rem; color: $dark-gray; + margin-bottom: 210px; p { padding: 0 2.5%; margin: 2rem auto; @@ -25,6 +26,9 @@ position: absolute; bottom: 0; width: 100%; + .text-center { + text-align: center; + } .checkbox input:before, .checkbox .checkbox-icon:before { border-radius: 50% !important; @@ -54,15 +58,13 @@ width: 10%; position: relative; padding-right: 0; - top: 25px; + padding-left: 50px; .item-content { white-space: normal; } } p { color: rgb(58, 58, 58); - float: left; - width: 80%; } .checkbox input:before, .checkbox .checkbox-icon:before { diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index 2956d8ea3..30df5f1d0 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -32,7 +32,7 @@ } .item-sub { &:first-child:before { - width: 100% + width: 95% } &:before { display: block; diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index e38b8be30..d63300fa0 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -10,8 +10,30 @@ .border-top{ border-top:1px solid rgb(228,228,228); } + .scroll{height:100%;} #address { background: #fff; + height: calc(100vh - 33vh); + display: flex; + align-items: center; + justify-content: center; + position: relative; + flex-flow: column; + @media(max-height: 600px){ + height: calc(100vh - 36vh); + } + article{ + flex:1; + width: 100%; + } + #bit-address{ + position: absolute; + bottom:0; + width:100%; + #next-address{ + color:$light-gray; + } + } .incomplete { padding: 50px; height: 352px; @@ -42,20 +64,47 @@ display: inline-block; font-size: .7rem; } - &-gen-address {} } .qr { - padding: 50px 0 20px 0; + padding: calc(100vh - 85vh) 0 calc(100vh - 96vh); + @media(max-height: 700px){ + padding: calc(100vh - 90vh) 0 calc(100vh - 96vh); + } + div{ + display: flex; + justify-content: center; + align-items: center; + } + } + #qr-options{ + display: flex; + flex-direction: row; + justify-content: center; + align-content: center; + .item{ + i{left:25px;} + } } .backup { background-color: orange; color: #fff; position: absolute; - top: 5px; + top: 0; i { padding: 10px; } } + @media (max-height: 600px){ + &{ + .qr{ + padding:6vh 0 0; + div{ + transform: scale(.7); + } + } + #bit-address{position: realtive;} + } + } } #wallets { position: relative; @@ -66,10 +115,12 @@ height: 0; border-style: solid; border-width: 0 20px 20px 20px; - border-color: transparent transparent #f5f5f5 transparent; + border-color: transparent transparent rgb(242,242,242) transparent; top: -9px; position: absolute; - left: 45%; + left: 50%; + transform: translateX(-50%); + z-index: 2; } } #first-time-tip { @@ -112,6 +163,40 @@ border-right: 1px solid rgb(228, 228, 228); padding-right: 10px; } + .wallets{ + position: relative; + height: calc(100vh - 83vh); + .slides { + .swiper-container{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + @media (max-height: 600px){ + &{ + transform: translate(-50%, -58%); + } + } + } + } + } + // @media(min-width: 700px) and (min-height: 700px){ + // .wallets{display: none;} + // #address{ + // height:90vh; + // width:75%; + // .qr{ + // height: 70%; + // div{ + // transform: scale(1.5); + // } + // } + // #bit-address{ + // height: 10%; + // padding: calc(100vh - 99vh); + // } + // } + // } } @keyframes fadeIn { diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 5c93e1c02..f28f773bf 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -17,6 +17,10 @@ color: $mid-gray; margin: 1rem 0; } + &-description-disabled { + color: cadetblue; + text-decoration: none; + } .setting-title, .setting-value { display: block; overflow: hidden; diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index f40a42a05..c85824ba3 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -12,6 +12,7 @@ @import "walletDetails"; @import "advancedSettings"; @import "bitpayCard"; +@import "bitpayCardIntro"; @import "address-book"; @import "wallet-backup-phrase"; @import "zero-state"; @@ -30,4 +31,5 @@ @import "includes/txp-details"; @import "includes/tx-status"; @import "includes/walletSelector"; -@import "integrations/coinbase.scss"; +@import "integrations/coinbase"; +@import "integrations/glidera"; diff --git a/test/controllers/backup.test.js b/test/controllers/backup.test.js deleted file mode 100644 index 29c2a3f71..000000000 --- a/test/controllers/backup.test.js +++ /dev/null @@ -1,49 +0,0 @@ -describe('Backup Controller', function() { - - var walletService; - - describe('Incomplete wallet', function() { - beforeEach(function(done) { - mocks.init(FIXTURES, 'backupController', { - loadProfile: PROFILE.incomplete2of2, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should be defined', function() { - should.exist(ctrl); - }); - - it('should set the mnemonic incomplete wallets', function(done) { - scope.initFlow(); - should.exist(scope.mnemonicWords); - scope.mnemonicWords.should.deep.equal('dizzy cycle skirt decrease exotic fork sure mixture hair vapor copper hero'.split(' ')); - done(); - }); - }); - - describe('Complete 1-1 wallet', function() { - beforeEach(function(done) { - mocks.init(FIXTURES, 'backupController', { - loadProfile: PROFILE.testnet1of1, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should not set the mnemonic for complete wallets', function() { - scope.initFlow(); - scope.mnemonicWords.should.deep.equal('cheese where alarm job conduct donkey license pave congress pepper fence current'.split(' ')); - }); - - it('should set main wallet info', function(done) { - scope.walletName.should.equal('kk'); - done(); - }); - }); -}); diff --git a/test/controllers/copayers.test.js b/test/controllers/copayers.test.js deleted file mode 100644 index 40cbbea57..000000000 --- a/test/controllers/copayers.test.js +++ /dev/null @@ -1,18 +0,0 @@ -describe('copayers', function() { - - var walletService; - var fixtures = {}; - - - beforeEach(function(done){ - mocks.init(fixtures, 'copayersController', {}, done); - }) - - afterEach(function(done){ - mocks.clear({}, done); - }) - - it('should be defined', function() { - should.exist(ctrl); - }); -}); diff --git a/test/controllers/create.test.js b/test/controllers/create.test.js deleted file mode 100644 index 8010fde85..000000000 --- a/test/controllers/create.test.js +++ /dev/null @@ -1,185 +0,0 @@ -describe('createController', function() { - var fixtures = { - - // Store prefs - '1eda3e702196b8d5d82fae129249bc79f0d5be2f5309a4e39855e7eb4ad31428': {}, - '31f5deeef4cf7fd8fc67297179232e8e4590532960454ad958009132fef3daae': {}, - // createWallet 1-1 - // - 'b665ad8991c67f8f7e8ffb7e86c3b930fd3ff56c68eb6fd441bf374559cfe59c': { - "walletId": "63d910e8-3e1b-4aac-97e9-aa0299a74c2c" - }, - 'd5cc6adebc752c154998f1c96af2b24e21e52dbd7c07008c333af03b905ffb85': { - "copayerId": "a9dcee10fe9c611300e6c7926ece20780f89b9a98baaa342928038b5503ed929", - "wallet": { - "version": "1.0.0", - "createdOn": 1465385318, - "id": "63d910e8-3e1b-4aac-97e9-aa0299a74c2c", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"70OA+k4+xTPxim+QSdDtA5/Cf055\"}", - "m": 1, - "n": 1, - "singleAddress": false, - "status": "complete", - "publicKeyRing": [{ - "xPubKey": "xpub6DRjAgkh3vGTWDcEmDp4TPwy48Nu8yrp6swCEdCCLL615CgnZon7r3vXYr8LYibMLJh5DriGSito1FRBwVoBkjD1ZWG4dmgiC935wLj3nQC", - "requestPubKey": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458" - }], - "copayers": [{ - "version": 2, - "createdOn": 1465385318, - "xPubKey": "xpub6DRjAgkh3vGTWDcEmDp4TPwy48Nu8yrp6swCEdCCLL615CgnZon7r3vXYr8LYibMLJh5DriGSito1FRBwVoBkjD1ZWG4dmgiC935wLj3nQC", - "id": "a9dcee10fe9c611300e6c7926ece20780f89b9a98baaa342928038b5503ed929", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wwZd+2LQgYR6cA==\"}", - "requestPubKey": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458", - "signature": "3044022042e069126a42f1b9b498c315a825ef4fc9f4214156442651e4fef5c7678245e702205936045d7b22baa36ba36ef827cc3e5d542d57d9a1afb3a54080d12f0b95c67e", - "requestPubKeys": [{ - "key": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458", - "signature": "3044022042e069126a42f1b9b498c315a825ef4fc9f4214156442651e4fef5c7678245e702205936045d7b22baa36ba36ef827cc3e5d542d57d9a1afb3a54080d12f0b95c67e" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"1Wjf2KvFkd5k0ypiiSNkSVXk7zdBOiTeCrwzPBI7fMQ/VqXUzrSB6gMGs9jISr+MvCaL1GJIXjaMnlQZNMR0lx/Pd1c6R/nKGBdHjKh0mlI=\"}" - }], - "pubKey": "026d95bb5cc2a30c19e22379ae78b4757aaa2dd0ccbd15a1db054fb50cb98ed361", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2PKH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - } - }, - //createWallet 2-2 - '5a1d11ebc2a011f018b049de6b5c6b990cdc8e280644103f95a995321dbf0248': { - "walletId": "2f50f598-7550-4e54-8032-15aa892309fb" - }, - // join - '58f2f3a6f11cd7dee9a75e026e3ba570c09b952bfea05f596fdb48e6ea323f21': { - "copayerId": "3d4eb9b439eee1b2b73cf792eda52e420f4665109c7234a50cf3cdbf296ea8fb", - "wallet": { - "version": "1.0.0", - "createdOn": 1465347188, - "id": "2f50f598-7550-4e54-8032-15aa892309fb", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"70OA+k4+xTPxim+QSdDtA5/Cf055\"}", - "m": 2, - "n": 2, - "singleAddress": false, - "status": "pending", - "publicKeyRing": [], - "copayers": [{ - "version": 2, - "createdOn": 1465347188, - "xPubKey": "xpub6CkPnrzSUp9qzBVM3hpo4oS2JKC6GJq6brE1yW59QrnhDpvkFLakpxUGRGXH62fiXb5S2VbnD4h2DLoCMfSkwfonbNgNYTJw9Ko5SqWEqCR", - "id": "3d4eb9b439eee1b2b73cf792eda52e420f4665109c7234a50cf3cdbf296ea8fb", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wwZd+2LQgYR6cA==\"}", - "requestPubKey": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72", - "signature": "30440220521623cf346f667658c00f1dea113407f23cecf02932c7dcb4b8bf35f1836b7a02202c77b8e4260942f4e13a58faae1f92e1130bae1157492056347e66741150eb2c", - "requestPubKeys": [{ - "key": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72", - "signature": "30440220521623cf346f667658c00f1dea113407f23cecf02932c7dcb4b8bf35f1836b7a02202c77b8e4260942f4e13a58faae1f92e1130bae1157492056347e66741150eb2c" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"YJqN/LtkCY0cOB235RtbGEAY7wKGT0cUUpAvUeLkAUKz3/1axsYZtnG+PU0jHtwQvgmKNLkNcXNR60K+tyRpU0TG1z8pyx4gKwwD3Dt7KzA=\"}" - }], - "pubKey": "026d95bb5cc2a30c19e22379ae78b4757aaa2dd0ccbd15a1db054fb50cb98ed361", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2SH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - } - }, - - }; // TODO: Read from file - - beforeEach(function(done) { - mocks.init(fixtures, 'createController', {}, done); - }) - - - afterEach(function(done) { - mocks.clear({}, done); - }); - - - it('should be defined', function() { - should.exist(ctrl); - }); - - it('should create a 1-1 wallet from mnemonic', function(done) { - var fakeForm = {}; - - // FROM DATA - scope.seedSource = { - id: 'set' - }; - scope.requiredCopayers = 1; - scope.totalCopayers = 1 - scope.walletName = 'A test wallet'; - scope.isTestnet = false; - scope.bwsurl = null; - scope.isSingleAddress = false; - scope.privateKey = 'legal winner thank year wave sausage worth useful legal winner thank yellow'; - scope._walletPrivKey = 'Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy'; - - ctrl.setSeedSource(); - ctrl.create(fakeForm); - - should.not.exist(ctrl.error); - mocks.go.walletHome.calledOnce.should.equal(true); - // - // check resulting profile - storageService.getProfile(function(err, profile) { - should.not.exist(err); - var c = profile.credentials[0]; - c.network.should.equal('livenet'); - // from test vectors from https://dcpos.github.io/bip39/ - c.xPrivKey.should.equal('xprv9s21ZrQH143K2x4gnzRB1eZDq92Uuvy9CXbvgQGdvykXZ9mkkot6LBjzDpgaAfvzkuxJe9JKJXQ38VoPutxvACA5MsyoBs5UyQ4HZKGshGs'); - done(); - }); - }); - - - it('should create an incomplete 2-2 wallet from mnemonic', function(done) { - var fakeForm = {}; - - // FROM DATA - scope.seedSource = { - id: 'set' - }; - scope.requiredCopayers = 2; - scope.totalCopayers = 2; - scope.walletName = 'A test wallet'; - scope.isTestnet = false; - scope.bwsurl = null; - scope.privateKey = 'dizzy cycle skirt decrease exotic fork sure mixture hair vapor copper hero'; - scope._walletPrivKey = 'Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy'; - - ctrl.setSeedSource(); - ctrl.create(fakeForm); - - should.not.exist(ctrl.error); - mocks.go.walletHome.calledOnce.should.equal(true, 'Go Wallet Home Called'); - - // check resulting profile - storageService.getProfile(function(err, profile) { - should.not.exist(err); - var c = profile.credentials[0]; - c.network.should.equal('livenet'); - // from test vectors from https://dcpos.github.io/bip39/ - c.xPrivKey.should.equal('xprv9s21ZrQH143K27bhzfejhNcitEAJgLKCfdLxwhr1FLu43FLqLwscAxXgmkucpF4k8eGmepSctkiQDbcR98Qd1bzSeDuR9jeyQAQEanPT2A4'); - // m/44'/0'/0' - c.xPubKey.should.equal('xpub6CkPnrzSUp9qzBVM3hpo4oS2JKC6GJq6brE1yW59QrnhDpvkFLakpxUGRGXH62fiXb5S2VbnD4h2DLoCMfSkwfonbNgNYTJw9Ko5SqWEqCR'); - done(); - }); - }); - -}); diff --git a/test/controllers/disclaimer.test.js b/test/controllers/disclaimer.test.js deleted file mode 100644 index 9a8709582..000000000 --- a/test/controllers/disclaimer.test.js +++ /dev/null @@ -1,82 +0,0 @@ -describe('disclaimerController', function() { - var walletService; - var storeProfile; - - var fixtures = { - 'e4d8ae25e03e5fef2e553615b088cfce222083828c13fdb37b8b6cf87bf76236': { - "walletId": "215f125d-57e7-414a-9723-448256113440", - }, - '3f3b354d45c3eae3e4fe8830fcb728e5e570515af86e1a35deff0048a7a5e6b5': { - "copayerId": "1a91ead1b6d13da882a25377a20e460df557e77008ea4f60eecbf984f786cf03", - "wallet": { - "version": "1.0.0", - "createdOn": 1465347281, - "id": "215f125d-57e7-414a-9723-448256113440", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"/gaG7FIkhCiwsWKZUR0sL/cxH+zHMK0=\"}", - "m": 1, - "n": 1, - "singleAddress": false, - "status": "complete", - "publicKeyRing": [{ - "xPubKey": "xpub6Cb7MYAX7mJR28MfFueCsoDVVHhoWkQxRC4viAeHanYwRNgDo5xMF42xmAeExzfyPXX3GaALNA8hWFMekVYvDF2BALommUhMgZ52szh88fd", - "requestPubKey": "029a167eebe3ccd9987d41743477f8b75e1f3c30463187e1b106e0cc1155efa4dd" - }], - "copayers": [{ - "version": 2, - "createdOn": 1465347281, - "xPubKey": "xpub6Cb7MYAX7mJR28MfFueCsoDVVHhoWkQxRC4viAeHanYwRNgDo5xMF42xmAeExzfyPXX3GaALNA8hWFMekVYvDF2BALommUhMgZ52szh88fd", - "id": "1a91ead1b6d13da882a25377a20e460df557e77008ea4f60eecbf984f786cf03", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wwZd+2LQgYR6cA==\"}", - "requestPubKey": "029a167eebe3ccd9987d41743477f8b75e1f3c30463187e1b106e0cc1155efa4dd", - "signature": "3045022100ac3f31ef145eabde6a125958aa9d63c2bd4aa27717d7f6905c3e3ff1e733ee8e02206a43200b775ee5c8f7a85c4d3309d155240d5de46a7d9c5e60045bf49779f40b", - "requestPubKeys": [{ - "key": "029a167eebe3ccd9987d41743477f8b75e1f3c30463187e1b106e0cc1155efa4dd", - "signature": "3045022100ac3f31ef145eabde6a125958aa9d63c2bd4aa27717d7f6905c3e3ff1e733ee8e02206a43200b775ee5c8f7a85c4d3309d155240d5de46a7d9c5e60045bf49779f40b" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"9l63hoVnA71LshCC5xbOTHA+ivBzux7u8SAci56p4aaVIF4qzXQhQKFX+sAFGfBjULm/E1st6awdXnxbAgjbF7D0zsbBFLFOSCw+ko5Xc6o=\"}" - }], - "pubKey": "026d95bb5cc2a30c19e22379ae78b4757aaa2dd0ccbd15a1db054fb50cb98ed361", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2PKH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - } - }, - }; // TODO: Read from file - - beforeEach(function(done) { - - mocks.init(fixtures, 'disclaimerController', { - initController: true, - noProfile: true, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should be defined', function() { - should.exist(ctrl); - }); - - it('should create the initial profile', function(done) { - localStorage.clear(); - ctrl.init({ - walletPrivKey: 'Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy', - mnemonic: 'tunnel fork scare industry noble snow tank bullet over gesture nuclear next', - }); - setTimeout(function() { - mocks.ongoingProcess.set.getCall(1).args[0].should.equal('creatingWallet'); - mocks.ongoingProcess.set.getCall(1).args[1].should.equal(false); - done(); - }, 100); - }); -}); diff --git a/test/controllers/import.test.js b/test/controllers/import.test.js deleted file mode 100644 index b5c21b456..000000000 --- a/test/controllers/import.test.js +++ /dev/null @@ -1,112 +0,0 @@ -describe('importController', function() { - var walletService; - var storeProfile; - - var fixtures = { - '31f5deeef4cf7fd8fc67297179232e8e4590532960454ad958009132fef3daae': {}, - '4599136eff6deb4c9c78043fa84113617a16d75c45920d662305f6227ae8f0a0': { - "wallet": { - "version": "1.0.0", - "createdOn": 1463488747, - "id": "267bfa75-5575-4af7-8aa3-f5186bc99262", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"70OA+k4+xTPxim+QSdDtA5/Cf055\"}", - "m": 1, - "n": 1, - "status": "complete", - "publicKeyRing": [{ - "xPubKey": "xpub6DRjAgkh3vGTWDcEmDp4TPwy48Nu8yrp6swCEdCCLL615CgnZon7r3vXYr8LYibMLJh5DriGSito1FRBwVoBkjD1ZWG4dmgiC935wLj3nQC", - "requestPubKey": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458" - }], - "copayers": [{ - "version": 2, - "createdOn": 1463490295, - "id": "a9dcee10fe9c611300e6c7926ece20780f89b9a98baaa342928038b5503ed929", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wwZd+2LQgYR6cA==\"}", - "xPubKey": "xpub6DRjAgkh3vGTWDcEmDp4TPwy48Nu8yrp6swCEdCCLL615CgnZon7r3vXYr8LYibMLJh5DriGSito1FRBwVoBkjD1ZWG4dmgiC935wLj3nQC", - "requestPubKey": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458", - "signature": "3044022042e069126a42f1b9b498c315a825ef4fc9f4214156442651e4fef5c7678245e702205936045d7b22baa36ba36ef827cc3e5d542d57d9a1afb3a54080d12f0b95c67e", - "requestPubKeys": [{ - "key": "02befcc7499abcecf9608bb05e665f374434a89ca0c4e9baeab7dd28c027143458", - "signature": "3044022042e069126a42f1b9b498c315a825ef4fc9f4214156442651e4fef5c7678245e702205936045d7b22baa36ba36ef827cc3e5d542d57d9a1afb3a54080d12f0b95c67e" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"1Wjf2KvFkd5k0ypiiSNkSVXk7zdBOiTeCrwzPBI7fMQ/VqXUzrSB6gMGs9jISr+MvCaL1GJIXjaMnlQZNMR0lx/Pd1c6R/nKGBdHjKh0mlI=\"}" - }], - "pubKey": "026d95bb5cc2a30c19e22379ae78b4757aaa2dd0ccbd15a1db054fb50cb98ed361", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2PKH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - }, - "preferences": {}, - "pendingTxps": [], - "balance": { - "totalAmount": 0, - "lockedAmount": 0, - "totalConfirmedAmount": 0, - "lockedConfirmedAmount": 0, - "availableAmount": 0, - "availableConfirmedAmount": 0, - "byAddress": [], - "totalBytesToSendMax": 0, - "totalBytesToSendConfirmedMax": 0 - } - } - - }; // TODO: Read from file - - beforeEach(function(done){ - mocks.init(fixtures, 'importController', {}, done); - }) - - afterEach(function(done){ - mocks.clear({}, done); - }); - - - - it('should be defined', function() { - should.exist(ctrl); - }); - - it('should import a 1-1 wallet from mnemonic', function(done) { - var fakeForm = { - words: { - $modelValue: 'legal winner thank year wave sausage worth useful legal winner thank yellow' - }, - passphrase: {} - }; - - // FROM DATA - scope.seedSource = { - id: 'set' - }; - scope.bwsurl = null; - scope._walletPrivKey = 'Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy'; - - scope.setSeedSource(); - - scope.importMnemonic(fakeForm); - should.not.exist(scope.error); - - mocks.notification.success.calledOnce.should.equal(true); - -// mocks.go.walletHome.calledOnce.should.equal(true); - - // check resulting profile - storageService.getProfile(function(err, profile) { - should.not.exist(err); - var c = profile.credentials[0]; - c.network.should.equal('livenet'); - // from test vectors from https://dcpos.github.io/bip39/ - c.xPrivKey.should.equal('xprv9s21ZrQH143K2x4gnzRB1eZDq92Uuvy9CXbvgQGdvykXZ9mkkot6LBjzDpgaAfvzkuxJe9JKJXQ38VoPutxvACA5MsyoBs5UyQ4HZKGshGs'); - done(); - }); - }); -}); diff --git a/test/controllers/index.test.js b/test/controllers/index.test.js deleted file mode 100644 index 140e30b38..000000000 --- a/test/controllers/index.test.js +++ /dev/null @@ -1,71 +0,0 @@ -describe('index', function() { - - var walletService; - - - describe('Incomplete wallet', function() { - beforeEach(function(done) { - mocks.init(FIXTURES, 'indexController', { - loadProfile: PROFILE.incomplete2of2, - initController: true, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should be defined', function() { - should.exist(ctrl); - }); - it('should set the invitation code for incomplete wallets', function(done) { - should.exist(ctrl); - - ctrl.walletSecret.should.equal('GJ1A8mopdW7wPNWGVksqwQKz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXyL'); - // should redirect to copayers - mocks.go.path.getCall(0).args[0].should.equal('copayers'); - done(); - }); - }); - - describe('Complete 1-1 wallet', function() { - beforeEach(function(done) { - mocks.init(FIXTURES, 'indexController', { - loadProfile: PROFILE.testnet1of1, - initController: true, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should not set the invitation code for complete wallets', function() { - // should redirect to copayers - mocks.go.path.callCount.should.equal(0); - should.not.exist(ctrl.walletSecret); - }); - - it('should set main wallet info', function(done) { - ctrl.walletName.should.equal('kk'); - ctrl.totalBalanceSat.should.equal(1847686); - done(); - }); - - it('should set information for receive tab', function(done) { - ctrl.tab.should.equal('walletHome'); - ctrl.setTab('receive'); - ctrl.tab.should.equal('receive'); - done(); - }); - - - it.skip('should updates remote preferences', function(done) { - ctrl.updateRemotePreferences({}, function() { - done(); - }); - }); - }); - - -}); diff --git a/test/controllers/join.test.js b/test/controllers/join.test.js deleted file mode 100644 index 40fb11edd..000000000 --- a/test/controllers/join.test.js +++ /dev/null @@ -1,150 +0,0 @@ -describe('joinController', function() { - - var walletService; - - var fixtures = { - // join - '668623e51aaae25c637fb9c57bb30a169a0ff67fa1e67e6e61643c7e5e580a66': { - "copayerId": "962fb5dd31d9f715efdbb33d41533d272bb6c2ecd28bbb8181358f86b08253dd", - "wallet": { - "version": "1.0.0", - "createdOn": 1466006460, - "id": "10387ed3-51cf-43b4-91fe-ad85ca2ae368", - "name": "{\"iv\":\"4Agx234j4p+TQS0QXj7bow==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"IEohefHXl/tr4rA=\"}", - "m": 2, - "n": 2, - "singleAddress": false, - "status": "complete", - "publicKeyRing": [{ - "xPubKey": "xpub6C6dynsH56i7VhzHzo2ZcJguHsjYuUuoPcAdku8h6c7ZaJSYb4WQjKcGdggbpWEuaQspY3LHmFUoCQhk1ErmdegXnsJeSxoKqiPD1CUxVvT", - "requestPubKey": "0200fbedb7d04af9edbd1602103c1ff68454fd009fd8b1acd957441e776c69ff59" - }, { - "xPubKey": "xpub6BsR71KDdSPMePtuipRiWKMC2Q9XEXfk6WM1trbJzPEhcwVBKyN9UhWtpnGv2pu4mtZyKFRgwL98hDH6TBdeEFNVp8Jf81kPBKPeWpn4sWr", - "requestPubKey": "02ad777ba00bf085a2d167c0600df290037d40e5e0d33b5f8e345b0b80a8861bd4" - }], - "copayers": [{ - "version": 2, - "createdOn": 1466006460, - "id": "4f72d7bc290a0343a5096cf28999d5d329a9be42651b061fb9489130d0cf9af9", - "name": "{\"iv\":\"RZr7/0eA7F70T/wBCJo7kw==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"nL4c40ADLWELtoE=\"}", - "xPubKey": "xpub6C6dynsH56i7VhzHzo2ZcJguHsjYuUuoPcAdku8h6c7ZaJSYb4WQjKcGdggbpWEuaQspY3LHmFUoCQhk1ErmdegXnsJeSxoKqiPD1CUxVvT", - "requestPubKey": "0200fbedb7d04af9edbd1602103c1ff68454fd009fd8b1acd957441e776c69ff59", - "signature": "304402200af094bbb7c432c9a1323534db125431c87bdec9678f40e89a42f209115a222202207a87a27b5f14bf931e1a15d71aa8407118398e5540a8fcbaf7caffef534b6a49", - "requestPubKeys": [{ - "key": "0200fbedb7d04af9edbd1602103c1ff68454fd009fd8b1acd957441e776c69ff59", - "signature": "304402200af094bbb7c432c9a1323534db125431c87bdec9678f40e89a42f209115a222202207a87a27b5f14bf931e1a15d71aa8407118398e5540a8fcbaf7caffef534b6a49" - }], - "customData": "{\"iv\":\"kSIFrEhNScxUNG5BMnV34A==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"strUeMXiPhTPmsatrStRfaF9+ZD1LU+m+I6Xeu4m0s43DIqc/DYJwm+37fatohNKQ6J7FQKTCJUgMiidAe30K6Dw7J7GA6mFhedMsGLJNbOmBEhRN0AAbwXW6B0=\"}" - }, { - "version": 2, - "createdOn": 1466006511, - "xPubKey": "xpub6BsR71KDdSPMePtuipRiWKMC2Q9XEXfk6WM1trbJzPEhcwVBKyN9UhWtpnGv2pu4mtZyKFRgwL98hDH6TBdeEFNVp8Jf81kPBKPeWpn4sWr", - "id": "962fb5dd31d9f715efdbb33d41533d272bb6c2ecd28bbb8181358f86b08253dd", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"UKYkKqeia8gWrLqaJ+TuzA/LVlrG\"}", - "requestPubKey": "02ad777ba00bf085a2d167c0600df290037d40e5e0d33b5f8e345b0b80a8861bd4", - "signature": "3045022100f7c7bbc49ce679e67420db8614bf59dfbd798e8ad95a0427305ae5008e0aa41b02203997647b80cc6e5a365048dc5b7b1822809b3c9209a053aaeef7e9f3920d7cef", - "requestPubKeys": [{ - "key": "02ad777ba00bf085a2d167c0600df290037d40e5e0d33b5f8e345b0b80a8861bd4", - "signature": "3045022100f7c7bbc49ce679e67420db8614bf59dfbd798e8ad95a0427305ae5008e0aa41b02203997647b80cc6e5a365048dc5b7b1822809b3c9209a053aaeef7e9f3920d7cef" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"HTlgRDT46ysMT3+XzhxeXgrOfJ1Fq+kiTWG/q7RqISdWWE+cmP5LcI6+PSysEpo66AjOlI9ofyMVxKtptabWYSNgydrhnqZ5EKY0TnFRq8Ov7a8+btXf9n9BDsM=\"}" - }], - "pubKey": "03bdebf86549b272addd61076e026d2f6a225db514f08b8fad08536a8c4a6792c1", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2SH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - } - }, - - '197031879d401f75c308e3d5014ac2e9560ec805e1fdd58c778e0ae0bfe7ec0a': {}, - } - - beforeEach(function(done) { - mocks.init(fixtures, 'joinController', {}, done); - }) - - - afterEach(function(done) { - mocks.clear({}, done); - }); - - - - it('should be defined', function() { - should.exist(ctrl); - }); - - // // Get html template from cache - // beforeEach(inject(function($templateCache) { - // viewHtml = $templateCache.get("some/valid/templateUrl"); - // })); - // // beforeEach(inject(function(_$compile_, _$rootScope_){ - // $compile = _$compile_; - // $rootScope = _$rootScope_; - // - // $scope = $rootScope.$new(); - // $scope.user = {}; - // $scope.logout = sinon.stub(); - // dropdownElement = angular.element(viewHtml); - // })); - - it('should join a wallet once the form is submitted', function(done) { - // View' s joinForm is not available - //join.onQrCodeScanned('aQRCode'); - // - - - - scope.seedSource = { - id: 'set' - }; - ctrl.setSeedSource(); - - // FROM DATA - scope._walletPrivKey = 'Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy'; - var fakeForm = { - secret: { - $modelValue: '31B6DG8f12vGhG7hWhQy2PKwngiNnQ4ijPcePSwanQ2gD6N4mWs3eVPtdwZqRQbHnLQyxhoJksL' - }, - myName: { - $modelValue: 'myCopayerName' - }, - - bwsurl: 'null', - createPassphrase: { - $modelValue: null - }, - privateKey: { - $modelValue: 'useful poet rely letter cause fat student tumble animal toddler proof husband', - }, - passphrase: { - $modelValue: null, - }, - }; - ctrl.join(fakeForm); - should.not.exist(ctrl.error); - mocks.go.walletHome.calledOnce.should.equal(true, 'Go Wallet Home Called'); - - // check resulting profile - storageService.getProfile(function(err, profile) { - should.not.exist(err); - var c = profile.credentials[0]; - c.network.should.equal('livenet'); - // from test vectors from https://dcpos.github.io/bip39/ - c.xPrivKey.should.equal('xprv9s21ZrQH143K3ettHXncETrbUjzrTB7yBfhzjnYjbFgExeNMecTGPvJgje2WQeSFS17Sd8ssz8FQuCbm4rK62ojAwPCX8GHtjHNHsmJsbUa'); - // m/44'/0'/0' - c.xPubKey.should.equal('xpub6BsR71KDdSPMePtuipRiWKMC2Q9XEXfk6WM1trbJzPEhcwVBKyN9UhWtpnGv2pu4mtZyKFRgwL98hDH6TBdeEFNVp8Jf81kPBKPeWpn4sWr'); - c.walletName.should.equal('2-2'); - done(); - }); - - }); -}); diff --git a/test/controllers/preferencesHistory.test.js b/test/controllers/preferencesHistory.test.js deleted file mode 100644 index 8c8ec6d3a..000000000 --- a/test/controllers/preferencesHistory.test.js +++ /dev/null @@ -1,37 +0,0 @@ -describe('Preferences History Controller', function() { - - var walletService; - - var txHistory = '[{"txid":"bf31ecaa8e10ce57f9a889fc4c893b40ff57b016dd763957d942e21ed55fc62c","action":"received","amount":120000,"fees":4862,"time":1464969291,"confirmations":8,"outputs":[{"amount":120000,"address":"2N4HgtF9cJSzxhVkj5gbKxwJSKWBmnb9FNJ","message":null}],"note":{"body":"just a comment","editedBy":"31a8c3c0be9ffbb9f257c95f3fd2f73a59cf81e40199ba5918417270db8c4cdb","editedByName":"2-2","editedOn":1464969101},"message":null,"creatorName":"","hasUnconfirmedInputs":false,"amountStr":"1,200 bits","alternativeAmountStr":"0.68 USD","feeStr":"49 bits","safeConfirmed":"6+"}]'; - - describe('Complete 1-1 wallet', function() { - beforeEach(function(done) { - mocks.init(FIXTURES, 'preferencesHistory', { - loadProfile: PROFILE.testnet1of1, - loadStorage: { - 'txsHistory-66d3afc9-7d76-4b25-850e-aa62fcc53a7d': txHistory, - }, - }, done); - }); - - afterEach(function(done) { - mocks.clear({}, done); - }); - - it('should be defined', function() { - should.exist(ctrl); - }); - - it('should export csv', function(done) { - scope.csvHistory(function(err) { - should.not.exist(err); - should.exist(scope.csvReady); - scope.csvReady.should.equal(true); - should.exist(scope.csvContent); - JSON.stringify(scope.csvContent).should.equal('[{"Date":"2016-06-03T15:54:51.000Z","Destination":"","Description":"","Amount":"0.00120000","Currency":"BTC","Txid":"bf31ecaa8e10ce57f9a889fc4c893b40ff57b016dd763957d942e21ed55fc62c","Creator":"","Copayers":"","Comment":"just a comment"}]'); - done(); - }); - }); - }); - -}); diff --git a/test/controllers/walletHome.test.js b/test/controllers/walletHome.test.js deleted file mode 100644 index 5fa381bcc..000000000 --- a/test/controllers/walletHome.test.js +++ /dev/null @@ -1,19 +0,0 @@ -describe('walletHome', function() { - - var walletService; - var fixtures = {}; - - - beforeEach(function(done){ - mocks.init(fixtures, 'walletHomeController', {}, done); - }) - - afterEach(function(done){ - mocks.clear({}, done); - }); - - it('should be defined', function() { - should.exist(ctrl); - }); - -}); diff --git a/test/fixtures.js b/test/fixtures.js deleted file mode 100644 index 6d3664618..000000000 --- a/test/fixtures.js +++ /dev/null @@ -1,1405 +0,0 @@ -var walletInfo = { - "wallet": { - "version": "1.0.0", - "createdOn": 1463511645, - "id": "7bd8d22f-d132-43e1-b259-d5b430752553", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"70OA+k4+xTPxim+QSdDtA5/Cf055\"}", - "m": 2, - "n": 2, - "status": "pending", - "publicKeyRing": [], - "copayers": [{ - "version": 2, - "createdOn": 1463511988, - "id": "3d4eb9b439eee1b2b73cf792eda52e420f4665109c7234a50cf3cdbf296ea8fb", - "name": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wwZd+2LQgYR6cA==\"}", - "xPubKey": "xpub6CkPnrzSUp9qzBVM3hpo4oS2JKC6GJq6brE1yW59QrnhDpvkFLakpxUGRGXH62fiXb5S2VbnD4h2DLoCMfSkwfonbNgNYTJw9Ko5SqWEqCR", - "requestPubKey": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72", - "signature": "30440220521623cf346f667658c00f1dea113407f23cecf02932c7dcb4b8bf35f1836b7a02202c77b8e4260942f4e13a58faae1f92e1130bae1157492056347e66741150eb2c", - "requestPubKeys": [{ - "key": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72", - "signature": "30440220521623cf346f667658c00f1dea113407f23cecf02932c7dcb4b8bf35f1836b7a02202c77b8e4260942f4e13a58faae1f92e1130bae1157492056347e66741150eb2c" - }], - "customData": "{\"iv\":\"BZQVWAP6d1e4G8Fq1rQKbA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"YJqN/LtkCY0cOB235RtbGEAY7wKGT0cUUpAvUeLkAUKz3/1axsYZtnG+PU0jHtwQvgmKNLkNcXNR60K+tyRpU0TG1z8pyx4gKwwD3Dt7KzA=\"}" - }], - "pubKey": "026d95bb5cc2a30c19e22379ae78b4757aaa2dd0ccbd15a1db054fb50cb98ed361", - "network": "livenet", - "derivationStrategy": "BIP44", - "addressType": "P2SH", - "addressManager": { - "version": 2, - "derivationStrategy": "BIP44", - "receiveAddressIndex": 0, - "changeAddressIndex": 0, - "copayerIndex": 2147483647 - }, - "scanStatus": null - }, - "preferences": {}, - "pendingTxps": [], - "balance": { - "totalAmount": 0, - "lockedAmount": 0, - "totalConfirmedAmount": 0, - "lockedConfirmedAmount": 0, - "availableAmount": 0, - "availableConfirmedAmount": 0, - "byAddress": [], - "totalBytesToSendMax": 0, - "totalBytesToSendConfirmedMax": 0 - } -}; - -var FIXTURES = { - - // store preferences - '1eda3e702196b8d5d82fae129249bc79f0d5be2f5309a4e39855e7eb4ad31428': {}, - - // Incomplete wallet status - 'd05582c35aa545494e3f3be9713efa9df112d36a324350f6b7141996b824bce2': walletInfo, - // ^ same thing, twostep=1 - '56f430fcd3987d37d5818b1c0a716544c0115cd1b65e3bf163006b1823494ad2': walletInfo, - // put /preferences - '8fb7fc4644c3828a7df61185a08504c685df0867b21c6ad2a386d69bc3a1a568': {}, - // - '980fad92e75cdfdfe59d139bf1f65ff3ccb7b0e56718637fd9de5842f7875312': { - "version": "1.0.0", - "createdOn": 1463520484, - "walletId": "7bd8d22f-d132-43e1-b259-d5b430752553", - "copayerId": "3d4eb9b439eee1b2b73cf792eda52e420f4665109c7234a50cf3cdbf296ea8fb", - "email": null, - "language": null, - "unit": "bit" - }, - - // Complete 1-1 wallet status - // - 'adf7024c3573a59f42e712d894bcc1f41eb8f946a8aefba52359e2b034bdf0d4': { - "wallet": { - "version": "1.0.0", - "createdOn": 1455745883, - "id": "66d3afc9-7d76-4b25-850e-aa62fcc53a7d", - "name": "kk", - "m": 1, - "n": 1, - "status": "complete", - "copayers": [{ - "version": 2, - "createdOn": 1455745883, - "id": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "name": "copayer 1", - "requestPubKeys": [{ - "key": "038bb7cc1238280e893dd6949bfce770a319892b3c9045112ec7810191d4157ced", - "signature": "304402207fe3d127734bea08231597f7f06bf61b5dd8c9ba63cf512fd4b0fac2d5d9144c022028566c6fdc959c1c107f9c0d79f8b287aa500bf5a3e022b9ea49eb33392e4566" - }] - }], - "network": "testnet", - "derivationStrategy": "BIP44", - "addressType": "P2PKH", - "scanStatus": "success" - }, - "preferences": {}, - "pendingTxps": [], - "balance": { - "totalAmount": 1847686, - "lockedAmount": 0, - "totalConfirmedAmount": 1847686, - "lockedConfirmedAmount": 0, - "availableAmount": 1847686, - "availableConfirmedAmount": 1847686, - "byAddress": [{ - "address": "mnZ3vC2u2GcAbWBvxVnB5V4F8QcwKg3fkp", - "path": "m/1/46", - "amount": 1843286 - }, { - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid", - "path": "m/0/16", - "amount": 4400 - }], - "totalBytesToSendMax": 578, - "totalBytesToSendConfirmedMax": 578 - } - }, - // History - '499c8fcad0c1895054a82b3d2f8df81fd98789871f1d87e5aa88521177bb15fb': [{ - "txid": "49d69287e6e284b5ae845ef61e90dc6709e6a3f1f0c94cf665ff1d8d6e4efc71", - "action": "sent", - "amount": 1000000, - "fees": 9720, - "time": 1462156858, - "addressTo": "mrYKc2NYioXxbQSSRDdUh9QwBYS3h3BFvV", - "confirmations": 40706, - "outputs": [{ - "amount": 1000000, - "address": "mrYKc2NYioXxbQSSRDdUh9QwBYS3h3BFvV" - }] - }, { - "txid": "2e9f7e73208c70fea6ab51944c9de33cb2d0cc936a98386e0024c743844cdf3f", - "action": "sent", - "amount": 10000, - "fees": 9720, - "time": 1462138505, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 40897, - "outputs": [{ - "amount": 10000, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i" - }] - }, { - "txid": "d799112cb54e60019503219af445172eeaa1f6fb41ee3a27bedc70c95ac6e70b", - "action": "sent", - "amount": 10000, - "fees": 2439, - "time": 1462072762, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41387, - "outputs": [{ - "amount": 10000, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i" - }] - }, { - "txid": "9dd0971ad83bfb276ac76811352bc92c55d9f51a0038157614b35896913c2cea", - "action": "sent", - "amount": 2200, - "fees": 4261, - "time": 1462070325, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41389, - "outputs": [{ - "amount": 2200, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i" - }] - }, { - "txid": "094b30e77fdfc20617ed9da08c46d0e342c0cc6a5271e59fc59c4e731681ad51", - "action": "sent", - "amount": 1100, - "fees": 2439, - "time": 1462043263, - "addressTo": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo", - "confirmations": 41650, - "outputs": [{ - "amount": 1100, - "address": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo" - }], - }], - // txhistory 1-1 testnet - 'be65742a355b926d4e7bc7acf5194930474ec8db885e2c65f22791b7cdb8c4f0': [{ - "txid": "6fa0a54f0d7e8518f8622bd6e84224ea41bbf0cd6238ad127d1751b924e915a2", - "action": "sent", - "amount": 10000, - "fees": 2439, - "time": 1462035742, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41748, - "outputs": [{ - "amount": 10000, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "message": null - }], - "proposalId": "014620287996740afec64f-2b23-4fa9-9ba1-21a9939334e8", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462028803, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "310d2792edd87e7cbeb77907ca3c70ec8f061dd806f1618b21e5224d8cf2b5b7", - "action": "sent", - "amount": 10000, - "fees": 2439, - "time": 1462029578, - "addressTo": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo", - "confirmations": 41802, - "outputs": [{ - "amount": 10000, - "address": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo", - "message": null - }], - "proposalId": "0146202332218821437804-3a42-4179-b4ef-779651699120", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462023324, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "ba06ed943dbbf6d8316c8da67acee71e648a1db6e8eb54bff7832500f2e71263", - "action": "sent", - "amount": 21000, - "fees": 9000, - "time": 1462028414, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41822, - "outputs": [{ - "amount": 21000, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "message": null - }], - "proposalId": "014620205262398f9fbb3c-fa0e-4e89-8c01-c462aeac75de", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462020528, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "bf13ca5e0375185a1ce1e6c2068d0ae5a7965e72e71d715e63df00b586600155", - "action": "sent", - "amount": 22200, - "fees": 2439, - "time": 1462028360, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41816, - "outputs": [{ - "amount": 22200, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "message": null - }], - "proposalId": "01462020614530e1178805-4eae-497e-b20a-e81ac3c3dd37", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462021427, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "1d3ca0adb421f7fc5290ab5018b9f167a5b9f506a0d4aec61064f90cee43afd2", - "action": "sent", - "amount": 22200, - "fees": 2439, - "time": 1462028357, - "addressTo": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo", - "confirmations": 41805, - "outputs": [{ - "amount": 22200, - "address": "mmvNFchzzpWX5Yzx3j5A1vLf5KV9KtGEfo", - "message": null - }], - "proposalId": "01462021663526fac48a42-10b0-4c45-a196-48a80ae61ae5", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462022922, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "d7aa52c264719da786d3d0e6139c2e280834db02354fc334dc8d1d0c96a4cb77", - "action": "sent", - "amount": 1100, - "fees": 3300, - "time": 1462008652, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41991, - "outputs": [{ - "amount": 1100, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "message": null - }], - "proposalId": "01462001958646d502eeb6-8829-4f09-951c-fdbae655343d", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462001961, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "23b4e0b3ef1fd90a42c7088c3464d11c3ede9109d657602c8e811f3a14f377bd", - "action": "sent", - "amount": 22200, - "fees": 10000, - "time": 1462008652, - "addressTo": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "confirmations": 41991, - "outputs": [{ - "amount": 22200, - "address": "mtevLzhkNMeV1T8px5aghSjT5WeeXQVT2i", - "message": null - }], - "proposalId": "01462002020568ca4b9a61-f7e9-417e-a5af-d9d986f648db", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1462002170, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "15df3120c5690e479878441362117214ee27be656f90504ebd895eb50e8188be", - "action": "received", - "amount": 2959321, - "fees": 6985, - "time": 1462008609, - "confirmations": 41995, - "outputs": [{ - "amount": 2959321, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "3fe0f1edca7f4999759d06da0e1a7179048fd7f24bf25af030a341ee4ef50f80", - "action": "received", - "amount": 10000, - "fees": 2439, - "time": 1461990151, - "confirmations": 42324, - "outputs": [{ - "amount": 10000, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "4e2b3359dc53de7f6b6c3e374548bb22f6edf9b36c55e20f38fc9b01d045dd52", - "action": "received", - "amount": 11100, - "fees": 2439, - "time": 1461963912, - "confirmations": 42816, - "outputs": [{ - "amount": 11100, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "3f661f7f43fc9b7a5fe8fc394398c864d9b76431a277bcbe020e342427a5540f", - "action": "received", - "amount": 10000, - "fees": 2439, - "time": 1461963855, - "confirmations": 42828, - "outputs": [{ - "amount": 10000, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "3cd04bf9e46cce847d58b8d0fbbb6d5635e026aec3fd54fe0b980c8e603f235e", - "action": "received", - "amount": 10000, - "fees": 2439, - "time": 1461963834, - "confirmations": 42827, - "outputs": [{ - "amount": 10000, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "a1e27edbac77faf5e9109d675f5132afeea8c7a5751685a0fb18ab0501bc8673", - "action": "received", - "amount": 10000, - "fees": 2438, - "time": 1461949047, - "confirmations": 43222, - "outputs": [{ - "amount": 10000, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "abc01e2a966fdcb64de6f2185e5a677f35dd2657469788ca98014dba23f54d0a", - "action": "received", - "amount": 10000, - "fees": 2438, - "time": 1461945399, - "confirmations": 43301, - "outputs": [{ - "amount": 10000, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "c6ef1b2596a16624030a70467654e82bb6d3f211e768e606d7a41d2856c04181", - "action": "received", - "amount": 4400, - "fees": 6405, - "time": 1461878525, - "confirmations": 45958, - "outputs": [{ - "amount": 4400, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "bfeeafb79e22d92a936ad5ba3e806c9c2f86ab9676ff754ee6be9c66dc0ec8c1", - "action": "received", - "amount": 2200, - "fees": 2438, - "time": 1461855553, - "confirmations": 49553, - "outputs": [{ - "amount": 2200, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "9d01c610927833f7bbc10c75623f73063687c44fad3f9f3730fb6df8727e3661", - "action": "received", - "amount": 2200, - "fees": 2438, - "time": 1461855468, - "confirmations": 49591, - "outputs": [{ - "amount": 2200, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "b7bb9dad39055f3dbe8943d03ffbd6463312107883386edbfc276a91cf64943d", - "action": "received", - "amount": 11100, - "fees": 2439, - "time": 1461780282, - "confirmations": 60334, - "outputs": [{ - "amount": 11100, - "address": "n2mwd1JeJWCaLTfTAZMJtiWVyC3y1Wbfid" - }] - }, { - "txid": "7ce9a68bd8951d6cfefd9ac5ab4b3ee0196b5ee24bbf0f28196bcc7bd5313edb", - "action": "sent", - "amount": 4138994, - "fees": 16790, - "time": 1460566285, - "addressTo": "mmXGGqzRhFeEJFufUJrwtnk3VuQEJHyKhh", - "confirmations": 83134, - "outputs": [{ - "amount": 4138994, - "address": "mmXGGqzRhFeEJFufUJrwtnk3VuQEJHyKhh", - "message": null - }], - "proposalId": "01460558645581d749b541-721b-4fa4-ac57-67c4aa6f6c52", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1460558648, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "659667057122f1e5ed25fa7d650809c907bfb6e5cff6e2ede2fabc13442ebd75", - "action": "received", - "amount": 3930983, - "fees": 7859, - "time": 1460566285, - "confirmations": 83134, - "outputs": [{ - "amount": 3930983, - "address": "mtnUUgPrfSzMCEPaBbshwnwfKJWxZtYBs6" - }] - }, { - "txid": "d3b0882fc40533d41c02bff0a616a2d46b1c689876a9420985781d0edad1151e", - "action": "sent", - "amount": 4400, - "fees": 10789, - "time": 1459470932, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90091, - "outputs": [{ - "amount": 4400, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459463705829b29f0237-b1c3-456c-9df7-c4d3382e1c44", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459463713, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "d02f616767b72b4817dc2c6c29fd07046b57f2f7f0910ef2a0d79599b4fcbe5e", - "action": "sent", - "amount": 3300, - "fees": 11244, - "time": 1459470932, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90091, - "outputs": [{ - "amount": 3300, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "0145946365335296086038-0213-46b5-8b13-1eca1269698f", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459463655, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "9655e1110aa57c6f2ca505e9b19dd5b38e61fb3315ac0e53d6b315dd0d67b661", - "action": "sent", - "amount": 24300, - "fees": 10789, - "time": 1459468226, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90117, - "outputs": [{ - "amount": 24300, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459462361539714519e1-f9c4-4c5a-91fd-b0b12da50ae9", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459462364, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "2e2562b5ec002dba96af62e8bcfa9b3b65f6f60e96488bc59fbeee3174f750a4", - "action": "sent", - "amount": 23200, - "fees": 10789, - "time": 1459468140, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90124, - "outputs": [{ - "amount": 23200, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459462091745b84c94ff-3650-4113-842a-6b49fa379f5e", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459462094, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "75a7aa5fa4d03fd484ee26e0a4aad37ccb0e735dd03027dab63fb12ae8a9cd3b", - "action": "sent", - "amount": 23100, - "fees": 10789, - "time": 1459468129, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90129, - "outputs": [{ - "amount": 23100, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594616413651df5dce6-ddc3-4b19-9721-381fd78006db", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459461644, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "7e0494d6c81ee22b24e815f53116cdd143ce2ec4e34bacb7ee5886807f2ac5b0", - "action": "sent", - "amount": 12600, - "fees": 10789, - "time": 1459468071, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90142, - "outputs": [{ - "amount": 12600, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459460699253fa66c2cd-4fbb-497d-9086-c45c312f4e24", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459460701, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "b41721474cbc224bbe0f8cc70f3a70219b630962d89e4c369b2009ceda412cb0", - "action": "sent", - "amount": 12400, - "fees": 10789, - "time": 1459467803, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90144, - "outputs": [{ - "amount": 12400, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459460605840904d9d5a-ea90-42e5-b147-b9ae65b30f0f", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459460608, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "90c224336162b6391db5be322c1908e7d9d9026545d268d216b3cda664492a2d", - "action": "sent", - "amount": 12300, - "fees": 10789, - "time": 1459467133, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90159, - "outputs": [{ - "amount": 12300, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594599176299186cfc9-46b5-4786-bf74-bcdfbe64851d", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459459920, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "ea33f2e62e940c32e883916ed20ee49421228f8af5f50b9674c1be6517d46387", - "action": "sent", - "amount": 13200, - "fees": 10789, - "time": 1459466976, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90137, - "outputs": [{ - "amount": 13200, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459461019978babbaa89-4af2-4c89-bc1c-c3111f4d96d1", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459461022, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "6bc31aca5ac5d9a72bb6f12274c4dd34cbdcdf1150998faa3f6d2a848c9e25c6", - "action": "sent", - "amount": 13100, - "fees": 10789, - "time": 1459466976, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90137, - "outputs": [{ - "amount": 13100, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "0145946093051133caeeb7-55a7-4c2b-a2c4-cd175c0ec9c3", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459460933, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "ff167d85c34920255af023d7202545cab1b731d86c6704c6aafa03f5e46155c1", - "action": "sent", - "amount": 12700, - "fees": 10789, - "time": 1459464433, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90175, - "outputs": [{ - "amount": 12700, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459458885274a8c84629-1141-4dd2-8402-4d8e4185d796", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459458889, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "82b8b6c0a1f8d0f212aafc5e6ca9a18376001d1895399fffeb94c3d996a7adf5", - "action": "sent", - "amount": 12900, - "fees": 10789, - "time": 1459464433, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90175, - "outputs": [{ - "amount": 12900, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594589322742b7adc21-d181-4d8d-a4a9-ccf34a548d18", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459458934, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "330a37ba9a886b9548181fdaa31b2327338e4363947471a6af33b219c085b7f5", - "action": "sent", - "amount": 12200, - "fees": 10789, - "time": 1459462699, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90228, - "outputs": [{ - "amount": 12200, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594552277499d2e2dc5-674f-466e-af41-b89930d92c4a", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459455565, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "e8105445a8bfb885588f01d79f2f228759f5c5503ff5feb254f42c2f185a262c", - "action": "sent", - "amount": 12100, - "fees": 10789, - "time": 1459461311, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90247, - "outputs": [{ - "amount": 12100, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459454478687a5d6462a-5497-412b-80a7-21dfd8eb8a08", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459454482, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "d58e4953d28538f7ad317a419e3ae44ea38d57947b637b5b7d7154b40e069e81", - "action": "sent", - "amount": 11600, - "fees": 10789, - "time": 1459460981, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90251, - "outputs": [{ - "amount": 11600, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459454054176abfedc09-21a7-4fc3-bb7d-5f0a23493917", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459454056, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "1e6cc8f69f5d6130196e5b253bf66e1c384e1eda3897812cef005a4792b3cf0f", - "action": "sent", - "amount": 11300, - "fees": 10789, - "time": 1459460319, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90270, - "outputs": [{ - "amount": 11300, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459453123419006f582d-d3f4-4f6d-bb5e-ffb26a5bafe3", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459453126, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "04087ee2e89f5fb80eb20f0b0c4363532967cde86052ac8a9425292e3c1054a7", - "action": "sent", - "amount": 11200, - "fees": 10789, - "time": 1459460054, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90274, - "outputs": [{ - "amount": 11200, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459452926578b1accfed-410e-4a14-9640-392211500d98", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459452930, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "35ef08935b01f97b48738478fe5dddac22c53619c6722fa19eee10102869a7bb", - "action": "sent", - "amount": 11100, - "fees": 10789, - "time": 1459460044, - "addressTo": "mg8s31BLMXs6BX33XKRpxhno5Sk9PsA44s", - "confirmations": 90276, - "outputs": [{ - "amount": 11100, - "address": "mg8s31BLMXs6BX33XKRpxhno5Sk9PsA44s", - "message": null - }], - "proposalId": "014594528886574922a970-27ab-4499-8006-795a7e46117f", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459452892, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "4e7ad490b24c02c2dae3d65e690e031bd634c3458bfd057b4a61223cec1c0e28", - "action": "sent", - "amount": 11500, - "fees": 10789, - "time": 1459459598, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90265, - "outputs": [{ - "amount": 11500, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459453278803f5779d1a-7dd2-4da0-85ce-8b1254279a78", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459453295, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "2164ad58166f9d6a6a3d9a32bb68bc6942fff5c44e38a4a399d84530f27ef693", - "action": "sent", - "amount": 11400, - "fees": 10789, - "time": 1459459151, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90268, - "outputs": [{ - "amount": 11400, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "0145945316225536ebe7e8-7542-44ec-a5a5-58070566768c", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459453165, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "7bbf03f6cdb749cd15986d0752e94362a0f127f34988282a3335e63fd7b6d610", - "action": "sent", - "amount": 10900, - "fees": 10789, - "time": 1459451596, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90402, - "outputs": [{ - "amount": 10900, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594453156721f0d836d-ff16-412f-9e09-0d6be57df9fe", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459445318, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "e1c084f3fb30f935423391844d08c3234d9d2cf3df7a8a7b8eae22e19a0a53b2", - "action": "sent", - "amount": 10600, - "fees": 10789, - "time": 1459445798, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90696, - "outputs": [{ - "amount": 10600, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594385235427db69e99-4583-4d8c-bf5f-a2ecdf32a055", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459438526, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "9e594ff0efd56bdc6a72e6abbd75664514fdea07c0a6cec2f817635646cff311", - "action": "sent", - "amount": 10700, - "fees": 10789, - "time": 1459445798, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90696, - "outputs": [{ - "amount": 10700, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459438576264173becd3-58d4-43a6-ba59-8ed3f404cdb7", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459438579, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "f2d474ac2f1e7eefda31ee10ac1d066c779f1ad0ee4d889b6bf40421e6ff2dad", - "action": "sent", - "amount": 10800, - "fees": 10789, - "time": 1459445515, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90658, - "outputs": [{ - "amount": 10800, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "014594394521198be1ffc9-534e-4a97-8686-fdd2d1e3a74e", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459439454, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "cb2630e133815fb3ef657281bc473bb37d47ad74a7505a2c98b4548e5e65240d", - "action": "sent", - "amount": 10200, - "fees": 10789, - "time": 1459439023, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90959, - "outputs": [{ - "amount": 10200, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "0145943285575853dc8430-4d1e-457f-a948-237b07993838", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459432869, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "870cd74f04fa4336beb4e16c9cc98e5a685d96169c06ad38f3c878f41332053c", - "action": "sent", - "amount": 10100, - "fees": 10789, - "time": 1459439023, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90959, - "outputs": [{ - "amount": 10100, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459432810452854a20c8-885c-4f35-8580-ee529c969909", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459432818, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "c2e57b795230da721a0a6d2a33df989be40cf461f4561da5f905f1d6c1ed853e", - "action": "sent", - "amount": 10000, - "fees": 10789, - "time": 1459438900, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90962, - "outputs": [{ - "amount": 10000, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459432716856b5a9a977-4de9-4beb-b01b-f68ee362efb4", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459432720, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "45a9795ae068b785d6f6e900e03664e0487149fbfd8900eb53781e93f7316f7c", - "action": "sent", - "amount": 10000, - "fees": 15770, - "time": 1459438190, - "addressTo": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "confirmations": 90998, - "outputs": [{ - "amount": 10000, - "address": "mqxPAtiNaoL4ERWN9JfVisfuGpFwACVcJ3", - "message": null - }], - "proposalId": "01459432205652d2c3014b-5a9c-4de3-af24-8f44cbbb4df5", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1459432208, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "c2b3cb6b3637c91cca729edcaaeb4485b4a1c5346f3af556d33379c4b4cb19ac", - "action": "sent", - "amount": 12000, - "fees": 5388, - "time": 1459259755, - "addressTo": "moQ14yiyqWqzahmRZ6KL7GtKyuzqeBT4M9", - "confirmations": 96314, - "outputs": [{ - "amount": 12000, - "address": "moQ14yiyqWqzahmRZ6KL7GtKyuzqeBT4M9", - "message": "{\"iv\":\"XnN6hBRjL4T4n3xpBZ4ZFw==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"eZKrLwXM5sp3RcFXYRbeXTCq2uMJcwAfRVnrSEIkf/msfDDqZu+jNdfznCKuDSYosfA=\"}" - }], - "proposalId": "014592594354211a81a4ff-b6b4-4247-b71e-1c8bfc1ea508", - "creatorName": "me", - "message": "{\"iv\":\"iItl0hV7SXM7quiCBALfog==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"NSh38LEAU9+kkfbYuy8bLFMbVbVv5Z24wuogEwpEHriD1uv6Rf3L15WRHXxBYqvuqys=\"}", - "actions": [{ - "createdOn": 1459259441, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "3e976b19e87be23e013cdb622b98efaa4b2052e6f5c707d0e3457aa58cd523ab", - "action": "received", - "amount": 10000, - "fees": 10000, - "time": 1459259163, - "confirmations": 96315, - "outputs": [{ - "amount": 10000, - "address": "my4e3acTkzvCJgsvyFpggqUb7rfuyG8iEc" - }] - }], - // txhistory 1-1, 2 - '2c4af081dae765e35850747e06643e09d93ac9516e05a929375988b198d69f26': [{ - "txid": "a671aa78b56b7979c916a19c82cdf8cfffd97876484a31a4832fa17c72148542", - "action": "received", - "amount": 100000, - "fees": 10000, - "time": 1459257914, - "confirmations": 96317, - "outputs": [{ - "amount": 100000, - "address": "my4e3acTkzvCJgsvyFpggqUb7rfuyG8iEc" - }] - }, { - "txid": "5dd2c1b857e4992b6c877d9eb741b1f6fa4fc01516220737c0172cd37a26a306", - "action": "sent", - "amount": 100000, - "fees": 2441, - "time": 1458778160, - "addressTo": "mhGs6cXT3wVKcDkfKPB8shjeAEXZEJKoDm", - "confirmations": 120825, - "outputs": [{ - "amount": 100000, - "address": "mhGs6cXT3wVKcDkfKPB8shjeAEXZEJKoDm", - "message": "{\"iv\":\"MdtPv8JanU52VK64K1LAyg==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"09iDO3M5gtJ+QPQTkG+l/8bP3F3CjvNGur5a/XmFKU5gBNjVVM4hdFnabmo9ChfhsTc=\"}" - }], - "proposalId": "01458774041083fede594e-eb57-42fb-89c0-3cbe63f87677", - "creatorName": "me", - "message": "{\"iv\":\"krU7VnmA+HAFzatN2dIHzg==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"IALcaPyp3dT/XsVeeoYlg2ShBkSEJf74LiNA+wSme975rFMbT2KmqJ2nbisoH9Pslqw=\"}", - "actions": [{ - "createdOn": 1458774043, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "4c10410d2e548fb0b3e0b8b003aa989dce3a217b0b4f5a02b7eaf1eec0c0e976", - "action": "sent", - "amount": 10000, - "fees": 2442, - "time": 1458676045, - "addressTo": "mnBXMU5MdHcBNPcptXJPWt8DcA6tBsBxaY", - "confirmations": 121208, - "outputs": [{ - "amount": 10000, - "address": "mnBXMU5MdHcBNPcptXJPWt8DcA6tBsBxaY", - "message": "{\"iv\":\"MsqqMibQPn795kUzd9hbIQ==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"22Y3mhl8jNZuYYap+SyknpTtjZyLPvwWxrAsNOUVCCjYFW2FyHkikMEjdOHrOo1gGeQ=\"}" - }], - "proposalId": "01458670772449704cc37a-6cd1-48e9-b149-33a4f5c8969b", - "creatorName": "me", - "message": "{\"iv\":\"J+M9Yq5w/qvE2QPQj7bBAA==\",\"v\":1,\"iter\":1,\"ks\":128,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"ct\":\"wmh2Nc0WR01A7c2F4RX4pTNKyutqNS7ycmzTPR/1qFoa9PxQNxZ0Ayk6bQ7/1OF+CxQ=\"}", - "actions": [{ - "createdOn": 1458670775, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "0bc904d9a5d0302c1e96e83934c5f7bf5e393edf0775357f2d70e8503049ed77", - "action": "received", - "amount": 10000, - "fees": 2442, - "time": 1458673216, - "confirmations": 121222, - "outputs": [{ - "amount": 10000, - "address": "mgT191EgiJ28ZCH5sWNi8CR92yNDeJsK7j" - }] - }, { - "txid": "337996785b7feb3fe1be110be24feb285fbef1f1bc3fd55a1d9982dbcc5b8369", - "action": "received", - "amount": 332200, - "fees": 2580, - "time": 1457100611, - "confirmations": 125404, - "outputs": [{ - "amount": 332200, - "address": "mtADmkGAef8PWbLr6WVw7hPaAWw2D3ZLYH" - }] - }, { - "txid": "b28d2339decd0bff7eae9c8ad3a8b2bb6b699db89984888b07902c51e7e1f9a6", - "action": "received", - "amount": 55600, - "fees": 19604, - "time": 1457099388, - "confirmations": 125406, - "outputs": [{ - "amount": 55600, - "address": "mtADmkGAef8PWbLr6WVw7hPaAWw2D3ZLYH" - }] - }, { - "txid": "a34e25c55cdb5baa413de7087cfe6d0c122167cfe943be91a5e0a666897270de", - "action": "received", - "amount": 500000, - "fees": 19590, - "time": 1457096927, - "confirmations": 125411, - "outputs": [{ - "amount": 500000, - "address": "mtADmkGAef8PWbLr6WVw7hPaAWw2D3ZLYH" - }] - }, { - "txid": "b2d350f67358f1eff5f843eb6632f9f0ed4e3150c03e1f90567046143c6f4e77", - "action": "sent", - "amount": 95000, - "fees": 9275, - "time": 1455826850, - "addressTo": "mgQVwWAddjvKbqQuHbpffhnyhoxiD6Dh58", - "confirmations": 132609, - "outputs": [{ - "amount": 95000, - "address": "mgQVwWAddjvKbqQuHbpffhnyhoxiD6Dh58", - "message": null - }], - "proposalId": "0145582679356996ffe38e-cd23-4b0e-b069-afe2e4d0c0d0", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1455826796, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "f491c4f9fc7d1adb37a2afe9e99ed6024ec61423e456701e1c162d0339486252", - "action": "sent", - "amount": 10000, - "fees": 5725, - "time": 1455826577, - "addressTo": "mpbPujs9h2U8esvzF6GUiQQnaCFtXm8Hfc", - "confirmations": 132614, - "outputs": [{ - "amount": 10000, - "address": "mpbPujs9h2U8esvzF6GUiQQnaCFtXm8Hfc", - "message": null - }], - "proposalId": "014558265370960569d8b7-e9ef-4100-9bd5-41cd992927f1", - "creatorName": "me", - "message": null, - "actions": [{ - "createdOn": 1455826541, - "type": "accept", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "copayerName": "me", - "comment": null - }], - "customData": null - }, { - "txid": "4a0b79d685368ca747ebc735cf506ea9eedb3da4908d900e630351b5717db91e", - "action": "received", - "amount": 20000, - "fees": 5160, - "time": 1455752018, - "confirmations": 135802, - "outputs": [{ - "amount": 20000, - "address": "mk3kXbgkmFEkuo71HKRcCXM1szbA4QN3cn" - }] - }, { - "txid": "b147d0c2714bd1f86203d0cfe5623ed0781806bf914b9439afb8de4ad367ebc7", - "action": "received", - "amount": 100000, - "fees": 6929, - "time": 1455221488, - "confirmations": 163212, - "outputs": [{ - "amount": 100000, - "address": "mk3kXbgkmFEkuo71HKRcCXM1szbA4QN3cn" - }] - }], - // put preferences - 'f25ae222016306f9142ff0ab91151f77045183470df822d283808d077b0bb4c1': {}, - // get preferences - '6ad6c7b8372131a41f4ca547f2119e7d53d2adfd57728f1d5a776db7ebfddb5f': { - "version": "1.0.0", - "createdOn": 1463598797, - "walletId": "66d3afc9-7d76-4b25-850e-aa62fcc53a7d", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "email": null, - "language": "en", - "unit": "bit" - }, -}; diff --git a/test/helpers.js b/test/helpers.js deleted file mode 100644 index 553db161e..000000000 --- a/test/helpers.js +++ /dev/null @@ -1,262 +0,0 @@ -var mocks = {}; - -// UI-Router mock from -// https://gist.github.com/bmwant/4c8e5fee7a539dba69ace42b617d79c3 -mocks.$state = function($q) { - this.expectedTransitions = []; - this.transitionTo = function(stateName) { - if (this.expectedTransitions.length > 0) { - var expectedState = this.expectedTransitions.shift(); - if (expectedState !== stateName) { - throw Error("Expected transition to state: " + expectedState + " but transitioned to " + stateName); - } - } else { - throw Error("No more transitions were expected! Tried to transition to " + stateName); - } - console.log("Mock transition to: " + stateName); - this.current = stateName; - var deferred = $q.defer(); - var promise = deferred.promise; - deferred.resolve(); - return promise; - }; - - this.is = function(name) { - console.log('[helpers.js.24:name:]', name); //TODO - return this.current == name; - }; - this.go = this.transitionTo; - this.expectTransitionTo = function(stateName) { - this.expectedTransitions.push(stateName); - }; - - this.ensureAllTransitionsHappened = function() { - if (this.expectedTransitions.length > 0) { - throw Error("Not all transitions happened!"); - } - }; -}; - -mocks.$timeout = function(cb) { - return cb(); -}; - -mocks.modal = function() {}; -mocks.ongoingProcess = { - set: sinon.stub(), - clear: sinon.stub(), -}; - - -mocks.setProfile = function(profile) {}; -/* - * opts - */ - -var getElements = sinon.stub(); -getElements.returns([]); - -var getElement = sinon.stub(); -getElement.returns({ - getElementsByTagName: getElement, -}); - -mocks.$document = { - getElementById: getElement, -}; - -mocks.init = function(fixtures, controllerName, opts, done) { - console.log(' * Mock init()'); - opts = opts || {}; - - should.exist(controllerName, 'Provide the name of the Controller to mocks.init()'); - mocks.go = {}; - mocks.go.walletHome = sinon.stub(); - mocks.go.path = sinon.stub(); - mocks.go.is = function(name) { - return mocks.go.current == name - }; - - mocks.notification = { - success: sinon.stub(), - }; - - angular.module('stateMock', []); - angular.module('stateMock').service("$state", mocks.$state.bind()); - - module('ionic'); - module('ngLodash'); - module('angularMoment'); - module('gettext'); - module('stateMock'); - module('bwcModule', function($provide) { - console.log(' * bwcService decorator'); - $provide.decorator('bwcService', function($delegate, lodash) { - var getClient = $delegate.getClient; - - // Fix Encryption IVs - var utils = $delegate.getUtils(); - utils.SJCL.iv = 'BZQVWAP6d1e4G8Fq1rQKbA=='; - - $delegate.getClient = function(walletData, opts) { - - var bwc = new $delegate.Client(); - if (walletData) - bwc.import(walletData, { - baseUrl: opts.bwsurl || 'https://bws.bitpay.com/bws/api', - verbose: opts.verbose, - transports: ['polling'], - }); - - function createHash(method, url, args) { - var headers = JSON.stringify(bwc._getHeaders(method, url, args)); - - // Fixes BWC version... TODO - headers = headers.replace(/bwc-\d+\.\d+\.\d+/, 'bwc-2.4.0') - var x = method + url + JSON.stringify(args) + headers; - var sjcl = $delegate.getSJCL(); - return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(x)); - }; - - bwc._originalRequest = bwc._doRequest; - - bwc._doGetRequest = function(url, cb) { - url += url.indexOf('?') > 0 ? '&' : '?'; - url += 'r=' + 69321; - return this._doRequest('get', url, {}, cb); - }; - - - // Use fixtures - bwc._doRequest = function(method, url, args, cb2) { - - // find fixed response: - var hash = createHash(method, url, args); - if (lodash.isUndefined(fixtures[hash])) { - console.log('##### UNDEFINED FIXTURED ####:', hash); //TODO - console.log('##### method:', method); //TODO - console.log('##### url :', url); //TODO - console.log('##### args :', JSON.stringify(args)); //TODO - console.log('##### header:', JSON.stringify(bwc._getHeaders(method, url, args))); - - var oldURL = bwc.baseURL; - bwc.baseURL = 'http://localhost:3232/bws/api'; - - console.log('##### running local: to http://localhost:3232/bws/api'); - bwc._originalRequest(method, url, args, function(err, response) { - console.log("### RESPONSE: " + hash + "\n", JSON.stringify(response)); //TODO - bwc.baseURL = oldURL; - return cb2(null, response); - }); - - } else { - console.log('Using fixture: ' + hash.substr(0, 6) + ' for: ' + url); - return cb2(null, fixtures[hash]); - } - }; - - return bwc; - }; - return $delegate; - }); - }); - - module('copayApp.services', { - $modal: mocks.modal, - $timeout: mocks.$timeout, - $state: mocks.$state, - }); - module('copayApp.controllers'); - - inject(function($rootScope, $controller, $injector, lodash, _configService_, _profileService_, _storageService_) { - scope = $rootScope.$new(); - storageService = _storageService_; - - // Set up the mock http service responses - $httpBackend = $injector.get('$httpBackend'); - - // backend definition common for all tests - $httpBackend.when('GET', 'https://bitpay.com/api/rates') - .respond({ - code: "BTC", - name: "Bitcoin", - rate: 1 - }, { - code: "USD", - name: "US Dollar", - rate: 452.92 - }); - - $httpBackend.whenGET(/views.*/).respond(200, ''); - - - _configService_.get(function() { - function startController() { - console.log(' * starting Controller:', controllerName); - ctrl = $controller(controllerName, { - $scope: scope, - $modal: mocks.modal, - ongoingProcess: mocks.ongoingProcess, - notification: mocks.notification, - configService: _configService_, - profileService: _profileService_, - go: mocks.go, - $document: mocks.$document, - }); - }; - - if (opts.initController) - startController(); - - - if (opts.loadStorage) { - lodash.each(opts.loadStorage, function(v, k) { - localStorage.setItem(k, v); - }); - } - - if (opts.loadProfile) { - - localStorage.setItem('profile', JSON.stringify(opts.loadProfile)); - - _profileService_.loadAndBindProfile(function(err) { - should.not.exist(err, err); - if (!opts.initController) - startController(); - done(); - }); - } else { - if (opts.noProfile){ - return done(); - } - - _profileService_.create({ - noWallet: true - }, function(err) { - should.not.exist(err, err); - if (opts.noDisclaimer){ - return done(); - } - _profileService_.setDisclaimerAccepted(function() { - if (!opts.initController) - startController(); - - done(); - }); - }); - } - }); - }); -}; - -mocks.clear = function(opts, done) { - opts = opts || {}; - - if (!opts.keepStorage) { - // Adds walletService's module dependencies - console.log(' * deleting localstorage'); - localStorage.clear(); - } - - done(); -}; diff --git a/test/karma.conf.js b/test/karma.conf.js deleted file mode 100644 index 8274b222f..000000000 --- a/test/karma.conf.js +++ /dev/null @@ -1,115 +0,0 @@ -// Karma configuration -// Generated on Thu Mar 12 2015 18:13:33 GMT-0300 (ART) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '..', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['mocha', 'chai', 'sinon'], - - - // list of files / patterns to load in the browser - files: [ - 'bower_components/qrcode-generator/js/qrcode.js', - 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', - 'bower_components/moment/min/moment-with-locales.js', - 'bower_components/ionic/release/js/ionic.bundle.js', - 'bower_components/angular-moment/angular-moment.js', - 'bower_components/ng-lodash/build/ng-lodash.js', - 'bower_components/angular-qrcode/angular-qrcode.js', - 'bower_components/angular-gettext/dist/angular-gettext.js', - 'bower_components/ng-csv/build/ng-csv.js', - 'bower_components/ionic-toast/dist/ionic-toast.bundle.min.js', - 'bower_components/angular-clipboard/angular-clipboard.js', - 'bower_components/angular-mocks/angular-mocks.js', - 'angular-pbkdf2/angular-pbkdf2.js', - 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js', - 'src/js/**/*.js', - 'test/helpers.js', - 'test/**/*.js' - ], - - - // list of files to exclude - exclude: [ - 'src/js/translations.js', - // 'src/js/version.js', - 'test/karma.conf.js', - 'test/old/*' - ], - - client: { - mocha: { - // reporter: 'html', // change Karma's debug.html to the mocha web reporter - ui: 'tdd' - } - }, - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - 'src/js/**/*.js': ['coverage'] - }, - - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['mocha', 'coverage'], - - // optionally, configure the reporter - coverageReporter: { - dir: 'coverage/', - reporters: [{ - type: 'html', - subdir: 'report-html' - }, { - type: 'lcov', - subdir: 'report-lcov' - }, { - type: 'text-summary' - }] - }, - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['PhantomJS'], - - plugins: [ - 'karma-mocha-reporter', - 'karma-coverage', - 'karma-mocha', - 'karma-chai', - 'karma-sinon', - 'karma-phantomjs-launcher', - 'karma-chrome-launcher', - ], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false - }); -}; diff --git a/test/old/controllersSpec.js b/test/old/controllersSpec.js deleted file mode 100644 index f48835b71..000000000 --- a/test/old/controllersSpec.js +++ /dev/null @@ -1,1112 +0,0 @@ -// -// test/unit/controllers/controllersSpec.js -// - -var sinon = require('sinon'); - -// Replace saveAs plugin -saveAs = function(blob, filename) { - saveAsLastCall = { - blob: blob, - filename: filename - }; -}; - -describe("Unit: Controllers", function() { - config.plugins.LocalStorage = true; - config.plugins.GoogleDrive = null; - config.plugins.InsightStorage = null; - config.plugins.EncryptedInsightStorage = null; - - var anAddr = 'mkfTyEk7tfgV611Z4ESwDDSZwhsZdbMpVy'; - var anAmount = 1000; - var aComment = 'hola'; - - - - var invalidForm = { - $invalid: true - }; - - var scope; - var server; - - beforeEach(module('copayApp')); - beforeEach(module('copayApp.controllers')); - beforeEach(module(function($provide) { - $provide.value('request', { - 'get': function(_, cb) { - cb(null, null, [{ - name: 'USD Dollars', - code: 'USD', - rate: 2 - }]); - } - }); - })); - - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - $rootScope.safeUnspentCount = 1; - - // - // TODO Use the REAL wallet, and stub only networking and DB components! - // - - var w = {}; - w.id = 1234; - w.isComplete = sinon.stub().returns(true); - w.isShared = sinon.stub().returns(true); - w.privateKey = {}; - w.settings = { - unitToSatoshi: 100, - unitDecimals: 2, - alternativeName: 'US Dollar', - alternativeIsoCode: 'USD', - }; - w.addressBook = { - 'juan': '1', - }; - w.totalCopayers = 2; - w.getMyCopayerNickname = sinon.stub().returns('nickname'); - w.getMyCopayerId = sinon.stub().returns('id'); - w.privateKey.toObj = sinon.stub().returns({ - wallet: 'mock' - }); - w.getSecret = sinon.stub().returns('secret'); - w.getName = sinon.stub().returns('fakeWallet'); - w.exportEncrypted = sinon.stub().returns('1234567'); - w.getTransactionHistory = sinon.stub().yields(null); - w.getNetworkName = sinon.stub().returns('testnet'); - - w.spend = sinon.stub().yields(null); - w.sendTxProposal = sinon.stub(); - w.broadcastTx = sinon.stub().yields(null); - w.requiresMultipleSignatures = sinon.stub().returns(true); - w.getTxProposals = sinon.stub().returns([1, 2, 3]); - w.getPendingTxProposals = sinon.stub().returns( - [{ - isPending: true - }] - ); - w.getId = sinon.stub().returns(1234); - w.on = sinon.stub().yields({ - 'e': 'errmsg', - 'loading': false - }); - w.sizes = sinon.stub().returns({ - tota: 1234 - }); - w.getBalance = sinon.stub().returns(10000); - w.publicKeyRing = sinon.stub().yields(null); - w.publicKeyRing.nicknameForCopayer = sinon.stub().returns('nickcopayer'); - w.updateFocusedTimestamp = sinon.stub().returns(1415804323); - w.getAddressesInfo = sinon.stub().returns([{ - addressStr: "2MxvwvfshZxw4SkkaJZ8NDKLyepa9HLMKtu", - isChange: false - }]); - - - var iden = {}; - iden.getLastFocusedWallet = sinon.stub().returns(null); - iden.getWallets = sinon.stub().returns([w]); - iden.getWalletById = sinon.stub().returns(w); - iden.getName = sinon.stub().returns('name'); - iden.deleteWallet = sinon.stub(); - iden.close = sinon.stub().returns(null); - - - $rootScope.wallet = w; - $rootScope.iden = iden; - })); - - describe('Create Controller', function() { - var c; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - c = $controller('CreateController', { - $scope: scope, - }); - })); - - describe('#getNumber', function() { - it('should return an array of n undefined elements', function() { - var n = 5; - var array = scope.getNumber(n); - expect(array.length).equal(n); - }); - }); - describe('#create', function() { - it('should work with invalid form', function() { - scope.create(invalidForm); - }); - }); - }); - - - describe('Create Profile Controller', function() { - var c, confService, idenService; - beforeEach(inject(function($controller, $rootScope, configService, identityService) { - scope = $rootScope.$new(); - confService = configService; - idenService = identityService; - c = $controller('CreateProfileController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(c); - }); - - it('#init', function() { - scope.init(); - }); - - it('#clear', function() { - scope.clear(); - }); - - it('#saveSettings', function() { - var old = confService.set; - confService.set = sinon.stub().returns(null); - scope.saveSettings(); - confService.set.calledOnce.should.be.true; - confService.set = old; - }); - - it('#createProfile', function() { - var old = scope.saveSettings; - scope.saveSettings = sinon.stub().returns(null); - scope.createProfile(); - scope.saveSettings.calledOnce.should.be.true; - scope.saveSettings = old; - }); - - it('#_doCreateProfile', function() { - var old = idenService.create; - idenService.create = sinon.stub().returns(null); - scope._doCreateProfile('myemail@domain.com', 'password'); - idenService.create.calledOnce.should.be.true; - idenService.create = old; - }); - - it('#createDefaultWallet', function() { - var old = idenService.createDefaultWallet; - idenService.createDefaultWallet = sinon.stub().returns(null); - scope.createDefaultWallet(); - idenService.createDefaultWallet.calledOnce.should.be.true; - idenService.createDefaultWallet = old; - }); - - - - }); - - describe('Receive Controller', function() { - var c; - var rootScope; - beforeEach(inject(function($controller, $rootScope) { - rootScope = $rootScope; - scope = $rootScope.$new(); - c = $controller('ReceiveController', { - $scope: scope, - }); - - - var createW = function(N, conf) { - - var c = JSON.parse(JSON.stringify(conf || walletConfig)); - if (!N) N = c.totalCopayers; - - var mainPrivateKey = new copay.PrivateKey({ - networkName: walletConfig.networkName - }); - var mainCopayerEPK = mainPrivateKey.deriveBIP45Branch().extendedPublicKeyString(); - c.privateKey = mainPrivateKey; - - c.publicKeyRing = new copay.PublicKeyRing({ - networkName: c.networkName, - requiredCopayers: Math.min(N, c.requiredCopayers), - totalCopayers: N, - }); - c.publicKeyRing.addCopayer(mainCopayerEPK); - - c.publicKeyRing.getAddressesOrdered = sinon.stub().returns(null); - - c.txProposals = new copay.TxProposals({ - networkName: c.networkName, - }); - - c.blockchain = new Blockchain(walletConfig.blockchain); - - c.network = sinon.stub(); - c.network.setHexNonce = sinon.stub(); - c.network.setHexNonces = sinon.stub(); - c.network.getHexNonce = sinon.stub(); - c.network.getHexNonces = sinon.stub(); - c.network.peerFromCopayer = sinon.stub().returns('xxxx'); - c.network.send = sinon.stub(); - - c.addressBook = { - '2NFR2kzH9NUdp8vsXTB4wWQtTtzhpKxsyoJ': { - label: 'John', - copayerId: '026a55261b7c898fff760ebe14fd22a71892295f3b49e0ca66727bc0a0d7f94d03', - createdTs: 1403102115, - hidden: false - }, - '2MtP8WyiwG7ZdVWM96CVsk2M1N8zyfiVQsY': { - label: 'Jennifer', - copayerId: '032991f836543a492bd6d0bb112552bfc7c5f3b7d5388fcbcbf2fbb893b44770d7', - createdTs: 1403103115, - hidden: false - } - }; - - c.networkName = walletConfig.networkName; - c.version = '0.0.1'; - - c.generateAddress = sinon.stub().returns({}); - - c.balanceInfo = {}; - - return new Wallet(c); - }; - - $rootScope.wallet = createW(); - $rootScope.wallet.balanceInfo = {}; - })); - - it('should exist', function() { - should.exist(c); - }); - - it('#init', function() { - scope.init(); - rootScope.title.should.be.equal('Receive'); - }); - - it('should call setAddressList', function() { - scope.setAddressList(); - expect(scope.addresses).to.be.empty; - scope.toggleShowAll(); - scope.setAddressList(); - expect(scope.addresses).to.be.empty; - }); - - it('#newAddr', function() { - rootScope.wallet.generateAddress = sinon.stub().returns({}); - scope.newAddr(); - rootScope.wallet.generateAddress.calledOnce.should.be.true; - }); - }); - - describe('History Controller', function() { - var ctrl; - beforeEach(inject(function($controller, $rootScope) { - - scope = $rootScope.$new(); - scope.wallet = null; - scope.getTransactions = sinon.stub(); - ctrl = $controller('HistoryController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - - it('should have a HistoryController controller', function() { - expect(scope.loading).equal(false); - }); - - // this tests has no sense: getTransaction is async - it.skip('should return an empty array of tx from insight', function() { - scope.getTransactions(); - expect(scope.blockchain_txs).to.be.empty; - }); - }); - - - - describe('Profile Controller', function() { - var ctrl, bkpService, idenService; - beforeEach(inject(function($controller, $rootScope, backupService, identityService) { - scope = $rootScope.$new(); - bkpService = backupService; - idenService = identityService; - ctrl = $controller('ProfileController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - - it('#downloadProfileBackup', function() { - var old = bkpService.profileDownload; - bkpService.profileDownload = sinon.stub().returns(null); - scope.downloadProfileBackup(); - bkpService.profileDownload.calledOnce.should.be.true; - bkpService.profileDownload = old; - }); - - it('#viewProfileBackup', function() { - var old = bkpService.profileEncrypted; - bkpService.profileEncrypted = sinon.stub().returns(null); - scope.viewProfileBackup(); - //bkpService.profileEncrypted.calledOnce.should.be.true; - bkpService.profileEncrypted = old; - }); - - it('#copyProfileBackup', function() { - var old = bkpService.profileEncrypted; - bkpService.profileEncrypted = sinon.stub().returns(null); - - window.cordova = { - plugins: { - clipboard: { - copy: function(e) { - return e; - } - } - } - }; - - window.plugins = { - toast: { - showShortCenter: function(e) { - return e; - } - } - }; - - scope.copyProfileBackup(); - bkpService.profileEncrypted.calledOnce.should.be.true; - bkpService.profileEncrypted = old; - }); - - it('#sendProfileBackup', function() { - var old = bkpService.profileEncrypted; - bkpService.profileEncrypted = sinon.stub().returns(null); - - window.plugin = { - email: { - open: function(e) { - return e; - } - } - }; - - window.plugins = { - toast: { - showShortCenter: function(e) { - return e; - } - } - }; - - scope.sendProfileBackup(); - bkpService.profileEncrypted.calledOnce.should.be.true; - bkpService.profileEncrypted = old; - }); - - it('#deleteProfile', function() { - var old = idenService.deleteProfile; - idenService.deleteProfile = sinon.stub().returns(null); - scope.deleteProfile(); - idenService.deleteProfile.calledOnce.should.be.true; - idenService.deleteProfile = old; - }); - - - }); - - - - describe('Send Controller', function() { - var scope, form, sendForm, sendCtrl, rootScope; - beforeEach(angular.mock.inject(function($compile, $rootScope, $controller, rateService, notification) { - scope = $rootScope.$new(); - rootScope = $rootScope; - scope.rateService = rateService; - var element = angular.element( - '
' + - '' + - '' + - '
' - ); - scope.model = { - newaddress: null, - newlabel: null, - _address: null, - _amount: null - }; - $compile(element)(scope); - - var element2 = angular.element( - '
' + - '' + - '' + - '' + - '' + - '
' - ); - $compile(element2)(scope); - sendCtrl = $controller('SendController', { - $scope: scope, - $modal: {}, - }); - scope.init(); - scope.$digest(); - form = scope.form; - sendForm = scope.form2; - scope.sendForm = sendForm; - })); - - it('should have a SendController controller', function() { - should.exist(scope.submitForm); - }); - - it('should have a title', function() { - expect(scope.title); - }); - - it('#setError', function() { - scope.setError('my error'); - expect(scope.error); - }); - - it('#setFromPayPro', function() { - var old = rootScope.wallet.fetchPaymentRequest - rootScope.wallet.fetchPaymentRequest = sinon.stub().returns(null); - scope.setFromPayPro('newURL'); - rootScope.wallet.fetchPaymentRequest.calledOnce.should.be.true; - rootScope.wallet.fetchPaymentRequest = old; - }); - - - - it('should validate address with network', function() { - form.newaddress.$setViewValue('mkfTyEk7tfgV611Z4ESwDDSZwhsZdbMpVy'); - expect(form.newaddress.$invalid).to.equal(false); - }); - - it('should not validate address with other network', function() { - form.newaddress.$setViewValue('1JqniWpWNA6Yvdivg3y9izLidETnurxRQm'); - expect(form.newaddress.$invalid).to.equal(true); - }); - - it('should not validate random address', function() { - form.newaddress.$setViewValue('thisisaninvalidaddress'); - expect(form.newaddress.$invalid).to.equal(true); - }); - - it('should validate label', function() { - form.newlabel.$setViewValue('John'); - expect(form.newlabel.$invalid).to.equal(false); - }); - - it('should not validate label', function() { - expect(form.newlabel.$invalid).to.equal(true); - }); - - it('should create a transaction proposal with given values', inject(function($timeout) { - sendForm.address.$setViewValue(anAddr); - sendForm.amount.$setViewValue(anAmount); - sendForm.comment.$setViewValue(aComment); - - var w = scope.wallet; - scope.submitForm(sendForm); - - $timeout.flush(); - sinon.assert.callCount(w.spend, 1); - sinon.assert.callCount(w.broadcastTx, 0); - var spendArgs = w.spend.getCall(0).args[0]; - spendArgs.toAddress.should.equal(anAddr); - spendArgs.amountSat.should.equal(anAmount * scope.wallet.settings.unitToSatoshi); - spendArgs.comment.should.equal(aComment); - })); - - - it('should handle big values in 100 BTC', inject(function($timeout) { - var old = scope.wallet.settings.unitToSatoshi; - scope.wallet.settings.unitToSatoshi = 100000000; - sendForm.address.$setViewValue(anAddr); - sendForm.amount.$setViewValue(100); - sendForm.address.$setViewValue(anAddr); - - scope.updateTxs = sinon.spy(); - scope.submitForm(sendForm); - var w = scope.wallet; - $timeout.flush(); - w.spend.getCall(0).args[0].amountSat.should.equal(100 * scope.wallet.settings.unitToSatoshi); - scope.wallet.settings.unitToSatoshi = old; - })); - - - it('should handle big values in 5000 BTC', inject(function($rootScope, $timeout) { - var w = scope.wallet; - w.requiresMultipleSignatures = sinon.stub().returns(true); - - - var old = $rootScope.wallet.settings.unitToSatoshi; - $rootScope.wallet.settings.unitToSatoshi = 100000000; - sendForm.address.$setViewValue(anAddr); - sendForm.amount.$setViewValue(5000); - scope.submitForm(sendForm); - $timeout.flush(); - - w.spend.getCall(0).args[0].amountSat.should.equal(5000 * $rootScope.wallet.settings.unitToSatoshi); - $rootScope.wallet.settings.unitToSatoshi = old; - })); - - it('should convert bits amount to fiat', function(done) { - scope.rateService.whenAvailable(function() { - sendForm.amount.$setViewValue(1e6); - scope.$digest(); - expect(scope._amount).to.equal(1e6); - expect(scope.__alternative).to.equal(2); - done(); - }); - }); - it('should convert fiat to bits amount', function(done) { - scope.rateService.whenAvailable(function() { - sendForm.alternative.$setViewValue(2); - scope.$digest(); - expect(scope.__alternative).to.equal(2); - expect(scope._amount).to.equal(1e6); - done(); - }); - }); - - it('receive from uri using bits', inject(function() { - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=1.018085'); - expect(sendForm.amount.$modelValue).to.equal(1018085); - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=1.01808500'); - expect(sendForm.amount.$modelValue).to.equal(1018085); - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=0.29133585'); - expect(sendForm.amount.$modelValue).to.equal(291335.85); - })); - - it('receive from uri using BTC', inject(function($rootScope) { - var old = $rootScope.wallet.settings.unitToSatoshi; - var old_decimals = $rootScope.wallet.settings.unitDecimals; - $rootScope.wallet.settings.unitToSatoshi = 100000000; - $rootScope.wallet.settings.unitDecimals = 8; - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=1.018085'); - expect(sendForm.amount.$modelValue).to.equal(1.018085); - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=1.01808500'); - expect(sendForm.amount.$modelValue).to.equal(1.018085); - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=0.29133585'); - expect(sendForm.amount.$modelValue).to.equal(0.29133585); - sendForm.address.$setViewValue('bitcoin:mxf5psDyA8EQVzb2MZ7MkDWiXuAuWWCRMB?amount=0.1'); - expect(sendForm.amount.$modelValue).to.equal(0.1); - $rootScope.wallet.settings.unitToSatoshi = old; - $rootScope.wallet.settings.unitDecimals = old_decimals; - })); - }); - - describe("Unit: Version Controller", function() { - var scope, $httpBackendOut; - var GH = 'https://api.github.com/repos/bitpay/copay/tags'; - beforeEach(inject(function($controller, $injector) { - $httpBackend = $injector.get('$httpBackend'); - $httpBackend.when('GET', GH) - .respond([{ - name: "v100.1.6", - zipball_url: "https://api.github.com/repos/bitpay/copay/zipball/v0.0.6", - tarball_url: "https://api.github.com/repos/bitpay/copay/tarball/v0.0.6", - commit: { - sha: "ead7352bf2eca705de58d8b2f46650691f2bc2c7", - url: "https://api.github.com/repos/bitpay/copay/commits/ead7352bf2eca705de58d8b2f46650691f2bc2c7" - } - }]); - })); - - var rootScope; - beforeEach(inject(function($controller, $rootScope) { - rootScope = $rootScope; - scope = $rootScope.$new(); - headerCtrl = $controller('VersionController', { - $scope: scope, - }); - })); - - afterEach(function() { - $httpBackend.verifyNoOutstandingExpectation(); - $httpBackend.verifyNoOutstandingRequest(); - }); - - - - it('should hit github for version', function() { - $httpBackend.expectGET(GH); - scope.$apply(); - $httpBackend.flush(); - }); - - it('should check version ', inject(function($injector) { - notification = $injector.get('notification'); - var spy = sinon.spy(notification, 'version'); - $httpBackend.expectGET(GH); - scope.$apply(); - $httpBackend.flush(); - spy.calledOnce.should.equal(true); - })); - - it('should check blockChainStatus', function() { - $httpBackend.expectGET(GH); - $httpBackend.flush(); - rootScope.insightError = 1; - scope.$apply(); - expect(rootScope.insightError).equal(1); - scope.$apply(); - expect(rootScope.insightError).equal(1); - scope.$apply(); - }); - }); - - describe("Unit: Sidebar Controller", function() { - beforeEach(inject(function($controller, $rootScope) { - rootScope = $rootScope; - scope = $rootScope.$new(); - headerCtrl = $controller('SidebarController', { - $scope: scope, - }); - })); - - it('should call sign out', function() { - scope.signout(); - rootScope.iden.close.calledOnce.should.be.true; - }); - }); - - describe("Head Controller", function() { - var scope, ctrl, rootScope, idenService, balService; - beforeEach(inject(function($controller, $rootScope, identityService, balanceService) { - rootScope = $rootScope; - idenService = identityService; - balService = balanceService; - scope = $rootScope.$new(); - ctrl = $controller('HeadController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - - it('should call sign out', function() { - var old = idenService.signout; - idenService.signout = sinon.stub().returns(null); - scope.signout(); - idenService.signout.calledOnce.should.be.true; - idenService.signout = old; - }); - - it('should call refresh', function() { - var old = rootScope.wallet.sendWalletReady; - rootScope.wallet.sendWalletReady = sinon.stub().returns(null); - balService.clearBalanceCache = sinon.stub().returns(null); - scope.refresh(); - rootScope.wallet.sendWalletReady.calledOnce.should.be.true; - rootScope.wallet.sendWalletReady = old; - }); - - }); - - describe('Send Controller', function() { - var sendCtrl, form; - beforeEach(inject(function($compile, $rootScope, $controller) { - scope = $rootScope.$new(); - $rootScope.availableBalance = 123456; - - var element = angular.element( - '
' + - '' + - '
' - ); - scope.model = { - amount: null - }; - $compile(element)(scope); - scope.$digest(); - form = scope.form; - - sendCtrl = $controller('SendController', { - $scope: scope, - $modal: {}, - }); - })); - - it('should have a SendController', function() { - expect(scope.isMobile).not.to.equal(null); - }); - it('should autotop balance correctly', function() { - scope.setTopAmount(form); - form.amount.$setViewValue(123356); - expect(scope.amount).to.equal(123356); - expect(form.amount.$invalid).to.equal(false); - expect(form.amount.$pristine).to.equal(false); - }); - }); - - describe('Import Controller', function() { - var ctrl; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - ctrl = $controller('ImportController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - it('import status', function() { - expect(scope.importStatus).equal('Importing wallet - Reading backup...'); - }); - }); - - // TODO: fix this test - describe.skip('Home Controller', function() { - var ctrl; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - ctrl = $controller('HomeController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - describe('#open', function() { - it('should work with invalid form', function() { - scope.open(invalidForm); - }); - }); - }); - - describe('SignOut Controller', function() { - var ctrl; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - ctrl = $controller('signOutController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - }); - - describe('Settings Controller', function() { - var what; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - what = $controller('SettingsController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(what); - }); - }); - - describe('Copayers Controller', function() { - var saveDownload = null; - var ctrl, rootScope, idenService; - beforeEach(inject(function($controller, $rootScope, identityService) { - scope = $rootScope.$new(); - rootScope = $rootScope; - idenService = identityService; - ctrl = $controller('CopayersController', { - $scope: scope, - $modal: {}, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - - it('#init', function() { - var old = scope.updateList; - scope.updateList = sinon.stub().returns(null); - scope.init(); - scope.updateList.callCount.should.be.equal(3); //why 3 ?????? - scope.updateList = old; - }); - - it('#updateList', function() { - var old = rootScope.wallet.getRegisteredPeerIds; - rootScope.wallet.getRegisteredPeerIds = sinon.stub().returns(null); - rootScope.wallet.removeListener = sinon.stub().returns(null); - scope.updateList(); - rootScope.wallet.getRegisteredPeerIds.callCount.should.be.equal(1); - rootScope.wallet.getRegisteredPeerIds = old; - }); - - it('#deleteWallet', inject(function($timeout) { - var old = idenService.deleteWallet; - idenService.deleteWallet = sinon.stub().returns(null); - scope.deleteWallet(); - $timeout.flush(); - idenService.deleteWallet.callCount.should.be.equal(1); - idenService.deleteWallet = old; - })); - - }); - - describe('Join Controller', function() { - var ctrl; - beforeEach(inject(function($controller, $rootScope) { - scope = $rootScope.$new(); - ctrl = $controller('JoinController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - describe('#join', function() { - it('should work with invalid form', function() { - scope.join(invalidForm); - }); - }); - }); - - describe('paymentUriController Controller', function() { - var what; - beforeEach(inject(function($controller, $rootScope, $location) { - scope = $rootScope.$new(); - var routeParams = { - data: 'bitcoin:19mP9FKrXqL46Si58pHdhGKow88SUPy1V8' - }; - var query = { - amount: 0.1, - message: "a bitcoin donation" - }; - what = $controller('paymentUriController', { - $scope: scope, - $routeParams: routeParams, - $location: { - search: function() { - return query; - } - } - }); - })); - - it('should exist', function() { - should.exist(what); - }); - - it('should parse url correctly', function() { - should.exist(what); - should.exist(scope.pendingPayment); - scope.pendingPayment.should.equal('bitcoin:19mP9FKrXqL46Si58pHdhGKow88SUPy1V8?amount=0.1&message=a bitcoin donation'); - }); - }); - - describe('Warning Controller', function() { - var ctrl, idenService; - beforeEach(inject(function($controller, $rootScope, identityService) { - scope = $rootScope.$new(); - idenService = identityService; - ctrl = $controller('WarningController', { - $scope: scope, - }); - })); - - it('should exist', function() { - should.exist(ctrl); - }); - - it('#signout', function() { - var old = idenService.signout; - idenService.signout = sinon.stub().returns(null); - scope.signout(); - idenService.signout.calledOnce.should.be.true; - idenService.signout = old; - }); - - }); - - describe('More Controller', function() { - var ctrl, modalCtrl, rootScope, idenService, bkpService; - beforeEach(inject(function($controller, $rootScope, backupService, identityService) { - scope = $rootScope.$new(); - rootScope = $rootScope; - idenService = identityService; - bkpService = backupService; - ctrl = $controller('MoreController', { - $scope: scope - }); - saveAsLastCall = null; - - })); - - it('Backup Wallet controller #download', function() { - var w = scope.wallet; - expect(saveAsLastCall).equal(null); - scope.downloadWalletBackup(); - - expect(saveAsLastCall.blob.size).equal(7); - expect(saveAsLastCall.blob.type).equal('text/plain;charset=utf-8'); - }); - - it('Backup Wallet controller should name backup correctly for multiple copayers', function() { - var w = scope.wallet; - expect(saveAsLastCall).equal(null); - scope.downloadWalletBackup(); - expect(saveAsLastCall.filename).equal('nickname-fakeWallet-keybackup.json.aes'); - }); - - it('Backup Wallet controller should name backup correctly for 1-1 wallet', function() { - var w = scope.wallet; - expect(saveAsLastCall).equal(null); - scope.wallet.totalCopayers = 1; - scope.downloadWalletBackup(); - expect(saveAsLastCall.filename).equal('fakeWallet-keybackup.json.aes'); - }); - - it('Delete a wallet', inject(function($timeout) { - var w = scope.wallet; - - scope.deleteWallet(); - $timeout.flush(); - scope.$digest(); - scope.iden.deleteWallet.calledOnce.should.equal(true); - scope.iden.deleteWallet.getCall(0).args[0].should.equal(w.getId()); - })); - - it('#save', function() { - var old = rootScope.wallet.changeSettings; - rootScope.wallet.changeSettings = sinon.stub().returns(null); - scope.selectedUnit = {}; - scope.save(); - rootScope.wallet.changeSettings.calledOnce.should.equal.true; - rootScope.wallet.changeSettings = old; - }); - - it('#purge checking balance', function() { - var old = rootScope.wallet.purgeTxProposals; - rootScope.wallet.purgeTxProposals = sinon.stub().returns(true); - scope.purge(); - rootScope.wallet.purgeTxProposals.calledOnce.should.equal.true; - rootScope.wallet.purgeTxProposals = old; - }); - - it('#purge without checking balance', function() { - var old = rootScope.wallet.purgeTxProposals; - rootScope.wallet.purgeTxProposals = sinon.stub().returns(false); - scope.purge(); - rootScope.wallet.purgeTxProposals.calledOnce.should.equal.true; - rootScope.wallet.purgeTxProposals = old; - }); - - it('#updateIndexes', function() { - var old = rootScope.wallet.purgeTxProposals; - rootScope.wallet.updateIndexes = sinon.stub().yields(); - scope.updateIndexes(); - rootScope.wallet.updateIndexes.calledOnce.should.equal.true; - rootScope.wallet.updateIndexes = old; - }); - - it('#updateIndexes return error', function() { - var old = rootScope.wallet.purgeTxProposals; - rootScope.wallet.updateIndexes = sinon.stub().yields('error'); - scope.updateIndexes(); - rootScope.wallet.updateIndexes.calledOnce.should.equal.true; - rootScope.wallet.updateIndexes = old; - }); - - it('#deleteWallet', inject(function($timeout) { - var old = idenService.deleteWallet; - idenService.deleteWallet = sinon.stub().yields(null); - scope.deleteWallet(); - $timeout.flush(); - idenService.deleteWallet.calledOnce.should.equal.true; - scope.loading.should.be.false; - idenService.deleteWallet = old; - })); - - it('#deleteWallet with error', inject(function($timeout) { - var old = idenService.deleteWallet; - idenService.deleteWallet = sinon.stub().yields('error'); - scope.deleteWallet(); - $timeout.flush(); - idenService.deleteWallet.calledOnce.should.equal.true; - scope.error.should.be.equal('error'); - idenService.deleteWallet = old; - })); - - it('#viewWalletBackup', function() { - var old = bkpService.walletEncrypted; - bkpService.walletEncrypted = sinon.stub().returns('backup0001'); - scope.viewWalletBackup(); - bkpService.walletEncrypted.calledOnce.should.equal.true; - bkpService.walletEncrypted = old; - }); - - it('#copyWalletBackup', function() { - var old = bkpService.walletEncrypted; - bkpService.walletEncrypted = sinon.stub().returns('backup0001'); - window.cordova = { - plugins: { - clipboard: { - copy: function(e) { - return e; - } - } - } - }; - - window.plugins = { - toast: { - showShortCenter: function(e) { - return e; - } - } - }; - scope.copyWalletBackup(); - bkpService.walletEncrypted.calledOnce.should.equal.true; - bkpService.walletEncrypted = old; - }); - - it('#sendWalletBackup', function() { - var old = bkpService.walletEncrypted; - bkpService.walletEncrypted = sinon.stub().returns('backup0001'); - - window.plugins = { - toast: { - showShortCenter: function(e) { - return e; - } - } - }; - - window.plugin = { - email: { - open: function(e) { - return e; - } - } - }; - scope.sendWalletBackup(); - bkpService.walletEncrypted.calledOnce.should.equal.true; - bkpService.walletEncrypted = old; - }); - - }); - -}); diff --git a/test/old/directivesSpec.js b/test/old/directivesSpec.js deleted file mode 100644 index 507e3c159..000000000 --- a/test/old/directivesSpec.js +++ /dev/null @@ -1,250 +0,0 @@ -'use strict'; -// -// test/unit/directives/directivesSpec.js -// -describe("Unit: Testing Directives", function() { - - var $scope, form; - - beforeEach(module('copayApp.directives')); - beforeEach(inject(function($rootScope) { - - var w = {}; - w.isComplete = sinon.stub().returns(true); - w.privateKey = {}; - w.settings = { - unitToSatoshi: 100, - unitDecimals: 2, - alternativeName: 'US Dollar', - alternativeIsoCode: 'USD', - }; - w.addressBook = { - 'juan': '1', - }; - w.totalCopayers = 2; - w.getMyCopayerNickname = sinon.stub().returns('nickname'); - w.getMyCopayerId = sinon.stub().returns('id'); - w.privateKey.toObj = sinon.stub().returns({ - wallet: 'mock' - }); - w.getSecret = sinon.stub().returns('secret'); - w.getName = sinon.stub().returns('fakeWallet'); - w.exportEncrypted = sinon.stub().returns('1234567'); - w.getTransactionHistory = sinon.stub().yields({}); - w.getNetworkName = sinon.stub().returns('testnet'); - - w.createTx = sinon.stub().yields(null); - w.sendTx = sinon.stub().yields(null); - w.requiresMultipleSignatures = sinon.stub().returns(true); - w.getTxProposals = sinon.stub().returns([1,2,3]); - $rootScope.wallet = w; - })); - - describe('Validate Address', function() { - beforeEach(inject(function($compile, $rootScope) { - $scope = $rootScope; - var element = angular.element( - '
' + - '' + - '
' - ); - $scope.model = { - address: null - }; - $compile(element)($scope); - $scope.$digest(); - form = $scope.form; - })); - - it('should validate with network', inject(function($rootScope) { - $rootScope.wallet.getNetworkName = sinon.stub().returns('testnet'); - form.address.$setViewValue('mkfTyEk7tfgV611Z4ESwDDSZwhsZdbMpVy'); - expect(form.address.$invalid).to.equal(false); - })); - it('should not validate with other network', inject(function($rootScope) { - $rootScope.wallet.getNetworkName = sinon.stub().returns('livenet'); - form.address.$setViewValue('mkfTyEk7tfgV611Z4ESwDDSZwhsZdbMpVy'); - expect(form.address.$invalid).to.equal(true); - })); - it('should not validate random', function() { - form.address.$setViewValue('thisisaninvalidaddress'); - expect(form.address.$invalid).to.equal(true); - }); - }); - - describe('Validate Amount', function() { - describe('Unit: bits', function() { - beforeEach(inject(function($compile, $rootScope) { - $scope = $rootScope; - var element = angular.element( - '
' + - '' + - '
' - ); - $scope.model = { - amount: null - }; - $compile(element)($scope); - $scope.$digest(); - form = $scope.form; - })); - it('should validate', function() { - form.amount.$setViewValue(100); - expect(form.amount.$invalid).to.equal(false); - form.amount.$setViewValue(800); - expect(form.amount.$invalid).to.equal(false); - form.amount.$setViewValue(900); - - }); - - it('should not validate', function() { - form.amount.$setViewValue(0); - expect(form.amount.$invalid).to.equal(true); - form.amount.$setViewValue(999999999999); - expect(form.amount.$invalid).to.equal(true); - }); - }); - - describe('Unit: BTC', function() { - beforeEach(inject(function($compile, $rootScope) { - $scope = $rootScope; - var w = $rootScope.wallet; - w.settings.unitToSatoshi = 100000000; - w.settings.unitName = 'BTC'; - w.settings.unitDecimals = 8; - - $rootScope.availableBalance = 0.04; - var element = angular.element( - '
' + - '' + - '
' - ); - $scope.model = { - amount: null - }; - $compile(element)($scope); - $scope.$digest(); - form = $scope.form; - })); - - it('should validate', function() { - form.amount.$setViewValue(0.01); - expect(form.amount.$invalid).to.equal(false); - form.amount.$setViewValue(0.039); - expect(form.amount.$invalid).to.equal(false); - form.amount.$setViewValue(100292.039); - expect(form.amount.$invalid).to.equal(false); - }); - - it('should not validate', function() { - form.amount.$setViewValue(0.039998888888888); - expect(form.amount.$invalid).to.equal(true); - form.amount.$setViewValue(0); - expect(form.amount.$invalid).to.equal(true); - form.amount.$setViewValue(0.0); - expect(form.amount.$invalid).to.equal(true); - }); - - }); - - }); - - describe('Contact directive', function() { - var element1, element2; - - beforeEach(inject(function($compile, $rootScope) { - $rootScope.wallet = { - addressBook: { - '2MtBXKLtZuXGDshUcyH6yq7aZ33Snbb49pT': { - label: ':)' - } - } - } - element1 = angular.element( - '' - ); - element2 = angular.element( - '' - ); - $compile(element1)($rootScope); - $compile(element2)($rootScope); - $rootScope.$digest(); - })); - - it('should replace the content', function() { - expect(element1.html()).to.equal(':)'); - expect(element2.html()).to.equal('2MvCKdnwEMiaexi247gi738U6pwUFZxbhXn'); - }); - - }); - - describe('Password strength', function() { - beforeEach(inject(function($compile, $rootScope) { - $scope = $rootScope; - var element = angular.element( - '' - ); - $compile(element)($scope); - $scope.$digest(); - })); - - it('should check very weak password', function() { - $scope.password = 'asd'; - $scope.$digest(); - expect($scope.passwordStrength.strength).to.equal(1); - }); - - - it('should check weak password', function() { - $scope.password = 'asdasdASDASD'; - $scope.$digest(); - expect($scope.passwordStrength.message).to.equal('Weak, add numerals'); - }); - - it('should check medium password', function() { - $scope.password = 'asdasdA1'; - $scope.$digest(); - expect($scope.passwordStrength.message).to.equal('Medium, add punctuation'); - }); - - it('should check strong password', function() { - $scope.password = 'asdasdASDASD1{'; - $scope.$digest(); - expect($scope.passwordStrength.message).to.equal('Strong, add punctuation'); - }); - - }); - - describe('Match Password Inputs', function() { - beforeEach(inject(function($compile, $rootScope) { - $scope = $rootScope; - $rootScope.availableBalance = 1000; - var element = angular.element( - '
' + - '' + - '' + - '
' - ); - $scope.model = { - walletPassword: null, - walletPasswordConfirm: null - }; - $compile(element)($scope); - $scope.$digest(); - form = $scope.form; - })); - it('should not validate', function() { - form.walletPassword.$setViewValue('mysecretpassword'); - form.walletPasswordConfirm.$setViewValue('mySecretPassword'); - $scope.$digest(); - expect(form.walletPasswordConfirm.$invalid).to.equal(true); - }); - it('should validate', function() { - form.walletPassword.$setViewValue('mysecretpassword123'); - form.walletPasswordConfirm.$setViewValue('mysecretpassword123'); - $scope.$digest(); - expect(form.walletPasswordConfirm.$invalid).to.equal(false); - }); - }); - -}); diff --git a/test/old/filtersSpec.js b/test/old/filtersSpec.js deleted file mode 100644 index 43bab46f5..000000000 --- a/test/old/filtersSpec.js +++ /dev/null @@ -1,168 +0,0 @@ -'use strict'; -// -// test/unit/filters/filtersSpec.js -// -describe('Angular Filters', function() { - - beforeEach(angular.mock.module('copayApp')); - beforeEach(module('copayApp.filters')); - beforeEach(inject(function($rootScope) { - - var w = {}; - w.isComplete = sinon.stub().returns(true); - w.privateKey = {}; - w.settings = { - unitToSatoshi: 100, - unitDecimals: 2, - alternativeName: 'US Dollar', - alternativeIsoCode: 'USD', - }; - w.addressBook = { - 'juan': '1', - }; - w.balanceByAddr = [{ - 'address1': 1 - }]; - - w.totalCopayers = 2; - w.getMyCopayerNickname = sinon.stub().returns('nickname'); - w.getMyCopayerId = sinon.stub().returns('id'); - w.privateKey.toObj = sinon.stub().returns({ - wallet: 'mock' - }); - w.getSecret = sinon.stub().returns('secret'); - w.getName = sinon.stub().returns('fakeWallet'); - w.getId = sinon.stub().returns('id'); - w.exportEncrypted = sinon.stub().returns('1234567'); - w.getTransactionHistory = sinon.stub().yields({}); - w.getNetworkName = sinon.stub().returns('testnet'); - w.getAddressesInfo = sinon.stub().returns({}); - - w.createTx = sinon.stub().yields(null); - w.sendTx = sinon.stub().yields(null); - w.requiresMultipleSignatures = sinon.stub().returns(true); - w.getTxProposals = sinon.stub().returns([1, 2, 3]); - $rootScope.wallet = w; - })); - - - - - - - var walletConfig = { - requiredCopayers: 3, - totalCopayers: 5, - spendUnconfirmed: 1, - reconnectDelay: 100, - networkName: 'testnet', - alternativeName: 'lol currency', - alternativeIsoCode: 'LOL' - }; - - - - describe('removeEmpty addresses', function() { - it('should work with empty lists', inject(function($filter) { - var removeEmpty = $filter('removeEmpty'); - expect(removeEmpty([]).length).to.equal(0); - })); - - it('should work with undefined', inject(function($filter) { - var removeEmpty = $filter('removeEmpty'); - expect(removeEmpty(undefined).length).to.equal(0); - })); - - it('should filter empty change addresses from other copayers', inject(function($filter) { - var removeEmpty = $filter('removeEmpty'); - var addresses = [{ - owned: true, - isChange: false, - balance: 0 - }, { - owned: false, - isChange: false, - balance: 0 - }, { - owned: true, - isChange: true, - balance: 0 - }, { - owned: false, - isChange: true, - balance: 0 - }]; - expect(removeEmpty(addresses).length).to.equal(2); - })); - }); - - describe('noFractionNumber', function() { - describe('noFractionNumber bits', function() { - beforeEach(inject(function($rootScope) { - var w = $rootScope.wallet; - w.settings.unitToSatoshi = 100; - w.settings.unitName = 'bits'; - })); - it('should format number to display correctly', inject(function($filter) { - var noFraction = $filter('noFractionNumber'); - expect(noFraction(3100)).to.equal('3,100'); - expect(noFraction(3100200)).to.equal('3,100,200'); - expect(noFraction(3)).to.equal('3'); - expect(noFraction(0.3)).to.equal(0.3); - expect(noFraction(0.30000000)).to.equal(0.3); - expect(noFraction(3200.01)).to.equal('3,200.01'); - expect(noFraction(3200890.010000)).to.equal('3,200,890.01'); - })); - }); - - describe('noFractionNumber BTC', function() { - beforeEach(inject(function($rootScope) { - var w = $rootScope.wallet; - w.settings.unitToSatoshi = 100000000; - w.settings.unitName = 'BTC'; - })); - it('should format number to display correctly', inject(function($filter) { - var noFraction = $filter('noFractionNumber'); - expect(noFraction(0.30000000)).to.equal(0.3); - expect(noFraction(0.00302000)).to.equal(0.00302); - expect(noFraction(1.00000001)).to.equal(1.00000001); - expect(noFraction(3.10000012)).to.equal(3.10000012); - expect(noFraction(0.00100000)).to.equal(0.001); - expect(noFraction(0.00100009)).to.equal(0.00100009); - expect(noFraction(2000.00312011)).to.equal('2,000.00312011'); - expect(noFraction(2000998.00312011)).to.equal('2,000,998.00312011'); - })); - }); - - describe('noFractionNumber mBTC', function() { - beforeEach(inject(function($rootScope) { - var w = $rootScope.wallet; - w.settings.unitToSatoshi = 100000; - w.settings.unitName = 'mBTC'; - })); - it('should format number to display correctly', inject(function($filter) { - var noFraction = $filter('noFractionNumber'); - expect(noFraction(0.30000)).to.equal(0.3); - expect(noFraction(0.00302)).to.equal(0.00302); - expect(noFraction(1.00001)).to.equal(1.00001); - expect(noFraction(3.10002)).to.equal(3.10002); - expect(noFraction(0.00100000)).to.equal(0.001); - expect(noFraction(0.00100009)).to.equal(0.001); - expect(noFraction(2000.00312)).to.equal('2,000.00312'); - expect(noFraction(2000998.00312)).to.equal('2,000,998.00312'); - })); - }); - - describe('noFractionNumber:custom fractionSize', function() { - it('should format number to display correctly', inject(function($filter) { - var noFraction = $filter('noFractionNumber'); - expect(noFraction(0.30000, 0)).to.equal('0'); - expect(noFraction(1.00001, 0)).to.equal('1'); - expect(noFraction(3.10002, 0)).to.equal('3'); - expect(noFraction(2000.00312, 0)).to.equal('2,000'); - expect(noFraction(2000998.00312, 0)).to.equal('2,000,998'); - })); - }); - - }); -}); diff --git a/test/old/servicesSpec.js b/test/old/servicesSpec.js deleted file mode 100644 index 6377c5131..000000000 --- a/test/old/servicesSpec.js +++ /dev/null @@ -1,215 +0,0 @@ -// -// test/unit/services/servicesSpec.js -// -// -// -var sinon = require('sinon'); -var preconditions = require('preconditions').singleton(); - - -describe("Angular services", function() { - beforeEach(angular.mock.module('copayApp')); - beforeEach(angular.mock.module('copayApp.services')); - beforeEach(module(function($provide) { - $provide.value('request', { - 'get': function(_, cb) { - cb(null, null, [{ - name: 'USD Dollars', - code: 'USD', - rate: 2 - }]); - } - }); - })); - - - beforeEach(inject(function($rootScope) { - - var w = {}; - w.isComplete = sinon.stub().returns(true); - w.privateKey = {}; - w.settings = { - unitToSatoshi: 100, - unitDecimals: 2, - alternativeName: 'US Dollar', - alternativeIsoCode: 'USD', - }; - w.addressBook = { - 'juan': '1', - }; - w.balanceByAddr = [{ - 'address1': 1 - }]; - - w.totalCopayers = 2; - w.getMyCopayerNickname = sinon.stub().returns('nickname'); - w.getMyCopayerId = sinon.stub().returns('id'); - w.privateKey.toObj = sinon.stub().returns({ - wallet: 'mock' - }); - w.getSecret = sinon.stub().returns('secret'); - w.getName = sinon.stub().returns('fakeWallet'); - w.getId = sinon.stub().returns('id'); - w.exportEncrypted = sinon.stub().returns('1234567'); - w.getTransactionHistory = sinon.stub().yields({}); - w.getNetworkName = sinon.stub().returns('testnet'); - w.getAddressesInfo = sinon.stub().returns({}); - - w.createTx = sinon.stub().yields(null); - w.sendTx = sinon.stub().yields(null); - w.requiresMultipleSignatures = sinon.stub().returns(true); - w.getTxProposals = sinon.stub().returns([1, 2, 3]); - $rootScope.wallet = w; - })); - - - - - describe("Unit: balanceService", function() { - - it('should updateBalance in bits', inject(function(balanceService, $rootScope) { - var w = $rootScope.wallet; - - expect(balanceService.update).not.to.equal(null); - var Waddr = Object.keys($rootScope.wallet.balanceByAddr)[0]; - var a = {}; - a[Waddr] = 200; - w.getBalance = sinon.stub().yields(null, 100000001, a, 90000002, 5); - - - //retuns values in DEFAULT UNIT(bits) - balanceService.update(w, function() { - var b = w.balanceInfo; - expect(b.totalBalanceBTC).to.be.equal(1.00000001); - expect(b.availableBalanceBTC).to.be.equal(0.90000002); - expect(b.lockedBalanceBTC).to.be.equal(0.09999999); - - expect(b.totalBalance).to.be.equal('1,000,000.01'); - expect(b.availableBalance).to.be.equal('900,000.02'); - expect(b.lockedBalance).to.be.equal('99,999.99'); - - expect(b.balanceByAddr[Waddr]).to.equal(2); - expect(b.safeUnspentCount).to.equal(5); - expect(b.topAmount).to.equal(899800.02); - }, false); - })); - - }); - - describe("Unit: Notification Service", function() { - it('should contain a notification service', inject(function(notification) { - expect(notification).not.to.equal(null); - })); - }); - - describe("Unit: identityService Service", function() { - it('should contain a identityService service', inject(function(identityService) { - expect(identityService).not.to.equal(null); - })); - }); - - describe("Unit: pinService", function() { - it('should contain a pinService service', inject(function(pinService) { - expect(pinService).not.to.equal(null); - })); - it('should be able to check -> save -> get -> clear -> check', function(done) { - inject(function(pinService) { - pinService.save('123', 'user', 'pass', function(err) { - pinService.check(function(err, value) { - should.not.exist(err); - value.should.equal(true); - pinService.get('123', function(err, data) { - should.not.exist(err); - data.email.should.be.equal('user'); - data.password.should.be.equal('pass'); - pinService.clear(function(err) { - should.not.exist(err); - pinService.check(function(err, value) { - should.not.exist(err); - value.should.equal(false); - done(); - }); - }); - }); - }); - }) - }) - }); - }); - - describe("Unit: localstorageService", function() { - it('should contain a localstorageService service', inject(function(localstorageService) { - expect(localstorageService).not.to.equal(null); - })); - }); - - - describe("Unit: Backup Service", function() { - it('should contain a backup service', inject(function(backupService) { - expect(backupService).not.to.equal(null); - })); - it('should backup in file', inject(function(backupService) { - var mock = sinon.mock(window); - var expectation = mock.expects('saveAs'); - backupService._download({}, 'test'); - expectation.once(); - })); - }); - - describe("Unit: isMobile Service", function() { - it('should contain a isMobile service', inject(function(isMobile) { - expect(isMobile).not.to.equal(null); - })); - it('should not detect mobile by default', inject(function(isMobile) { - isMobile.any().should.equal(false); - })); - it('should detect mobile if user agent is Android', inject(function(isMobile) { - navigator.__defineGetter__('userAgent', function() { - return 'Android 2.2.3'; - }); - isMobile.any().should.equal(true); - })); - }); - - describe("Unit: uriHandler service", function() { - it('should contain a uriHandler service', inject(function(uriHandler) { - should.exist(uriHandler); - })); - it('should register', inject(function(uriHandler) { - (function() { - uriHandler.register(); - }).should.not.throw(); - })); - }); - - describe('Unit: Rate Service', function() { - it('should be injected correctly', inject(function(rateService) { - should.exist(rateService); - })); - it('should be possible to ask if it is available', - inject(function(rateService) { - should.exist(rateService.isAvailable); - }) - ); - it('should be possible to ask for conversion from fiat', - function(done) { - inject(function(rateService) { - rateService.whenAvailable(function() { - (1e8).should.equal(rateService.fromFiat(2, 'USD')); - done(); - }); - }) - } - ); - it('should be possible to ask for conversion to fiat', - function(done) { - inject(function(rateService) { - rateService.whenAvailable(function() { - (2).should.equal(rateService.toFiat(1e8, 'USD')); - done(); - }); - }) - } - ); - }); -}); diff --git a/test/old/sidebar.test.js b/test/old/sidebar.test.js deleted file mode 100644 index d3a197e69..000000000 --- a/test/old/sidebar.test.js +++ /dev/null @@ -1,11 +0,0 @@ -// 'use strict'; -// -// describe('sidebarController', function(){ -// var scope, controller; -// -// beforeEach(angular.mock.module('copayApp.controllers')); -// -// it('dummy test', function(){ -// should.exist(true); -// }); -// }); diff --git a/test/profiles.js b/test/profiles.js deleted file mode 100644 index 09b80184b..000000000 --- a/test/profiles.js +++ /dev/null @@ -1,65 +0,0 @@ -var incomplete2of2Wallet = { - "network": "livenet", - "xPrivKey": "xprv9s21ZrQH143K27bhzfejhNcitEAJgLKCfdLxwhr1FLu43FLqLwscAxXgmkucpF4k8eGmepSctkiQDbcR98Qd1bzSeDuR9jeyQAQEanPT2A4", - "xPubKey": "xpub6CkPnrzSUp9qzBVM3hpo4oS2JKC6GJq6brE1yW59QrnhDpvkFLakpxUGRGXH62fiXb5S2VbnD4h2DLoCMfSkwfonbNgNYTJw9Ko5SqWEqCR", - "requestPrivKey": "0cb89231b31dfaae9034ba794b9c48597eb573429f7b4b1f95e1945b22166bd5", - "requestPubKey": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72", - "copayerId": "3d4eb9b439eee1b2b73cf792eda52e420f4665109c7234a50cf3cdbf296ea8fb", - "publicKeyRing": [{ - "xPubKey": "xpub6CkPnrzSUp9qzBVM3hpo4oS2JKC6GJq6brE1yW59QrnhDpvkFLakpxUGRGXH62fiXb5S2VbnD4h2DLoCMfSkwfonbNgNYTJw9Ko5SqWEqCR", - "requestPubKey": "022941a5ecb8c7224f812ad6b03bd1c9bb77861080b21703eabe18ef9a72b48e72" - }], - "walletId": "7bd8d22f-d132-43e1-b259-d5b430752553", - "walletName": "A test wallet", - "m": 2, - "n": 2, - "walletPrivKey": "Kz4CFSTgLzoYfMkt97BTBotUbZYXjMts6Ej9HbVfCf5oLmun1BXy", - "personalEncryptingKey": "1fgFP/uoLhVxJiMXOWQznA==", - "sharedEncryptingKey": "FZIY4+p4TfBAKRclKtrROw==", - "copayerName": "me", - "mnemonic": "dizzy cycle skirt decrease exotic fork sure mixture hair vapor copper hero", - "entropySource": "79e60ad83e04ee40967147fd6ac58f986c7dcf6c82b125fb4e8c30ff9f9584ee", - "mnemonicHasPassphrase": false, - "derivationStrategy": "BIP44", - "account": 0, - "addressType": "P2SH" -}; -var testnet1of1Wallet = { - "network": "testnet", - "xPrivKey": "tprv8ZgxMBicQKsPdK35ubrjCCpPCaBZA7QyKtxNNDWvYyjDAhtxV1HVNLzqwntAJ5QH1RTksRSfbuHLUYvMdGFmy9vHCb4yDRAR2zKqmX8mVa8", - "xPubKey": "tpubDDN7B6QnxsbomkZfPFRj6CVtC7LVh6ufoTpvzHfutjiHbu4hmiEGYDzxo5mgfqkQkBuwZPFkTYLNmQeLg7eFvdb4SFH1LW35sQD6xfymmRP", - "requestPrivKey": "aa39d4d780ad7ec36e26cbd0c0250bce85dfdd8aa7f2222ec7c86d6d62f242d7", - "requestPubKey": "038bb7cc1238280e893dd6949bfce770a319892b3c9045112ec7810191d4157ced", - "copayerId": "5c474b568bde8cd39efe069cd6aff2a80ab1cb18d3b9ae81f8225286f94856bc", - "publicKeyRing": [{ - "xPubKey": "tpubDDN7B6QnxsbomkZfPFRj6CVtC7LVh6ufoTpvzHfutjiHbu4hmiEGYDzxo5mgfqkQkBuwZPFkTYLNmQeLg7eFvdb4SFH1LW35sQD6xfymmRP", - "requestPubKey": "038bb7cc1238280e893dd6949bfce770a319892b3c9045112ec7810191d4157ced" - }], - "walletId": "66d3afc9-7d76-4b25-850e-aa62fcc53a7d", - "walletName": "kk", - "m": 1, - "n": 1, - "walletPrivKey": "1d6eb8e5a9f8944e97c2f13423c137ce912fac00f7eb5b3ffe6e3c161ea98bf7", - "personalEncryptingKey": "A2dQiAwpFY2xwIhE26ClFQ==", - "sharedEncryptingKey": "z0BtAIFclGQMH6eHqK9e3w==", - "copayerName": "me", - "mnemonic": "cheese where alarm job conduct donkey license pave congress pepper fence current", - "entropySource": "5c84e65837c0fbd11db935953dbacb60f5c33f40ecfe95e0feded1f62a5ee15d", - "mnemonicHasPassphrase": false, - "derivationStrategy": "BIP44", - "account": 0, - "addressType": "P2PKH" -}; - -var PROFILE = { - incomplete2of2: { - credentials: [incomplete2of2Wallet], - createdOn: 1463519749, - disclaimerAccepted: true, - }, - testnet1of1: { - credentials: [testnet1of1Wallet], - createdOn: 1463519749, - disclaimerAccepted: true, - }, -}; diff --git a/test/walletService.test.js b/test/walletService.test.js deleted file mode 100644 index 9dd11f549..000000000 --- a/test/walletService.test.js +++ /dev/null @@ -1,24 +0,0 @@ -describe('walletService', function() { - - var walletService; - - - // Adds walletService's module dependencies - beforeEach(function() { - module('ngLodash'); - module('gettext'); - module('angularMoment'); - module('bwcModule'); - module('copayApp.services'); - }); - - - beforeEach(inject(function(_walletService_) { - walletService = _walletService_; - })); - - it('should be defined', function() { - should.exist(walletService); - }); - -}); diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop deleted file mode 100644 index 6b8dfda8a..000000000 --- a/webkitbuilds/.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Version=0.14.0 -Name=BitPay -Comment=Secure Bitcoin Wallet -Exec=bitpay -Icon=icon-256.png -Terminal=false -Categories=Finance -X-Ubuntu-Touch=true -X-Ubuntu-StageHint=SideStage diff --git a/webkitbuilds/Background.png b/webkitbuilds/Background.png deleted file mode 100644 index 8e7f9a152..000000000 Binary files a/webkitbuilds/Background.png and /dev/null differ diff --git a/webkitbuilds/Background.png b/webkitbuilds/Background.png new file mode 120000 index 000000000..3c2950b39 --- /dev/null +++ b/webkitbuilds/Background.png @@ -0,0 +1 @@ +../www/img/app/Background.png \ No newline at end of file diff --git a/webkitbuilds/setup-win.iss b/webkitbuilds/setup-win.iss deleted file mode 100755 index 8ae2a631f..000000000 --- a/webkitbuilds/setup-win.iss +++ /dev/null @@ -1,56 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define MyAppName "BitPay" -#define MyAppVersion "0.14.0" -#define MyAppPublisher "BitPay" -#define MyAppURL "https://bitpay.com" -#define MyAppExeName "*PACKAGENAME.exe" - -[Setup] -AppId={{804636ee-b017-4cad-8719-e58ac97ffa5c} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} -DefaultGroupName={#MyAppName} -OutputBaseFilename=bitpay-win -OutputDir=./ -Compression=lzma -SolidCompression=yes -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" -Name: "french"; MessagesFile: "compiler:Languages\French.isl" -Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" -Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "bitpay\win64\bitpay.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bitpay\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "../www/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; IconFilename: "{app}/icon.ico" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}/icon.ico"; Tasks: desktopicon - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -[Registry] -Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueData: "URL:Bitcoin Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "bitcoin"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "bitcoin\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "bitcoin\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" - -Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueData: "URL:BitPay Custom Protocol"; Flags: uninsdeletekey -Root: HKCR; Subkey: "bitpay"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: "" -Root: HKCR; Subkey: "bitpay\DefaultIcon"; ValueType: "string"; ValueData: "{app}\{#MyAppExeName},0" -Root: HKCR; Subkey: "bitpay\shell\open\command"; ValueType: "string"; ValueData: """{app}\{#MyAppExeName}"" ""%1""" diff --git a/www/img/glidera-logo.png b/www/img/glidera-logo.png index 930cdf4a9..313aa614a 100644 Binary files a/www/img/glidera-logo.png and b/www/img/glidera-logo.png differ diff --git a/www/img/icons/copy.png b/www/img/icons/copy.png deleted file mode 100644 index b43ca0634..000000000 Binary files a/www/img/icons/copy.png and /dev/null differ diff --git a/www/img/icons/favicon.ico b/www/img/icons/favicon.ico deleted file mode 100644 index 03f394e70..000000000 Binary files a/www/img/icons/favicon.ico and /dev/null differ diff --git a/www/img/icons/icon-16.png b/www/img/icons/icon-16.png deleted file mode 100644 index d4664c57a..000000000 Binary files a/www/img/icons/icon-16.png and /dev/null differ diff --git a/www/img/icons/icon-256.png b/www/img/icons/icon-256.png deleted file mode 100644 index f9978eb28..000000000 Binary files a/www/img/icons/icon-256.png and /dev/null differ diff --git a/www/img/icons/icon-32.png b/www/img/icons/icon-32.png deleted file mode 100644 index eca42cbc5..000000000 Binary files a/www/img/icons/icon-32.png and /dev/null differ diff --git a/www/img/icons/icon-64.png b/www/img/icons/icon-64.png deleted file mode 100644 index fec1daa73..000000000 Binary files a/www/img/icons/icon-64.png and /dev/null differ diff --git a/www/img/icons/icon-chrome-128.png b/www/img/icons/icon-chrome-128.png deleted file mode 100644 index 0044af9ca..000000000 Binary files a/www/img/icons/icon-chrome-128.png and /dev/null differ diff --git a/www/img/icons/icon.icns b/www/img/icons/icon.icns deleted file mode 100644 index 8fc084681..000000000 Binary files a/www/img/icons/icon.icns and /dev/null differ diff --git a/www/img/icons/icon.ico b/www/img/icons/icon.ico deleted file mode 100644 index e40c22dcf..000000000 Binary files a/www/img/icons/icon.ico and /dev/null differ diff --git a/www/img/icons/icon.png b/www/img/icons/icon.png deleted file mode 100644 index 47cdc4b1f..000000000 Binary files a/www/img/icons/icon.png and /dev/null differ diff --git a/www/img/icons/logo-chrome-256.png b/www/img/icons/logo-chrome-256.png deleted file mode 100644 index 803f97494..000000000 Binary files a/www/img/icons/logo-chrome-256.png and /dev/null differ diff --git a/www/img/icons/logo-chrome-64.png b/www/img/icons/logo-chrome-64.png deleted file mode 100644 index b09c6b57a..000000000 Binary files a/www/img/icons/logo-chrome-64.png and /dev/null differ diff --git a/www/img/logo-negative.svg b/www/img/logo-negative.svg new file mode 100644 index 000000000..d325ec632 --- /dev/null +++ b/www/img/logo-negative.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/www/img/logo.svg b/www/img/logo.svg new file mode 100644 index 000000000..bae45745c --- /dev/null +++ b/www/img/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/www/index.html b/www/index.html index 431e8033b..26ca9be38 100644 --- a/www/index.html +++ b/www/index.html @@ -8,7 +8,7 @@ {{appConfig.nameCase}} - {{appConfig.description}} - + diff --git a/www/views/addressbook.add.html b/www/views/addressbook.add.html index f285f53b2..afbb48099 100644 --- a/www/views/addressbook.add.html +++ b/www/views/addressbook.add.html @@ -1,4 +1,4 @@ - + Add Contact diff --git a/www/views/addressbook.html b/www/views/addressbook.html index ea28dd923..1ed714ed4 100644 --- a/www/views/addressbook.html +++ b/www/views/addressbook.html @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ -
+