+
@@ -38,8 +39,17 @@
+
+
+
@@ -61,7 +71,19 @@
+
+
@@ -38,8 +39,17 @@
+
+ {{$root.flashMessage.type}}:
+ {{$root.flashMessage.message}}
+ Dismiss
+
+
+
-
+ Join wallet
+Open a Existing Wallet
+ +
+
+
+ +
+
+
Join a Network Wallet
@@ -71,7 +93,7 @@
-
Create a new wallet
+Create a New Wallet
@@ -85,6 +107,14 @@
Mocha
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/test.publickeyring.js b/test/test.publickeyring.js
index 994911447..b78896aeb 100644
--- a/test/test.publickeyring.js
+++ b/test/test.publickeyring.js
@@ -2,24 +2,24 @@
var chai = chai || require('chai');
var should = chai.should();
-var bitcore = bitcore || require('../node_modules/bitcore');
+var bitcore = bitcore || require('bitcore');
var Address = bitcore.Address;
var buffertools = bitcore.buffertools;
-var copay = copay || {};
-var fakeStorage = require('./FakeStorage');
+var copay = copay || require('../copay');
+var fakeStorage = copay.FakeStorage;
var PublicKeyRing = copay.PublicKeyRing || require('soop').load('../js/models/PublicKeyRing', {Storage: fakeStorage});
var aMasterPubKey = 'tprv8ZgxMBicQKsPdSVTiWXEqCCzqRaRr9EAQdn5UVMpT9UHX67Dh1FmzEMbavPumpAicsUm2XvC6NTdcWB89yN5DUWx5HQ7z3KByUg7Ht74VRZ';
var config = {
- network:'livenet',
+ networkName:'livenet',
};
-var createW = function (network) {
+var createW = function (networkName) {
var config = {
- network: network || 'livenet',
+ networkName: networkName || 'livenet',
};
var w = new PublicKeyRing(config);
@@ -39,7 +39,7 @@ describe('PublicKeyRing model', function() {
it('should create an instance (livenet)', function () {
var w = new PublicKeyRing({
- network: config.network
+ networkName: config.networkName
});
should.exist(w);
w.network.name.should.equal('livenet');
@@ -158,7 +158,7 @@ describe('PublicKeyRing model', function() {
w.generateAddress(false);
var w2 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
});
w2.merge(w.toObj()).should.equal(true);
@@ -182,33 +182,48 @@ describe('PublicKeyRing model', function() {
w.generateAddress(false);
+
+ var w2 = new PublicKeyRing({
+ networkName: 'livenet',
+ });
+ (function() { w2.merge(w.toObj());}).should.throw();
+ (function() { w2.merge(w,true);}).should.throw();
+
+console.log('[test.publickeyring.js.190]'); //TODO
+ w2.merge(w.toObj(),true).should.equal(true);
+
+console.log('[test.publickeyring.js.193]'); //TODO
+
+
var w3 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
requiredCopayers: 2,
});
(function() { w3.merge(w.toObj());}).should.throw();
var w4 = new PublicKeyRing({
- network: 'testnet',
+ networkName: 'testnet',
id: w.id,
});
(function() { w4.merge(w.toObj());}).should.throw();
var w5 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
totalCopayers: 4,
});
(function() { w5.merge(w.toObj());}).should.throw();
var w6 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
});
(function() { w6.merge(w);}).should.throw();
w.networkName= 'livenet';
(function() { w6.merge(w);}).should.throw();
+
+
});
@@ -222,7 +237,7 @@ describe('PublicKeyRing model', function() {
}
var w2 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
});
should.exist(w);
@@ -248,17 +263,14 @@ describe('PublicKeyRing model', function() {
for(var i=0; i<5; i++) {
w.haveAllRequiredPubKeys().should.equal(false);
var w2 = new PublicKeyRing({
- network: 'livenet',
+ networkName: 'livenet',
id: w.id,
});
w2.addCopayer();
- w.merge(w2.toObj());
+ w.merge(w2.toObj()).should.equal(true);
}
w.haveAllRequiredPubKeys().should.equal(true);
});
-
-
-
});
diff --git a/test/test.storage.js b/test/test.storage.js
new file mode 100644
index 000000000..d108b6e5b
--- /dev/null
+++ b/test/test.storage.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var chai = chai || require('chai');
+var should = chai.should();
+var copay = copay || require('../copay');
+var Storage = copay.Storage || require('../js/models/Storage');
+
+describe('Storage model', function() {
+
+ it('should create an instance', function () {
+ var s = new Storage();
+ should.exist(s);
+ });
+});
+
diff --git a/util/build.js b/util/build.js
new file mode 100755
index 000000000..d1d16a476
--- /dev/null
+++ b/util/build.js
@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var fs = require('fs');
+var browserify = require('browserify');
+var browserPack = require('browser-pack');
+var exec = require('child_process').exec;
+var sys = require('sys');
+var puts = function(error, stdout, stderr) {
+ if (error) console.log(error);
+ //sys.puts(stdout);
+ //sys.puts(stderr);
+};
+
+var pack = function (params) {
+ var file = require.resolve('soop');
+ var dir = file.substr(0, file.length - String('soop.js').length);
+ var preludePath = dir + 'example/custom_prelude.js';
+ params.raw = true;
+ params.sourceMapPrefix = '//#';
+ params.prelude = fs.readFileSync(preludePath, 'utf8');
+ params.preludePath = preludePath;
+ return browserPack(params);
+};
+
+var createBundle = function(opts) {
+
+
+ opts.dir = opts.dir || 'js/';
+
+ // concat browser vendor files
+ exec('cd ' + opts.dir + 'browser; sh concat.sh', puts);
+
+ var bopts = {
+ pack: pack,
+ debug: true,
+ standalone: 'copay',
+ insertGlobals: true
+ };
+ var b = browserify(bopts);
+ b.require('./copay', {
+ expose: 'copay'
+ });
+
+ if (!opts.dontminify) {
+ b.transform({
+ global: true
+ }, 'uglifyify');
+ }
+ var bundle = b.bundle();
+ return bundle;
+};
+
+if (require.main === module) {
+ var list = function(val) {
+ return val.split(',');
+ };
+ var program = require('commander');
+ program
+ .version('0.0.1')
+ .option('-d, --dontminify', 'Don\'t minify the code.')
+ .option('-o, --stdout', 'Specify output as stdout')
+ .parse(process.argv);
+ var copayBundle = createBundle(program);
+ copayBundle.pipe(program.stdout ? process.stdout : fs.createWriteStream('lib/copayBundle.js'));
+}
+
+module.exports.createBundle = createBundle;
I am
{{$root.peerId}}
+ +-
+
- [DEBUG] Pubkeys that you have: {{$root.publicKeyRing.registeredCopayers()}} +
- + ${{pub.extendedPublicKeyString()}} + +