status-im
/
dappconnect-sdks
mirror of https://github.com/status-im/dappconnect-sdks.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix js-waku utils

This commit is contained in:
Felicio Mununga 2022-05-25 14:42:47 +02:00
parent 4fd6928735
commit a962d8c723
No known key found for this signature in database
GPG Key ID: B4572D17D9BE6ECA
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/status-js/src/topics.ts
View File

@ -1,10 +1,9 @@
import { BN } from 'bn.js' import { BN } from 'bn.js'
import { derive } from 'ecies-geth' import { derive } from 'ecies-geth'
import { ec } from 'elliptic' import { ec } from 'elliptic'
import { bufToHex } from 'js-waku/build/main/lib/utils'
import { idToContentTopic } from './contentTopic' import { idToContentTopic } from './contentTopic'
import { hexToBuf } from './utils' import { bufToHex, hexToBuf } from './utils'
import type { Identity } from '.' import type { Identity } from '.'
@ -40,7 +39,7 @@ export async function getNegotiatedTopic(
const key = EC.keyFromPublic(publicKey.slice(2), 'hex') const key = EC.keyFromPublic(publicKey.slice(2), 'hex')
const sharedSecret = await derive( const sharedSecret = await derive(
Buffer.from(identity.privateKey), Buffer.from(identity.privateKey),
hexToBuf(key.getPublic('hex')) Buffer.concat([hexToBuf(key.getPublic('hex'))])
) )
return idToContentTopic(bufToHex(sharedSecret)) return idToContentTopic(bufToHex(sharedSecret))
} }

6
packages/status-js/src/utils.ts
View File

@ -8,14 +8,16 @@ import type { Waku } from 'js-waku'
const EC = new ec('secp256k1') const EC = new ec('secp256k1')
const hexToBuf = utils.hexToBuf // TODO: rename
const hexToBuf = utils.hexToBytes
export { hexToBuf } export { hexToBuf }
// TODO: rename
/** /**
* Return hex string with 0x prefix (commonly used for string format of a community id/public key. * Return hex string with 0x prefix (commonly used for string format of a community id/public key.
*/ */
export function bufToHex(buf: Uint8Array): string { export function bufToHex(buf: Uint8Array): string {
return '0x' + utils.bufToHex(buf) return '0x' + utils.bytesToHex(buf)
} }
export function compressPublicKey(key: Uint8Array): string { export function compressPublicKey(key: Uint8Array): string {