npm/tic-crypto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buf fix: 把 options 换成 {...} 写法后，secword2address 没能把 world 参数传递到 position2address，导致生成地址错误。

Browse Source
This commit is contained in:
陆柯 2021-06-16 11:09:20 +08:00
parent d0500a9730
commit 7ac41c9f32
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.js
View File

@ -518,15 +518,15 @@ class TICrypto {
* @return {String} address * @return {String} address
* @memberof TICrypto * @memberof TICrypto
*/ */
static secword2address(secword, { coin, pass, path, tool, hasher } = {}) { static secword2address(secword, { coin, world, pass, path, tool, hasher } = {}) {
coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN
let kp = this.secword2keypair(secword, { coin, pass, path, tool, hasher }) let kp = this.secword2keypair(secword, { coin, pass, path, tool, hasher })
if (kp) { if (kp) {
let address let address
if (coin === 'ETH') { if (coin === 'ETH') {
address = this.pubkey2address(this.decompressPubkey(kp.pubkey), { coin: 'ETH' }) address = this.pubkey2address(this.decompressPubkey(kp.pubkey), { coin: 'ETH', world })
} else { } else {
address = this.pubkey2address(kp.pubkey, { coin }) address = this.pubkey2address(kp.pubkey, { coin, world })
} }
return address return address
} }
@ -574,17 +574,17 @@ class TICrypto {
* @return {*} * @return {*}
* @memberof TICrypto * @memberof TICrypto
*/ */
static seckey2address(seckey, { coin } = {}) { static seckey2address(seckey, { coin, world } = {}) {
coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN
if (this.isSeckey(seckey)) { if (this.isSeckey(seckey)) {
/** @type {*} */ /** @type {*} */
let pubkey let pubkey
if (coin === 'ETH') { if (coin === 'ETH') {
pubkey = this.seckey2pubkey(seckey, { compress: false }) pubkey = this.seckey2pubkey(seckey, { compress: false })
return this.pubkey2address(pubkey, { coin }) return this.pubkey2address(pubkey, { coin, world })
} else { } else {
pubkey = this.seckey2pubkey(seckey, { compress: true }) pubkey = this.seckey2pubkey(seckey, { compress: true })
return this.pubkey2address(pubkey, { coin }) return this.pubkey2address(pubkey, { coin, world })
} }
} }
return null return null
@ -765,10 +765,10 @@ class TICrypto {
* @return {*} * @return {*}
* @memberof TICrypto * @memberof TICrypto
*/ */
static pubkey2address(pubkey, { coin } = {}) { static pubkey2address(pubkey, { coin, world } = {}) {
// pubkey 应当是string类型 // pubkey 应当是string类型
coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN coin = my.COIN_LIST.indexOf(coin?.toUpperCase()) >= 0 ? coin.toUpperCase() : my.COIN
return this.position2address(this.pubkey2position(pubkey, { coin }), { coin }) return this.position2address(this.pubkey2position(pubkey, { coin }), { coin, world })
} }
/** /**