From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Sun, 16 Feb 2020 23:33:08 +0000 (+1100)
Subject: Merge pull request #403 from swtcca/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=ff2940e81e79658434ee851729f1f4eb8405b756;hp=90f7a5ec9309c755dd06a534190067fa6f1f97fe
Merge pull request #403 from swtcca/master
add two networks: Jingtum and MOAC
---
diff --git a/src/index.html b/src/index.html
index d486fa2..1184a0c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -963,6 +963,7 @@
+
diff --git a/src/js/index.js b/src/js/index.js
index 3981e81..c2d34a7 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1165,6 +1165,11 @@
privkey = convertRipplePriv(privkey);
address = convertRippleAdrr(address);
}
+ // Jingtum values are different
+ if (networks[DOM.network.val()].name == "SWTC - Jingtum") {
+ privkey = convertJingtumPriv(privkey);
+ address = convertJingtumAdrr(address);
+ }
// CasinoCoin values are different
if (networks[DOM.network.val()].name == "CSC - CasinoCoin") {
privkey = convertCasinoCoinPriv(privkey);
@@ -1832,6 +1837,7 @@
|| (name == "EWT - EnergyWeb")
|| (name == "PIRL - Pirl")
|| (name == "MIX - MIX")
+ || (name == "MOAC - MOAC")
|| (name == "MUSIC - Musicoin")
|| (name == "POA - Poa")
|| (name == "EXP - Expanse")
@@ -2738,6 +2744,14 @@
setHdCoin(214);
},
},
+ {
+ name: "MOAC - MOAC",
+ segwitAvailable: false,
+ onSelect: function() {
+ network = libs.bitcoin.networks.bitcoin;
+ setHdCoin(314);
+ },
+ },
{
name: "MUSIC - Musicoin",
segwitAvailable: false,
@@ -3077,6 +3091,13 @@
setHdCoin(105);
},
},
+ {
+ name: "SWTC - Jingtum",
+ onSelect: function() {
+ network = libs.bitcoin.networks.bitcoin;
+ setHdCoin(315);
+ },
+ },
{
name: "TSTRAT - Stratis Testnet",
onSelect: function() {
diff --git a/src/js/jingtum-util.js b/src/js/jingtum-util.js
new file mode 100644
index 0000000..56dbec6
--- /dev/null
+++ b/src/js/jingtum-util.js
@@ -0,0 +1,10 @@
+function convertJingtumAdrr(address) {
+ return libs.basex('jpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65rkm8oFqi1tuvAxyz').encode(
+ libs.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(address)
+ )
+ }
+
+function convertJingtumPriv(priv) {
+ return libs.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(priv).toString("hex").slice(2,66)
+}
+
diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 6523ac5..31fa043 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -464,6 +464,16 @@ it('Allows selection of ripple', function(done) {
};
testNetwork(done, params);
});
+it('Allows selection of jingtum', function(done) {
+ var params = {
+ selectText: "SWTC - Jingtum",
+ phrase: "ill clump only blind unit burden thing track silver cloth review awake useful craft whale all satisfy else trophy sunset walk vanish hope valve",
+ firstAddress: "jffSYWyxcr9t6DHHdAj2yUXrCsioU66xjm",
+ firstPubKey: "029dfcb278148874dd7e7109001593d7f410909e7bbcbcc3cc19ecb476c8bf8d84",
+ firstPrivKey: "02bdfe14bdd75514e714db7b8cbbae87b2ab8d7a050c3e441d687b7c4ef17d1f",
+ };
+ testNetwork(done, params);
+});
it('Allows selection of casinocoin', function(done) {
var params = {
selectText: "CSC - CasinoCoin",
@@ -1896,6 +1906,16 @@ it('Allows selection of Monkey Project', function(done) {
testNetwork(done, params);
});
+it('Allows selection of MOAC', function(done) {
+ var params = {
+ selectText: "MOAC - MOAC",
+ phrase: "ill clump only blind unit burden thing track silver cloth review awake useful craft whale all satisfy else trophy sunset walk vanish hope valve",
+ firstAddress: "0xa1350EA5707247e0092Ab780A0CDbeA9c8C7Acb5",
+ firstPubKey: "0x0376b024c6068c9fda7e91779e115dcd3a70584fd6984e6dd25da144c46ca259c6",
+ firstPrivKey: "0x2515f9db03c1e56de393648eabf35d288f730aadce5d30865c52e72b28e303c9",
+ };
+ testNetwork(done, params);
+});
it('Allows selection of Musicoin', function(done) {
var params = {
selectText: "MUSIC - Musicoin",