Skip to content

Commit a27ecbf

Browse files
committed
use updated bitcoinjs-lib, requirejs, baseplate for sending, bigdecimal
1 parent e191c58 commit a27ecbf

23 files changed

+154
-2931
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"optimist": "*",
1111
"bitcoin": "*",
1212
"redis": "*",
13-
"libcoin": "*"
13+
"libcoin": "*",
14+
"bigdecimal": "*"
1415
},
1516
"devDependencies": {},
1617
"scripts": {}

public/index.html

+1-56
Original file line numberDiff line numberDiff line change
@@ -17,61 +17,6 @@
1717
<div id="view"></div>
1818
</div>
1919

20-
<script src="js/lib/jquery.js"></script>
21-
<script src="js/lib/bootstrap.min.js"></script>
22-
<script src="js/lib/ejs_production.js"></script>
23-
<script src="js/lib/underscore.js"></script>
24-
<script src="js/lib/jstz.js"></script>
25-
26-
<script src="js/lib/password_strength.js"></script>
27-
<script src="js/lib/jquery.strength.js"></script>
28-
29-
<script src="js/lib/crypto-js/crypto.js"></script>
30-
<script src="js/lib/crypto-js/sha256.js"></script>
31-
<script src="js/lib/crypto-js/ripemd160.js"></script>
32-
33-
<script src="js/lib/jsbn/prng4.js"></script>
34-
<script src="js/lib/jsbn/rng.js"></script>
35-
<script src="js/lib/jsbn/jsbn.js"></script>
36-
<script src="js/lib/jsbn/jsbn2.js"></script>
37-
<script src="js/lib/jsbn/ec.js"></script>
38-
<script src="js/lib/jsbn/sec.js"></script>
39-
40-
<script src="js/lib/events/eventemitter.js"></script>
41-
42-
<script src="js/lib/qrcode.js"></script>
43-
44-
<script src="js/lib/bitcoinjs-lib/bitcoin.js"></script>
45-
<script src="js/lib/bitcoinjs-lib/util.js"></script>
46-
<script src="js/lib/bitcoinjs-lib/base58.js"></script>
47-
<script src="js/lib/bitcoinjs-lib/address.js"></script>
48-
<script src="js/lib/bitcoinjs-lib/ecdsa.js"></script>
49-
<script src="js/lib/bitcoinjs-lib/eckey.js"></script>
50-
<script src="js/lib/bitcoinjs-lib/opcode.js"></script>
51-
52-
<script src="js/lib/bitcoinjs-lib/script.js"></script>
53-
<script src="js/lib/bitcoinjs-lib/transaction.js"></script>
54-
<script src="js/lib/bitcoinjs-lib/wallet.js"></script>
55-
<script src="js/lib/bitcoinjs-lib/txdb.js"></script>
56-
57-
<script src="js/lib/sjcl/sjcl.js"></script>
58-
<script src="js/lib/sjcl/sjcl-sha512.js"></script>
59-
60-
<script src="js/lib/humane_dates.js"></script>
61-
62-
<script src="js/lib/path.min.js"></script>
63-
64-
<script src="js/coinpunk.js"></script>
65-
66-
<script src="js/coinpunk/models/database.js"></script>
67-
<script src="js/coinpunk/models/wallet.js"></script>
68-
69-
<script src="js/coinpunk/controller.js"></script>
70-
<script src="js/coinpunk/controllers/accounts.js"></script>
71-
<script src="js/coinpunk/controllers/dashboard.js"></script>
72-
<script src="js/coinpunk/controllers/tx.js"></script>
73-
74-
<script src="js/coinpunk/router.js"></script>
75-
<script src="js/coinpunk/pricing.js"></script>
20+
<script data-main="js/init" src="js/lib/require.js"></script>
7621
</body>
7722
</html>

public/js/coinpunk/router.js

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ coinpunk.router.map('#/tx/details/:txid').to(function() {
7070
});
7171

7272
coinpunk.router.map('#/tx/send').to(function() {
73+
coinpunk.router.requireSignin();
7374
coinpunk.controllers.tx.send();
7475
});
7576

public/js/init.js

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
require([
3+
"lib/jquery",
4+
"lib/bootstrap.min",
5+
"lib/ejs_production",
6+
"lib/underscore",
7+
"lib/password_strength",
8+
"lib/jquery.strength",
9+
"lib/qrcode",
10+
], function(util) {
11+
//This function is called when scripts/helper/util.js is loaded.
12+
//If util.js calls define(), then this function is not fired until
13+
//util's dependencies have loaded, and the util argument will hold
14+
//the module value for "helper/util".
15+
});
16+
17+
var Bitcoin = {};
18+
19+
require(["lib/bitcoinjs-lib/index"], function(require) {
20+
Bitcoin = require;
21+
});
22+
23+
require([
24+
"lib/sjcl/sjcl",
25+
"lib/sjcl/sjcl-sha512",
26+
"lib/humane_dates",
27+
"lib/path.min",
28+
"coinpunk",
29+
"coinpunk/models/database",
30+
"coinpunk/models/wallet",
31+
"coinpunk/controller",
32+
"coinpunk/controllers/accounts",
33+
"coinpunk/controllers/dashboard",
34+
"coinpunk/controllers/tx",
35+
"coinpunk/router",
36+
"coinpunk/pricing"
37+
], function(require) {});

public/js/lib/bitcoinjs-lib

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 5125438459f83488cc5eae6626fa10f656332106

public/js/lib/bitcoinjs-lib/address.js

-57
This file was deleted.

public/js/lib/bitcoinjs-lib/base58.js

-71
This file was deleted.

0 commit comments

Comments
 (0)