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

2
web3.js/.gitignore vendored
View File

@ -23,4 +23,4 @@ lib
doc doc
# VIM swap files # VIM swap files
*.sw[po] *.sw.

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

@ -13,13 +13,26 @@ export class PublicKey {
* Create a new PublicKey object * Create a new PublicKey object
*/ */
constructor(number: string | Buffer | Array<number>) { constructor(number: string | Buffer | Array<number>) {
let radix = 10;
if (typeof number === 'string' && number.startsWith('0x')) { for (;;) {
this._bn = new BN(number.substring(2), 16); if (typeof number === 'string') {
} else { // base 58 encoded?
this._bn = new BN(number, radix); 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) { if (this._bn.byteLength() > 32) {
throw new Error(`Invalid public key input`); throw new Error(`Invalid public key input`);
} }

3
web3.js/test/publickey.test.js
View File

@ -23,9 +23,11 @@ test('equals', () => {
]); ]);
const hexKey = new PublicKey('0x300000000000000000000000000000000000000000000000000000000000000'); const hexKey = new PublicKey('0x300000000000000000000000000000000000000000000000000000000000000');
const decimalKey = new PublicKey('1356938545749799165119972480570561420155507632800475359837393562592731987968'); const decimalKey = new PublicKey('1356938545749799165119972480570561420155507632800475359837393562592731987968');
const base56Key = new PublicKey('CiDwVBFgWV9E5MvXWoLgnEgn2hK7rJikbvfWavzAQz3');
expect(arrayKey.equals(hexKey)).toBeTruthy(); expect(arrayKey.equals(hexKey)).toBeTruthy();
expect(arrayKey.equals(decimalKey)).toBeTruthy(); expect(arrayKey.equals(decimalKey)).toBeTruthy();
expect(arrayKey.equals(base56Key)).toBeTruthy();
}); });
test('isPublicKey', () => { test('isPublicKey', () => {
@ -40,7 +42,6 @@ test('toBase58', () => {
const key2 = new PublicKey('123456789'); const key2 = new PublicKey('123456789');
expect(key2.toBase58()).toBe('Vj3WURvtMv1mii1vhTqLhcSwVWDRs2E135KtTYUXtTq'); expect(key2.toBase58()).toBe('Vj3WURvtMv1mii1vhTqLhcSwVWDRs2E135KtTYUXtTq');
console.log(key2.toBuffer());
}); });
test('toBuffer', () => { test('toBuffer', () => {