oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

proof refactor

Browse Source
This commit is contained in:
alexcos20 2020-10-13 06:54:37 -07:00
parent 0088e94c01
commit e68c6d8c72
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ddo/DDO.ts
View File

@ -117,35 +117,10 @@ export class DDO {
} }
/** /**
* Generates proof using personal sing. * Generates and adds a simple hash proof on publicKey
* @param {Ocean} ocean Ocean instance. * @param {Ocean} ocean Ocean instance.
* @param {string} publicKey Public key to be used on personal sign. * @param {string} publicKey Public key to be used on personal sign.
* @param {string} password Password if it's required. * @return {Promise<void>}
* @return {Promise<Proof>} Proof object.
*/
public async generateProof(
ocean: Ocean,
publicKey: string,
password?: string
): Promise<Proof> {
const checksum = this.getChecksum()
const signature = await ocean.utils.signature.signText(checksum, publicKey, password)
return {
created: new Date().toISOString().replace(/\.[0-9]{3}/, ''),
creator: publicKey,
type: 'DDOIntegritySignature',
signatureValue: signature
}
}
/**
* Generates and adds a proof using personal sing on the DDO.
* @param {Ocean} ocean Ocean instance.
* @param {string} publicKey Public key to be used on personal sign.
* @param {string} password Password if it's required.
* @return {Promise<Proof>} Proof object.
*/ */
public async addProof( public async addProof(
ocean: Ocean, ocean: Ocean,
@ -155,20 +130,6 @@ export class DDO {
if (this.proof) { if (this.proof) {
throw new Error('Proof already exists') throw new Error('Proof already exists')
} }
this.proof = await this.generateProof(ocean, publicKey, password)
}
/**
* Generates and adds a simple hash proof
* @param {Ocean} ocean Ocean instance.
* @param {string} publicKey Public key to be used on personal sign.
* @return {Promise<Proof>} Proof object.
*/
public async addSimpleProof(ocean: Ocean, publicKey: string): Promise<void> {
if (this.proof) {
throw new Error('Proof already exists')
}
this.proof = { this.proof = {
created: new Date().toISOString().replace(/\.[0-9]{3}/, ''), created: new Date().toISOString().replace(/\.[0-9]{3}/, ''),
creator: publicKey, creator: publicKey,

2
src/ocean/Assets.ts
View File

@ -190,7 +190,7 @@ export class Assets extends Instantiable {
}) })
// this.logger.log('Generating proof') // this.logger.log('Generating proof')
// observer.next(CreateProgressStep.GeneratingProof) // observer.next(CreateProgressStep.GeneratingProof)
await ddo.addSimpleProof(this.ocean, publisher.getId()) await ddo.addProof(this.ocean, publisher.getId())
// this.logger.log('Proof generated') // this.logger.log('Proof generated')
// observer.next(CreateProgressStep.ProofGenerated) // observer.next(CreateProgressStep.ProofGenerated)
this.logger.log('Storing DDO') this.logger.log('Storing DDO')