Merge branch 'master' into eosio-support

This commit is contained in:
iancoleman
2019-06-11 09:37:53 +10:00
committed by GitHub
3 changed files with 82 additions and 5 deletions
+25 -2
View File
@@ -980,11 +980,12 @@
address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
}
}
if ((networks[DOM.network.val()].name == "CRW - Crown")) {
address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address);
}
if (networks[DOM.network.val()].name == "EOS - EOSIO") {
if (networks[DOM.network.val()].name == "EOS - EOSIO") {
address = ""
pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
@@ -1964,6 +1965,13 @@
setHdCoin(3);
},
},
{
name: "DOGEt - Dogecoin Testnet",
onSelect: function() {
network = bitcoinjs.bitcoin.networks.dogecointestnet;
setHdCoin(1);
},
},
{
name: "DXN - DEXON",
onSelect: function() {
@@ -2224,6 +2232,14 @@
DOM.litecoinLtubContainer.removeClass("hidden");
},
},
{
name: "LTCt - Litecoin Testnet",
onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecointestnet;
setHdCoin(1);
DOM.litecoinLtubContainer.removeClass("hidden");
},
},
{
name: "LTZ - LitecoinZ",
onSelect: function() {
@@ -2768,6 +2784,13 @@
setHdCoin(121);
},
},
{
name: "MONK - Monkey Project",
` onSelect: function() {
network = bitcoinjs.bitcoin.networks.monkey;
setHdCoin(214);
},
}
]
var clients = [