oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

refactor

Browse Source
This commit is contained in:
alexcos20 2020-04-14 15:32:17 +03:00
parent 5d273a98ce
commit 2ed8237350
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/brizo/Brizo.ts
View File

@ -124,7 +124,10 @@ export class Brizo extends Instantiable {
let signatureMessage = address let signatureMessage = address
signatureMessage += (jobId && `${jobId}`) || '' signatureMessage += (jobId && `${jobId}`) || ''
signatureMessage += (serviceAgreementId && `${noZeroX(serviceAgreementId)}`) || '' signatureMessage += (serviceAgreementId && `${noZeroX(serviceAgreementId)}`) || ''
const signature = await this.createSignature(consumerAccount, signatureMessage) const signature = await this.createHashSignature(
consumerAccount,
signatureMessage
)
let serviceEndpoint let serviceEndpoint
if (serviceAgreementId) if (serviceAgreementId)
@ -194,7 +197,18 @@ export class Brizo extends Instantiable {
return result return result
} }
public async createSignature(account: Account, message: string): Promise<string> { public async createSignature(account: Account, agreementId: string): Promise<string> {
const signature =
(await account.getToken()) ||
(await this.ocean.utils.signature.signText(
noZeroX(agreementId),
account.getId()
))
return signature
}
public async createHashSignature(account: Account, message: string): Promise<string> {
const signature = const signature =
(await account.getToken()) || (await account.getToken()) ||
(await this.ocean.utils.signature.signWithHash(message, account.getId())) (await this.ocean.utils.signature.signWithHash(message, account.getId()))

2
src/ocean/utils/SignatureUtils.ts
View File

@ -48,7 +48,7 @@ export class SignatureUtils {
this.web3.currentProvider && this.web3.currentProvider &&
(this.web3.currentProvider as any).isMetaMask (this.web3.currentProvider as any).isMetaMask
try { try {
const hash = this.web3.utils.utf8ToHex(text); const hash = this.web3.utils.utf8ToHex(text)
return await this.web3.eth.personal.sign(hash, publicKey, password) return await this.web3.eth.personal.sign(hash, publicKey, password)
} catch (e) { } catch (e) {
if (isMetaMask) { if (isMetaMask) {