@@ -1195,7 +1195,7 @@ var DashKeys = ("object" === typeof module && exports) || {};
1195
1195
/** @type {PrivateKeyToWif } */
1196
1196
_DashKeys . privKeyToWif = async function ( privBytes , opts ) {
1197
1197
let privateKey = Utils . bytesToHex ( privBytes ) ;
1198
- let version = opts ?. version ;
1198
+ let version = opts ?. version || "mainnet" ;
1199
1199
1200
1200
switch ( version ) {
1201
1201
case "mainnet" :
@@ -1245,29 +1245,43 @@ var DashKeys = ("object" === typeof module && exports) || {};
1245
1245
1246
1246
/** @type {WifToAddress } */
1247
1247
_DashKeys . wifToAddr = async function ( wif , opts ) {
1248
- let version = opts ?. version || "mainnet" ;
1248
+ let versionCode = opts ?. version || "mainnet" ;
1249
+ /** @type {VERSION_PRIVATE } */
1250
+ let privVersion = DASH_PRIV_KEY ;
1251
+ /** @type {VERSION } */
1252
+ let pubVersion = DASH_PKH ;
1249
1253
1250
- switch ( version ) {
1254
+ switch ( versionCode ) {
1255
+ case DASH_PRIV_KEY :
1256
+ /* fallsthrough */
1257
+ case DASH_PKH :
1258
+ /* fallsthrough */
1251
1259
case "mainnet" :
1252
- version = DASH_PRIV_KEY ;
1260
+ privVersion = DASH_PRIV_KEY ;
1261
+ pubVersion = DASH_PKH ;
1253
1262
break ;
1263
+ case DASH_PKH_TESTNET :
1264
+ /* fallsthrough */
1265
+ case DASH_PRIV_KEY_TESTNET :
1266
+ /* fallsthrough */
1254
1267
case "testnet" :
1255
- version = DASH_PRIV_KEY_TESTNET ;
1268
+ privVersion = DASH_PRIV_KEY_TESTNET ;
1269
+ pubVersion = DASH_PKH_TESTNET ;
1256
1270
break ;
1257
1271
default :
1258
- let msg = `'version' must be "mainnet" or "testnet", not '${ version } ', or use priv => priv or pub => pub methods for more control` ;
1272
+ let msg = `'version' must be "mainnet" or "testnet", not '${ versionCode } ', or use priv => priv or pub => pub methods for more control` ;
1259
1273
throw new Error ( msg ) ;
1260
1274
}
1261
1275
1262
- let privBytes = await _DashKeys . wifToPrivKey ( wif , { version } ) ;
1276
+ let privBytes = await _DashKeys . wifToPrivKey ( wif , { version : privVersion } ) ;
1263
1277
1264
1278
let pubBytes = await Utils . toPublicKey ( privBytes ) ;
1265
1279
let pubKeyHash = await _DashKeys . pubkeyToPkh ( pubBytes ) ;
1266
1280
let pubKeyHashHex = Utils . bytesToHex ( pubKeyHash ) ;
1267
1281
1268
1282
let addr = await dash58check . encode ( {
1269
1283
pubKeyHash : pubKeyHashHex ,
1270
- version : version ,
1284
+ version : pubVersion ,
1271
1285
} ) ;
1272
1286
return addr ;
1273
1287
} ;
@@ -1417,7 +1431,7 @@ if ("object" === typeof module) {
1417
1431
* (of the same coin type, of course)
1418
1432
* @callback WifToAddress
1419
1433
* @param {String } wif - private key
1420
- * @param {PrivateKeyToWifOpts } [opts]
1434
+ * @param {EncodeKeyUint8ArrayOpts } [opts]
1421
1435
* @returns {Promise<String> } - address
1422
1436
*/
1423
1437
0 commit comments