nexus/bip39
2
0
Fork 0
mirror of https://github.com/OneKeyHQ/bip39.git synced 2026-04-28 21:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename bip49 to p2wpkhNestedInP2sh where suitable

Browse Source
This commit is contained in:
Ian Coleman
2017-09-01 12:25:45 +10:00
parent 7258b102c1
commit 0cda44d5f6
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/index.js
+35 -35
View File
@@ -131,11 +131,11 @@
var networkIndex = e.target.value; var networkIndex = e.target.value;
var network = networks[networkIndex]; var network = networks[networkIndex];
network.onSelect(); network.onSelect();
if (network.bip49available) { if (network.p2wpkhNestedInP2shAvailable) {
showBip49(); showP2wpkhNestedInP2shAvailable();
} }
else { else {
hideBip49(); showP2wpkhNestedInP2shUnavailable();
} }
if (seed != null) { if (seed != null) {
phraseChanged(); phraseChanged();
@@ -638,8 +638,8 @@
var self = this; var self = this;
this.shouldGenerate = true; this.shouldGenerate = true;
var useHardenedAddresses = DOM.hardenedAddresses.prop("checked"); var useHardenedAddresses = DOM.hardenedAddresses.prop("checked");
var isBip49 = bip49TabSelected(); var isP2wpkhNestedInP2sh = bip49TabSelected();
var bip49available = networkHasBip49(); var p2wpkhNestedInP2shAvailable = networkHasBip49();
function init() { function init() {
calculateValues(); calculateValues();
@@ -684,8 +684,8 @@
address = convertRippleAdrr(address); address = convertRippleAdrr(address);
} }
// BIP49 addresses are different // BIP49 addresses are different
if (isBip49) { if (isP2wpkhNestedInP2sh) {
if (!bip49available) { if (!p2wpkhNestedInP2shAvailable) {
return; return;
} }
var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer());
@@ -1166,7 +1166,7 @@
} }
function networkHasBip49() { function networkHasBip49() {
return networks[DOM.network.val()].bip49available; return networks[DOM.network.val()].p2wpkhNestedInP2shAvailable;
} }
function bip49TabSelected() { function bip49TabSelected() {
@@ -1178,12 +1178,12 @@
DOM.bip49coin.val(coinValue); DOM.bip49coin.val(coinValue);
} }
function showBip49() { function showP2wpkhNestedInP2shAvailable() {
DOM.bip49unavailable.addClass("hidden"); DOM.bip49unavailable.addClass("hidden");
DOM.bip49available.removeClass("hidden"); DOM.bip49available.removeClass("hidden");
} }
function hideBip49() { function showP2wpkhNestedInP2shUnavailable() {
DOM.bip49available.addClass("hidden"); DOM.bip49available.addClass("hidden");
DOM.bip49unavailable.removeClass("hidden"); DOM.bip49unavailable.removeClass("hidden");
} }
@@ -1191,7 +1191,7 @@
var networks = [ var networks = [
{ {
name: "BCH - Bitcoin Cash", name: "BCH - Bitcoin Cash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(145); setHdCoin(145);
@@ -1199,7 +1199,7 @@
}, },
{ {
name: "BTC - Bitcoin", name: "BTC - Bitcoin",
bip49available: true, p2wpkhNestedInP2shAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(0); setHdCoin(0);
@@ -1207,7 +1207,7 @@
}, },
{ {
name: "BTC - Bitcoin Testnet", name: "BTC - Bitcoin Testnet",
bip49available: true, p2wpkhNestedInP2shAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.testnet; network = bitcoinjs.bitcoin.networks.testnet;
setHdCoin(1); setHdCoin(1);
@@ -1215,7 +1215,7 @@
}, },
{ {
name: "CLAM - Clams", name: "CLAM - Clams",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.clam; network = bitcoinjs.bitcoin.networks.clam;
setHdCoin(23); setHdCoin(23);
@@ -1223,7 +1223,7 @@
}, },
{ {
name: "CRW - Crown", name: "CRW - Crown",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.crown; network = bitcoinjs.bitcoin.networks.crown;
setHdCoin(72); setHdCoin(72);
@@ -1231,7 +1231,7 @@
}, },
{ {
name: "DASH - Dash", name: "DASH - Dash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dash; network = bitcoinjs.bitcoin.networks.dash;
setHdCoin(5); setHdCoin(5);
@@ -1239,7 +1239,7 @@
}, },
{ {
name: "DASH - Dash Testnet", name: "DASH - Dash Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dashtn; network = bitcoinjs.bitcoin.networks.dashtn;
setHdCoin(1); setHdCoin(1);
@@ -1247,7 +1247,7 @@
}, },
{ {
name: "DOGE - Dogecoin", name: "DOGE - Dogecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dogecoin; network = bitcoinjs.bitcoin.networks.dogecoin;
setHdCoin(3); setHdCoin(3);
@@ -1255,7 +1255,7 @@
}, },
{ {
name: "ETH - Ethereum", name: "ETH - Ethereum",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(60); setHdCoin(60);
@@ -1263,7 +1263,7 @@
}, },
{ {
name: "GAME - GameCredits", name: "GAME - GameCredits",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.game; network = bitcoinjs.bitcoin.networks.game;
setHdCoin(101); setHdCoin(101);
@@ -1271,7 +1271,7 @@
}, },
{ {
name: "JBS - Jumbucks", name: "JBS - Jumbucks",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.jumbucks; network = bitcoinjs.bitcoin.networks.jumbucks;
setHdCoin(26); setHdCoin(26);
@@ -1279,7 +1279,7 @@
}, },
{ {
name: "LTC - Litecoin", name: "LTC - Litecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecoin; network = bitcoinjs.bitcoin.networks.litecoin;
setHdCoin(2); setHdCoin(2);
@@ -1288,7 +1288,7 @@
}, },
{ {
name: "MAZA - Maza", name: "MAZA - Maza",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.maza; network = bitcoinjs.bitcoin.networks.maza;
setHdCoin(13); setHdCoin(13);
@@ -1297,7 +1297,7 @@
{ {
name: "NMC - Namecoin", name: "NMC - Namecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.namecoin; network = bitcoinjs.bitcoin.networks.namecoin;
setHdCoin(7); setHdCoin(7);
@@ -1305,7 +1305,7 @@
}, },
{ {
name: "PIVX - PIVX", name: "PIVX - PIVX",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivx; network = bitcoinjs.bitcoin.networks.pivx;
setHdCoin(119); setHdCoin(119);
@@ -1313,7 +1313,7 @@
}, },
{ {
name: "PIVX - PIVX Testnet", name: "PIVX - PIVX Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivxtestnet; network = bitcoinjs.bitcoin.networks.pivxtestnet;
setHdCoin(1); setHdCoin(1);
@@ -1321,7 +1321,7 @@
}, },
{ {
name: "PPC - Peercoin", name: "PPC - Peercoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.peercoin; network = bitcoinjs.bitcoin.networks.peercoin;
setHdCoin(6); setHdCoin(6);
@@ -1329,7 +1329,7 @@
}, },
{ {
name: "SDC - ShadowCash", name: "SDC - ShadowCash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadow; network = bitcoinjs.bitcoin.networks.shadow;
setHdCoin(35); setHdCoin(35);
@@ -1337,7 +1337,7 @@
}, },
{ {
name: "SDC - ShadowCash Testnet", name: "SDC - ShadowCash Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadowtn; network = bitcoinjs.bitcoin.networks.shadowtn;
setHdCoin(1); setHdCoin(1);
@@ -1345,7 +1345,7 @@
}, },
{ {
name: "SLM - Slimcoin", name: "SLM - Slimcoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcoin; network = bitcoinjs.bitcoin.networks.slimcoin;
setHdCoin(63); setHdCoin(63);
@@ -1353,7 +1353,7 @@
}, },
{ {
name: "SLM - Slimcoin Testnet", name: "SLM - Slimcoin Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcointn; network = bitcoinjs.bitcoin.networks.slimcointn;
setHdCoin(111); setHdCoin(111);
@@ -1361,7 +1361,7 @@
}, },
{ {
name: "VIA - Viacoin", name: "VIA - Viacoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacoin; network = bitcoinjs.bitcoin.networks.viacoin;
setHdCoin(14); setHdCoin(14);
@@ -1369,7 +1369,7 @@
}, },
{ {
name: "VIA - Viacoin Testnet", name: "VIA - Viacoin Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacointestnet; network = bitcoinjs.bitcoin.networks.viacointestnet;
setHdCoin(1); setHdCoin(1);
@@ -1377,7 +1377,7 @@
}, },
{ {
name: "XMY - Myriadcoin", name: "XMY - Myriadcoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.myriadcoin; network = bitcoinjs.bitcoin.networks.myriadcoin;
setHdCoin(90); setHdCoin(90);
@@ -1385,7 +1385,7 @@
}, },
{ {
name: "XRP - Ripple", name: "XRP - Ripple",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(144); setHdCoin(144);