gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: support creating a PublicKey from a base58 string

Browse Source
This commit is contained in:
Michael Vines
2018-09-30 21:27:55 -07:00
parent 4b2305434e
commit 95efc7c3b0
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web3.js/src/publickey.js
View File

@ -13,13 +13,26 @@ export class PublicKey {
* Create a new PublicKey object
*/
constructor(number: string | Buffer | Array<number>) {
let radix = 10;
if (typeof number === 'string' && number.startsWith('0x')) {
this._bn = new BN(number.substring(2), 16);
} else {
this._bn = new BN(number, radix);
for (;;) {
if (typeof number === 'string') {
// base 58 encoded?
if (/^[1-9A-HJ-NP-Za-km-z]{43,44}$/.test(number)) {
this._bn = new BN(bs58.decode(number));
break;
}
// hexadecimal number
if (number.startsWith('0x')) {
this._bn = new BN(number.substring(2), 16);
break;
}
}
this._bn = new BN(number);
break;
}
if (this._bn.byteLength() > 32) {
throw new Error(`Invalid public key input`);
}