Merge pull request #403 from swtcca/master

add two networks: Jingtum and MOAC
This commit is contained in:
iancoleman
2020-02-17 10:33:08 +11:00
committed by GitHub
4 changed files with 52 additions and 0 deletions

View File

@@ -963,6 +963,7 @@
<script src="js/bitcoinjs-extensions.js"></script>
<script src="js/segwit-parameters.js"></script>
<script src="js/ripple-util.js"></script>
<script src="js/jingtum-util.js"></script>
<script src="js/casinocoin-util.js"></script>
<script src="js/eos-util.js"></script>
<script src="js/sjcl-bip39.js"></script>

View File

@@ -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() {

10
src/js/jingtum-util.js Normal file
View File

@@ -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)
}

View File

@@ -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",