From 1aa3cccff735e7eab7bb9091132517468a578a78 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 18 Nov 2015 20:30:28 -0300 Subject: [PATCH] rm angular-bitcore-wallet-client deps, replace it with bwc alone --- .gitignore | 3 ++ Gruntfile.js | 45 +++++++++++++------ angular-bitcore-wallet-client/index.js | 62 ++++++++++++++++++++++++++ package.json | 2 + 4 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 angular-bitcore-wallet-client/index.js diff --git a/.gitignore b/.gitignore index 65510bc38..c38187efb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ webkitbuilds/* !webkitbuilds/build-osx.sh !webkitbuilds/Background.png + + # chrome extensions browser-extensions/chrome/copay-chrome-extension browser-extensions/chrome/copay-chrome-extension.zip @@ -51,6 +53,7 @@ build/Release # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- node_modules bower_components +angular-bitcore-wallet-client/angular-bitcore-wallet-client.js # Users Environment Variables .lock-wscript diff --git a/Gruntfile.js b/Gruntfile.js index bff09ff9a..1739815d3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,8 +61,8 @@ module.exports = function(grunt) { 'bower_components/angular-qrcode/angular-qrcode.js', 'bower_components/angular-gettext/dist/angular-gettext.js', 'bower_components/angular-touch/angular-touch.js', - 'bower_components/angular-bitcore-wallet-client/angular-bitcore-wallet-client.js', - 'bower_components/angular-ui-switch/angular-ui-switch.js' + 'bower_components/angular-ui-switch/angular-ui-switch.js', + 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js' ], dest: 'public/lib/angular.js' }, @@ -112,8 +112,8 @@ module.exports = function(grunt) { pot: { files: { 'i18n/po/template.pot': [ - 'public/index.html', - 'public/views/*.html', + 'public/index.html', + 'public/views/*.html', 'public/views/**/*.html', 'src/js/routes.js', 'src/js/services/*.js', @@ -140,10 +140,21 @@ module.exports = function(grunt) { dest: 'public/icons/' }, linux: { - files: [ - {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],dest: 'webkitbuilds/copay/linux32/', flatten: true, filter: 'isFile' }, - {expand: true, cwd: 'webkitbuilds/',src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],dest: 'webkitbuilds/copay/linux64/', flatten: true, filter: 'isFile' }, - ], + files: [{ + expand: true, + cwd: 'webkitbuilds/', + src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'], + dest: 'webkitbuilds/copay/linux32/', + flatten: true, + filter: 'isFile' + }, { + expand: true, + cwd: 'webkitbuilds/', + src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'], + dest: 'webkitbuilds/copay/linux64/', + flatten: true, + filter: 'isFile' + }, ], } }, karma: { @@ -166,11 +177,11 @@ module.exports = function(grunt) { }, nodewebkit: { options: { - platforms: ['win','osx','linux'], - buildDir: './webkitbuilds', - version: '0.12.2', - macIcns: './public/img/icons/icon.icns', - exeIco: './public/img/icons/icon.ico' + platforms: ['win', 'osx', 'linux'], + buildDir: './webkitbuilds', + version: '0.12.2', + macIcns: './public/img/icons/icon.icns', + exeIco: './public/img/icons/icon.ico' }, src: ['./package.json', './public/**/*'] }, @@ -193,6 +204,13 @@ module.exports = function(grunt) { src: ['**/*'], dest: 'copay-linux64/' } + }, + browserify: { + dist: { + files: { + 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js': ['angular-bitcore-wallet-client/index.js'] + }, + } } }); @@ -201,6 +219,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-angular-gettext'); + grunt.loadNpmTasks('grunt-browserify'); grunt.loadNpmTasks('grunt-exec'); grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-karma-coveralls'); diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js new file mode 100644 index 000000000..ff5dd52eb --- /dev/null +++ b/angular-bitcore-wallet-client/index.js @@ -0,0 +1,62 @@ +var bwcModule = angular.module('bwcModule', []); +var Client = require('../node_modules/bitcore-wallet-client'); + +bwcModule.constant('MODULE_VERSION', '1.0.0'); + +bwcModule.provider("bwcService", function() { + var provider = {}; + + var config = { + baseUrl: 'https://bws.bitpay.com/bws/api', + verbose: null, + transports: null + }; + + provider.setBaseUrl = function(url) { + config.baseUrl = url; + }; + + provider.setVerbose = function(v) { + config.verbose = v ? true : false; + }; + + provider.$get = function() { + var service = {}; + + service.setBaseUrl = function(url) { + config.baseUrl = url; + }; + + service.setTransports = function(transports) { + config.transports = transports; + }; + + service.getBitcore = function() { + return Client.Bitcore; + }; + + service.getSJCL = function() { + return Client.sjcl; + }; + + service.buildTx = Client.buildTx; + + service.getUtils = function() { + return Client.Utils; + }; + + service.getClient = function(walletData) { + var bwc = new Client({ + baseUrl: config.baseUrl, + verbose: config.verbose, + transports: config.transports + }); + if (walletData) + bwc.import(walletData); + return bwc; + }; + return service; + }; + + return provider; +}); diff --git a/package.json b/package.json index 272b0dc57..26eba9f53 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,12 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { + "bitcore-wallet-client": "1.8.1", "express": "^4.11.2", "fs": "0.0.2", "grunt": "^0.4.5", "grunt-angular-gettext": "^0.2.15", + "grunt-browserify": "^4.0.1", "grunt-cli": "^0.1.13", "grunt-contrib-compress": "^0.13.0", "grunt-contrib-concat": "^0.5.1",