Merge pull request #78 from pointbiz/split-wallet

v2.9.0 Split Wallet with UI improvements and unit tests (Shamir's Secret Sharing).
pointbiz · Apr 16, 2014 · 27aedc4 · 27aedc4
2 parents b6fb655 + 7e760cb
commit 27aedc4
Show file tree

Hide file tree

Showing 8 changed files with 1,714 additions and 79 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -24,6 +24,7 @@ module.exports = function (grunt) {
 					{ token: "//cryptojs.ripemd160.js", file: "./src/cryptojs.ripemd160.js" },
 					{ token: "//crypto-scrypt.js", file: "./src/crypto-scrypt.js" },
 					{ token: "//ellipticcurve.js", file: "./src/ellipticcurve.js" },
+					{ token: "//secrets.js", file: "./src/secrets.js" },
 					{ token: "//ninja.key.js", file: "./src/ninja.key.js" },
 					{ token: "//ninja.misc.js", file: "./src/ninja.misc.js" },
 					{ token: "//ninja.onload.js", file: "./src/ninja.onload.js" },
@@ -34,6 +35,7 @@ module.exports = function (grunt) {
 					{ token: "//ninja.bulkwallet.js", file: "./src/ninja.bulkwallet.js" },
 					{ token: "//ninja.brainwallet.js", file: "./src/ninja.brainwallet.js" },
 					{ token: "//ninja.vanitywallet.js", file: "./src/ninja.vanitywallet.js" },
+					{ token: "//ninja.splitwallet.js", file: "./src/ninja.splitwallet.js" },
 					{ token: "//ninja.detailwallet.js", file: "./src/ninja.detailwallet.js" },
 					{ token: "//qrcode.js", file: "./src/qrcode.js" },
 					{ token: "//securerandom.js", file: "./src/securerandom.js" },
@@ -46,4 +48,4 @@ module.exports = function (grunt) {
 	grunt.file.defaultEncoding = 'utf-8';
 	grunt.loadNpmTasks("grunt-combine");
 	grunt.registerTask("default", ["combine:single"]);
-};
+};