diff --git a/.gitignore b/.gitignore
index af45d2c34..cd2274086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,4 @@ lib/*
!lib/socket.io.js
js/copayBundle.js
-js/config.js
+config.js
diff --git a/README.md b/README.md
index d7b8db5cf..5b68e1dcd 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,29 @@
Copay
+=====
+
+Installation:
+
+Copy config.template.js to config.js and edit to suit your needs. (Defaults to
+public PeerJS and Insight servers)
+
+Then execute these commands:
+```
+npm install
+bower install
+grunt --target=dev shell
+node app.js
+```
+
+To run on a different port:
+```
+PORT=3001 node app.js
+```
+
+To open up five different instances to test 3-of-5 multisig with yourself, then run this in 5 different terminals:
+```
+PORT=3001 node app.js
+PORT=3002 node app.js
+PORT=3003 node app.js
+PORT=3004 node app.js
+PORT=3005 node app.js
+```
diff --git a/app.js b/app.js
new file mode 100644
index 000000000..543f33e01
--- /dev/null
+++ b/app.js
@@ -0,0 +1,12 @@
+var express=require("express");
+var http=require("http");
+
+var app=express();
+
+var port = process.env.PORT || 3000;
+app.set("port", port);
+app.use(express.static(__dirname));
+
+app.listen(port, function(){
+ console.log("Listening at: http://localhost:" + port);
+});
diff --git a/js/config.template.js b/config.template.js
similarity index 78%
rename from js/config.template.js
rename to config.template.js
index e49763637..eb8cdcbb8 100644
--- a/js/config.template.js
+++ b/config.template.js
@@ -3,12 +3,12 @@
var config = {
networkName: 'testnet',
network: {
-// key: 'lwjd5qra8257b9',
+ key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
// This is for running local peerJs with params: ./peerjs -p 10009 -k 'sdfjhwefh'
- key: 'sdfjhwefh',
- host: 'localhost',
- port: 10009,
- path: '/',
+ //key: 'sdfjhwefh',
+ //host: 'localhost',
+ //port: 10009,
+ //path: '/',
maxPeers: 3,
debug: 3,
},
diff --git a/index.html b/index.html
index 6e75ec4ad..fa072b5fe 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
{{totalBalance}} BTC
0 BTC
Address 1 1231 BTC
-Adress 2 1231 BTC
+Address 2 1231 BTC
@@ -281,7 +281,7 @@ missingAddress 1 1231 BTC
-Adress 2 1231 BTC
+Address 2 1231 BTC
@@ -291,7 +291,7 @@ missingAddress 1 1231 BTC
-Adress 2 1231 BTC
+Address 2 1231 BTC
@@ -392,6 +392,8 @@ missing + + @@ -406,7 +408,6 @@ missing - diff --git a/js/controllers/signin.js b/js/controllers/signin.js index df7376677..979cb5f9d 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -16,7 +16,6 @@ angular.module('copay.signin').controller('SigninController', console.log('[signin.js.23:walletId:]',walletId); //TODO var w = walletFactory.open(walletId, opts); controllerUtils.setupUxHandlers(w); - w.netStart(); }; $scope.join = function(secret) { @@ -29,7 +28,6 @@ console.log('[signin.js.23:walletId:]',walletId); //TODO walletFactory.joinCreateSession(secret, function(w) { console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO controllerUtils.setupUxHandlers(w); - w.setupNetHandlers(); }); }; }); diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js index bf8cfa9de..66102e8db 100644 --- a/js/models/core/PrivateKey.js +++ b/js/models/core/PrivateKey.js @@ -32,6 +32,8 @@ PrivateKey.fromObj = function(obj) { }; PrivateKey.prototype.toObj = function() { + +console.log('[PrivateKey.js.35] TODO TODO: PRIV: ', this.getExtendedPrivateKeyString()); //TODO return { extendedPrivateKeyString: this.getExtendedPrivateKeyString(), networkName: this.network.name, diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 881d55589..7b0efd813 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -106,9 +106,11 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) { } this.log('[Wallet.js.98]' , data.type); //TODO switch(data.type) { + // This handler is repeaded on WalletFactory (#join). TODO + case 'walletId': + this.sendWalletReady(senderId); + break; case 'walletReady': - -console.log('[Wallet.js.109] RECV WALLETREADY'); //TODO this.sendPublicKeyRing(senderId); this.sendTxProposals(senderId); break; @@ -189,6 +191,7 @@ console.log('[Wallet.js.177] NET START: emit CREATED'); //TODO if (otherPeerId !== myPeerId) { net.connectTo(otherPeerId); } + self.emit('refresh'); } }, startOpts); }; diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index c3958cd2a..1cab6f6dd 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -33,7 +33,6 @@ console.log('[controllerUtils.js.30:created:] RECV '); //TODO $rootScope.wallet.getBalance(function(balance) { $rootScope.totalBalance = balance; - $rootScope.$digest(); }); }); w.on('refresh', function() { @@ -42,6 +41,8 @@ console.log('[controllerUtils.js.30:created:] RECV '); //TODO }); w.on('openError', root.onErrorDigest); w.on('close', root.onErrorDigest); + +console.log('[controllerUtils.js.45] CALLING NETSTART FROM setupUxHandlers'); //TODO w.netStart(); console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO }; diff --git a/package.json b/package.json index 99b94e0ee..3e3eb6eb7 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "homepage": "https://github.com/bitpay/copay", "devDependencies": { + "express": "4.0.0", "grunt-contrib-watch": "~0.5.3", "grunt-mocha-test": "~0.8.2", "grunt-shell": "~0.6.4",