oceanprotocol
/
squid-js
mirror of https://github.com/oceanprotocol-archive/squid-js.git
1
0
Fork 0
Code Releases Activity

tweak printWidth

This commit is contained in:
Matthias Kretschmann 2019-11-15 00:00:10 +01:00
parent 0552bcc577
commit 143fcbecf3
Signed by: m
GPG Key ID: 606EEEF3C479A91F
65 changed files with 1185 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.prettierrc
View File

@ -1,6 +1,6 @@
{
"semi": false,
"singleQuote": true,
"printWidth": 120,
"printWidth": 90,
"trailingComma": "none"
}

35
integration/ocean/AssetOwners.test.ts
View File

@ -32,7 +32,10 @@ describe('Asset Owners', () => {
it('should set the provider of an asset', async () => {
const ddo = await ocean.assets.create(metadata as any, account1)
const isProvider = await ocean.keeper.didRegistry.isDIDProvider(ddo.id, config.brizoAddress)
const isProvider = await ocean.keeper.didRegistry.isDIDProvider(
ddo.id,
config.brizoAddress
)
assert.isTrue(isProvider)
})
@ -40,11 +43,19 @@ describe('Asset Owners', () => {
it('should be added correctly a permission on an asset', async () => {
const ddo = await ocean.assets.create(metadata as any, account1)
assert.isFalse(await ocean.keeper.didRegistry.getPermission(ddo.id, account2.getId()))
assert.isFalse(
await ocean.keeper.didRegistry.getPermission(ddo.id, account2.getId())
)
await ocean.keeper.didRegistry.grantPermission(ddo.id, account2.getId(), account1.getId())
await ocean.keeper.didRegistry.grantPermission(
ddo.id,
account2.getId(),
account1.getId()
)
assert.isTrue(await ocean.keeper.didRegistry.getPermission(ddo.id, account2.getId()))
assert.isTrue(
await ocean.keeper.didRegistry.getPermission(ddo.id, account2.getId())
)
})
it('should get the assets owned by a user', async () => {
@ -61,16 +72,22 @@ describe('Asset Owners', () => {
})
it('should get the assets that can be consumed by a user', async () => {
const { length: initialLength } = await ocean.assets.consumerAssets(account2.getId())
const { length: initialLength } = await ocean.assets.consumerAssets(
account2.getId()
)
const ddo = await ocean.assets.create(metadata as any, account1)
const { length: finalLength1 } = await ocean.assets.consumerAssets(account2.getId())
const { length: finalLength1 } = await ocean.assets.consumerAssets(
account2.getId()
)
assert.equal(finalLength1 - initialLength, 0)
// Granting access
try {
await account2.requestTokens(+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals()))
await account2.requestTokens(
+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals())
)
} catch {}
const { index } = ddo.findServiceByType('access')
@ -78,7 +95,9 @@ describe('Asset Owners', () => {
await ocean.assets.order(ddo.id, index, account2)
// Access granted
const { length: finalLength2 } = await ocean.assets.consumerAssets(account2.getId())
const { length: finalLength2 } = await ocean.assets.consumerAssets(
account2.getId()
)
assert.equal(finalLength2 - initialLength, 1)
})

46
integration/ocean/ConsumeAsset.test.ts
View File

@ -37,28 +37,48 @@ describe('Consume Asset', () => {
assert.isDefined(ddo, 'Register has not returned a DDO')
assert.match(ddo.id, /^did:op:[a-f0-9]{64}$/, 'DDO id is not valid')
assert.isAtLeast(ddo.authentication.length, 1, 'Default authentication not added')
assert.isDefined(ddo.findServiceByType('access'), "DDO access service doesn't exist")
assert.isDefined(
ddo.findServiceByType('access'),
"DDO access service doesn't exist"
)
})
it('should be able to request tokens for consumer', async () => {
const initialBalance = (await consumer.getBalance()).ocn
const claimedTokens = +metadata.main.price * 10 ** -(await ocean.keeper.token.decimals())
const claimedTokens =
+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals())
try {
await consumer.requestTokens(claimedTokens)
} catch {}
assert.equal((await consumer.getBalance()).ocn, initialBalance + claimedTokens, 'OCN Tokens not delivered')
assert.equal(
(await consumer.getBalance()).ocn,
initialBalance + claimedTokens,
'OCN Tokens not delivered'
)
})
it('should sign the service agreement', async () => {
const accessService = ddo.findServiceByType('access')
serviceAgreementSignatureResult = await ocean.agreements.prepare(ddo.id, accessService.index, consumer)
serviceAgreementSignatureResult = await ocean.agreements.prepare(
ddo.id,
accessService.index,
consumer
)
const { agreementId, signature } = serviceAgreementSignatureResult
assert.match(agreementId, /^0x[a-f0-9]{64}$/, 'Service agreement ID seems not valid')
assert.match(signature, /^0x[a-f0-9]{130}$/, 'Service agreement signature seems not valid')
assert.match(
agreementId,
/^0x[a-f0-9]{64}$/,
'Service agreement ID seems not valid'
)
assert.match(
signature,
/^0x[a-f0-9]{130}$/,
'Service agreement signature seems not valid'
)
})
it('should execute the service agreement', async () => {
@ -77,7 +97,9 @@ describe('Consume Asset', () => {
})
it('should get the agreement conditions status not fulfilled', async () => {
const status = await ocean.agreements.status(serviceAgreementSignatureResult.agreementId)
const status = await ocean.agreements.status(
serviceAgreementSignatureResult.agreementId
)
assert.deepEqual(status, {
lockReward: ConditionState.Unfulfilled,
@ -118,7 +140,9 @@ describe('Consume Asset', () => {
})
it('should get the agreement conditions status fulfilled', async () => {
const status = await ocean.agreements.status(serviceAgreementSignatureResult.agreementId)
const status = await ocean.agreements.status(
serviceAgreementSignatureResult.agreementId
)
assert.deepEqual(status, {
lockReward: ConditionState.Fulfilled,
@ -147,7 +171,11 @@ describe('Consume Asset', () => {
})
})
assert.deepEqual(files, ['README.md', 'package.json'], 'Stored files are not correct.')
assert.deepEqual(
files,
['README.md', 'package.json'],
'Stored files are not correct.'
)
})
it('should consume and store one asset', async () => {

26
integration/ocean/ConsumeAssetBrizo.test.ts
View File

@ -41,7 +41,9 @@ describe('Consume Asset (Brizo)', () => {
it('should regiester an asset', async () => {
const steps = []
ddo = await ocean.assets.create(metadata as any, publisher).next(step => steps.push(step))
ddo = await ocean.assets
.create(metadata as any, publisher)
.next(step => steps.push(step))
assert.instanceOf(ddo, DDO)
assert.deepEqual(steps, [0, 1, 2, 3, 4, 5, 6, 7])
@ -51,11 +53,15 @@ describe('Consume Asset (Brizo)', () => {
const accessService = ddo.findServiceByType('access')
try {
await consumer.requestTokens(+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals()))
await consumer.requestTokens(
+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals())
)
} catch {}
const steps = []
agreementId = await ocean.assets.order(ddo.id, accessService.index, consumer).next(step => steps.push(step))
agreementId = await ocean.assets
.order(ddo.id, accessService.index, consumer)
.next(step => steps.push(step))
assert.isDefined(agreementId)
assert.deepEqual(steps, [0, 1, 2, 3])
@ -65,7 +71,13 @@ describe('Consume Asset (Brizo)', () => {
const accessService = ddo.findServiceByType('access')
const folder = '/tmp/ocean/squid-js'
const path = await ocean.assets.consume(agreementId, ddo.id, accessService.index, consumer, folder)
const path = await ocean.assets.consume(
agreementId,
ddo.id,
accessService.index,
consumer,
folder
)
assert.include(path, folder, 'The storage path is not correct.')
@ -75,6 +87,10 @@ describe('Consume Asset (Brizo)', () => {
})
})
assert.deepEqual(files, ['README.md', 'package.json'], 'Stored files are not correct.')
assert.deepEqual(
files,
['README.md', 'package.json'],
'Stored files are not correct.'
)
})
})

20
integration/ocean/ConsumeBigAsset.test.ts
View File

@ -32,7 +32,13 @@ xdescribe('Consume Asset (Large size)', () => {
...baseMetadata,
main: {
...baseMetadata.main,
files: [{ index: 0, contentType: 'hello/hello', url: 'https://speed.hetzner.de/1GB.bin' }]
files: [
{
index: 0,
contentType: 'hello/hello',
url: 'https://speed.hetzner.de/1GB.bin'
}
]
}
}
})
@ -47,7 +53,9 @@ xdescribe('Consume Asset (Large size)', () => {
const accessService = ddo.findServiceByType('access')
try {
await consumer.requestTokens(+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals()))
await consumer.requestTokens(
+metadata.main.price * 10 ** -(await ocean.keeper.token.decimals())
)
} catch {}
agreementId = await ocean.assets.order(ddo.id, accessService.index, consumer)
@ -59,7 +67,13 @@ xdescribe('Consume Asset (Large size)', () => {
const accessService = ddo.findServiceByType('access')
const folder = '/tmp/ocean/squid-js'
const path = await ocean.assets.consume(agreementId, ddo.id, accessService.index, consumer, folder)
const path = await ocean.assets.consume(
agreementId,
ddo.id,
accessService.index,
consumer,
folder
)
assert.include(path, folder, 'The storage path is not correct.')

96
integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts
View File

@ -47,13 +47,21 @@ describe('Register Escrow Access Secret Store Template', () => {
describe('Propose and approve template', () => {
it('should propose the template', async () => {
await keeper.templateStoreManager.proposeTemplate(template.getAddress(), consumer.getId(), true)
await keeper.templateStoreManager.proposeTemplate(
template.getAddress(),
consumer.getId(),
true
)
// TODO: Use a event to detect template mined
await new Promise(resolve => setTimeout(resolve, 2 * 1000))
})
it('should approve the template', async () => {
await keeper.templateStoreManager.approveTemplate(template.getAddress(), templateManagerOwner.getId(), true)
await keeper.templateStoreManager.approveTemplate(
template.getAddress(),
templateManagerOwner.getId(),
true
)
// TODO: Use a event to detect template mined
await new Promise(resolve => setTimeout(resolve, 2 * 1000))
})
@ -68,11 +76,21 @@ describe('Register Escrow Access Secret Store Template', () => {
let conditionIdEscrow: string
it('should register a DID', async () => {
await keeper.didRegistry.registerAttribute(did, checksum, [], url, publisher.getId())
await keeper.didRegistry.registerAttribute(
did,
checksum,
[],
url,
publisher.getId()
)
})
it('should generate the condition IDs', async () => {
conditionIdAccess = await accessSecretStoreCondition.generateIdHash(agreementId, did, consumer.getId())
conditionIdAccess = await accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer.getId()
)
conditionIdLock = await lockRewardCondition.generateIdHash(
agreementId,
await escrowReward.getAddress(),
@ -108,10 +126,20 @@ describe('Register Escrow Access Secret Store Template', () => {
assert.equal(conditionInstances.length, 3, 'Expected 3 conditions.')
const conditionClasses = [AccessSecretStoreCondition, EscrowReward, LockRewardCondition]
const conditionClasses = [
AccessSecretStoreCondition,
EscrowReward,
LockRewardCondition
]
conditionClasses.forEach(conditionClass => {
if (!conditionInstances.find(condition => condition instanceof conditionClass)) {
throw new Error(`${conditionClass.name} is not part of the conditions.`)
if (
!conditionInstances.find(
condition => condition instanceof conditionClass
)
) {
throw new Error(
`${conditionClass.name} is not part of the conditions.`
)
}
})
})
@ -131,7 +159,10 @@ describe('Register Escrow Access Secret Store Template', () => {
})
it('should not grant the access to the consumer', async () => {
const accessGranted = await accessSecretStoreCondition.checkPermissions(consumer.getId(), did)
const accessGranted = await accessSecretStoreCondition.checkPermissions(
consumer.getId(),
did
)
assert.isFalse(accessGranted, 'Consumer has been granted.')
})
@ -141,7 +172,11 @@ describe('Register Escrow Access Secret Store Template', () => {
await consumer.requestTokens(escrowAmount)
} catch {}
await keeper.token.approve(lockRewardCondition.getAddress(), escrowAmount, consumer.getId())
await keeper.token.approve(
lockRewardCondition.getAddress(),
escrowAmount,
consumer.getId()
)
const fulfill = await lockRewardCondition.fulfill(
agreementId,
@ -179,7 +214,10 @@ describe('Register Escrow Access Secret Store Template', () => {
})
it('should grant the access to the consumer', async () => {
const accessGranted = await accessSecretStoreCondition.checkPermissions(consumer.getId(), did)
const accessGranted = await accessSecretStoreCondition.checkPermissions(
consumer.getId(),
did
)
assert.isTrue(accessGranted, 'Consumer has not been granted.')
})
@ -192,17 +230,31 @@ describe('Register Escrow Access Secret Store Template', () => {
it('should register a DID', async () => {
// This part is executed inside Ocean.assets.create()
await keeper.didRegistry.registerAttribute(did, checksum, [], url, publisher.getId())
await keeper.didRegistry.registerAttribute(
did,
checksum,
[],
url,
publisher.getId()
)
})
it('should create a new agreement (short way)', async () => {
agreementId = await template.createFullAgreement(did, escrowAmount, consumer.getId(), publisher.getId())
agreementId = await template.createFullAgreement(
did,
escrowAmount,
consumer.getId(),
publisher.getId()
)
assert.match(agreementId, /^0x[a-f0-9]{64}$/i)
})
it('should not grant the access to the consumer', async () => {
const accessGranted = await accessSecretStoreCondition.checkPermissions(consumer.getId(), did)
const accessGranted = await accessSecretStoreCondition.checkPermissions(
consumer.getId(),
did
)
assert.isFalse(accessGranted, 'Consumer has been granted.')
})
@ -212,11 +264,20 @@ describe('Register Escrow Access Secret Store Template', () => {
await consumer.requestTokens(escrowAmount)
} catch {}
await ocean.agreements.conditions.lockReward(agreementId, escrowAmount, consumer)
await ocean.agreements.conditions.lockReward(
agreementId,
escrowAmount,
consumer
)
})
it('should fulfill the conditions from publisher side', async () => {
await ocean.agreements.conditions.grantAccess(agreementId, did, consumer.getId(), publisher)
await ocean.agreements.conditions.grantAccess(
agreementId,
did,
consumer.getId(),
publisher
)
await ocean.agreements.conditions.releaseReward(
agreementId,
escrowAmount,
@ -228,7 +289,10 @@ describe('Register Escrow Access Secret Store Template', () => {
})
it('should grant the access to the consumer', async () => {
const accessGranted = await accessSecretStoreCondition.checkPermissions(consumer.getId(), did)
const accessGranted = await accessSecretStoreCondition.checkPermissions(
consumer.getId(),
did
)
assert.isTrue(accessGranted, 'Consumer has not been granted.')
})

96
integration/ocean/RegisterEscrowComputeExecutionTemplate.test.ts
View File

@ -47,13 +47,21 @@ describe('Register Escrow Compute Execution Template', () => {
describe('Propose and approve template', () => {
it('should propose the template', async () => {
await keeper.templateStoreManager.proposeTemplate(template.getAddress(), consumer.getId(), true)
await keeper.templateStoreManager.proposeTemplate(
template.getAddress(),
consumer.getId(),
true
)
// TODO: Use a event to detect template mined
await new Promise(resolve => setTimeout(resolve, 2 * 1000))
})
it('should approve the template', async () => {
await keeper.templateStoreManager.approveTemplate(template.getAddress(), templateManagerOwner.getId(), true)
await keeper.templateStoreManager.approveTemplate(
template.getAddress(),
templateManagerOwner.getId(),
true
)
// TODO: Use a event to detect template mined
await new Promise(resolve => setTimeout(resolve, 2 * 1000))
})
@ -68,11 +76,21 @@ describe('Register Escrow Compute Execution Template', () => {
let conditionIdEscrow: string
it('should register a DID', async () => {
await keeper.didRegistry.registerAttribute(did, checksum, [], url, publisher.getId())
await keeper.didRegistry.registerAttribute(
did,
checksum,
[],
url,
publisher.getId()
)
})
it('should generate the condition IDs', async () => {
conditionIdCompute = await computeExecutionCondition.generateIdHash(agreementId, did, consumer.getId())
conditionIdCompute = await computeExecutionCondition.generateIdHash(
agreementId,
did,
consumer.getId()
)
conditionIdLock = await lockRewardCondition.generateIdHash(
agreementId,
await escrowReward.getAddress(),
@ -108,10 +126,20 @@ describe('Register Escrow Compute Execution Template', () => {
assert.equal(conditionInstances.length, 3, 'Expected 3 conditions.')
const conditionClasses = [ComputeExecutionCondition, EscrowReward, LockRewardCondition]
const conditionClasses = [
ComputeExecutionCondition,
EscrowReward,
LockRewardCondition
]
conditionClasses.forEach(conditionClass => {
if (!conditionInstances.find(condition => condition instanceof conditionClass)) {
throw new Error(`${conditionClass.name} is not part of the conditions.`)
if (
!conditionInstances.find(
condition => condition instanceof conditionClass
)
) {
throw new Error(
`${conditionClass.name} is not part of the conditions.`
)
}
})
})
@ -131,7 +159,10 @@ describe('Register Escrow Compute Execution Template', () => {
})
it('should not trigger the compute', async () => {
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(did, consumer.getId())
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(
did,
consumer.getId()
)
assert.isFalse(computeTriggered, 'Compute has been triggered.')
})
@ -141,7 +172,11 @@ describe('Register Escrow Compute Execution Template', () => {
await consumer.requestTokens(escrowAmount)
} catch {}
await keeper.token.approve(lockRewardCondition.getAddress(), escrowAmount, consumer.getId())
await keeper.token.approve(
lockRewardCondition.getAddress(),
escrowAmount,
consumer.getId()
)
const fulfill = await lockRewardCondition.fulfill(
agreementId,
@ -179,7 +214,10 @@ describe('Register Escrow Compute Execution Template', () => {
})
it('should grant the access to the consumer', async () => {
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(did, consumer.getId())
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(
did,
consumer.getId()
)
assert.isTrue(computeTriggered, 'Compute has not been triggered.')
})
@ -192,17 +230,31 @@ describe('Register Escrow Compute Execution Template', () => {
it('should register a DID', async () => {
// This part is executed inside Ocean.assets.create()
await keeper.didRegistry.registerAttribute(did, checksum, [], url, publisher.getId())
await keeper.didRegistry.registerAttribute(
did,
checksum,
[],
url,
publisher.getId()
)
})
it('should create a new agreement (short way)', async () => {
agreementId = await template.createFullAgreement(did, escrowAmount, consumer.getId(), publisher.getId())
agreementId = await template.createFullAgreement(
did,
escrowAmount,
consumer.getId(),
publisher.getId()
)
assert.match(agreementId, /^0x[a-f0-9]{64}$/i)
})
it('should not grant the access to the consumer', async () => {
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(did, consumer.getId())
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(
did,
consumer.getId()
)
assert.isFalse(computeTriggered, 'Compute has been triggered.')
})
@ -212,11 +264,20 @@ describe('Register Escrow Compute Execution Template', () => {
await consumer.requestTokens(escrowAmount)
} catch {}
await ocean.agreements.conditions.lockReward(agreementId, escrowAmount, consumer)
await ocean.agreements.conditions.lockReward(
agreementId,
escrowAmount,
consumer
)
})
it('should fulfill the conditions from computing side', async () => {
await ocean.agreements.conditions.grantServiceExecution(agreementId, did, consumer.getId(), publisher)
await ocean.agreements.conditions.grantServiceExecution(
agreementId,
did,
consumer.getId(),
publisher
)
await ocean.agreements.conditions.releaseReward(
agreementId,
escrowAmount,
@ -228,7 +289,10 @@ describe('Register Escrow Compute Execution Template', () => {
})
it('should grant the access to the consumer', async () => {
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(did, consumer.getId())
const computeTriggered = await computeExecutionCondition.wasComputeTriggered(
did,
consumer.getId()
)
assert.isTrue(computeTriggered, 'Compute has not been triggered.')
})

37
integration/ocean/SearchAsset.test.ts
View File

@ -15,7 +15,8 @@ describe('Search Asset', () => {
.toString(36)
.substr(2)
let price
const metadataGenerator = (name: string) => generateMetadata(`${name}${testHash}`, price)
const metadataGenerator = (name: string) =>
generateMetadata(`${name}${testHash}`, price)
let test1length
let test2length
@ -43,10 +44,22 @@ describe('Search Asset', () => {
})
it('should register an asset', async () => {
assert.instanceOf(await ocean.assets.create(metadataGenerator('Test1') as any, publisher), DDO)
assert.instanceOf(await ocean.assets.create(metadataGenerator('Test2') as any, publisher), DDO)
assert.instanceOf(await ocean.assets.create(metadataGenerator('Test2') as any, publisher), DDO)
assert.instanceOf(await ocean.assets.create(metadataGenerator('Test3') as any, publisher), DDO)
assert.instanceOf(
await ocean.assets.create(metadataGenerator('Test1') as any, publisher),
DDO
)
assert.instanceOf(
await ocean.assets.create(metadataGenerator('Test2') as any, publisher),
DDO
)
assert.instanceOf(
await ocean.assets.create(metadataGenerator('Test2') as any, publisher),
DDO
)
assert.instanceOf(
await ocean.assets.create(metadataGenerator('Test3') as any, publisher),
DDO
)
})
it('should search by text and see the increment of DDOs', async () => {
@ -65,8 +78,14 @@ describe('Search Asset', () => {
it('should return a list of DDOs', async () => {
const { results: ddos } = await ocean.assets.search(`Test1${testHash}`)
assert.equal(ddos.length - test1length, 1, 'Something was wrong searching the assets')
ddos.map(ddo => assert.instanceOf(ddo, DDO, 'The DDO is not an instance of a DDO'))
assert.equal(
ddos.length - test1length,
1,
'Something was wrong searching the assets'
)
ddos.map(ddo =>
assert.instanceOf(ddo, DDO, 'The DDO is not an instance of a DDO')
)
})
it('should be able to do a query to get a list of DDOs', async () => {
@ -82,6 +101,8 @@ describe('Search Asset', () => {
})
assert.equal(ddos.length, 1, 'Something was wrong searching the assets')
ddos.map(ddo => assert.instanceOf(ddo, DDO, 'The DDO is not an instance of a DDO'))
ddos.map(ddo =>
assert.instanceOf(ddo, DDO, 'The DDO is not an instance of a DDO')
)
})
})

6
integration/utils/ddo-metadata-generator.ts
View File

@ -13,12 +13,14 @@ const metadata: Partial<MetaData> = {
{
index: 0,
contentType: 'application/json',
url: 'https://raw.githubusercontent.com/oceanprotocol/squid-js/master/package.json'
url:
'https://raw.githubusercontent.com/oceanprotocol/squid-js/master/package.json'
},
{
index: 1,
contentType: 'text/plain',
url: 'https://raw.githubusercontent.com/oceanprotocol/squid-js/master/README.md'
url:
'https://raw.githubusercontent.com/oceanprotocol/squid-js/master/README.md'
}
]
},

35
plugins/add-vendors-plugin.js
View File

@ -6,23 +6,26 @@ module.exports = class AddVendorsPlugin {
}
apply(compiler) {
compiler.hooks.emit.tapAsync(`AddVendorsPlugin ${this.base}`, (compilation, callback) => {
const main = compilation.assets[`main.${this.base}`]
const mainMap = compilation.assets[`main.${this.base}.map`]
const vendor = compilation.assets[`vendors.${this.base}`]
compiler.hooks.emit.tapAsync(
`AddVendorsPlugin ${this.base}`,
(compilation, callback) => {
const main = compilation.assets[`main.${this.base}`]
const mainMap = compilation.assets[`main.${this.base}.map`]
const vendor = compilation.assets[`vendors.${this.base}`]
if (main && vendor) {
const compiledAsset = new ConcatSource(main.children[0])
compiledAsset.add(vendor)
compiledAsset.add(main.children[1])
compilation.assets = {}
compilation.assets[this.base] = compiledAsset
} else if (main && mainMap) {
compilation.assets = {}
compilation.assets[this.base] = main
compilation.assets[`${this.base}.map`] = mainMap
if (main && vendor) {
const compiledAsset = new ConcatSource(main.children[0])
compiledAsset.add(vendor)
compiledAsset.add(main.children[1])
compilation.assets = {}
compilation.assets[this.base] = compiledAsset
} else if (main && mainMap) {
compilation.assets = {}
compilation.assets[this.base] = main
compilation.assets[`${this.base}.map`] = mainMap
}
callback()
}
callback()
})
)
}
}

4
src/Instantiable.abstract.ts
View File

@ -11,7 +11,9 @@ export interface InstantiableConfig {
logger?: Logger
}
export function generateIntantiableConfigFromConfig(config: Config): Partial<InstantiableConfig> {
export function generateIntantiableConfigFromConfig(
config: Config
): Partial<InstantiableConfig> {
const logLevel =
typeof config.verbose !== 'number'
? config.verbose

41
src/aquarius/Aquarius.ts
View File

@ -53,7 +53,10 @@ export class Aquarius extends Instantiable {
return consumptionUrl
})
.catch(error => {
this.logger.error('Error fetching the data asset consumption url: ', error)
this.logger.error(
'Error fetching the data asset consumption url: ',
error
)
return null
})
@ -72,7 +75,11 @@ export class Aquarius extends Instantiable {
if (response.ok) {
return response.json() as DDO[]
}
this.logger.error('queryMetadata failed:', response.status, response.statusText)
this.logger.error(
'queryMetadata failed:',
response.status,
response.statusText
)
return this.transformResult()
})
.then(results => {
@ -94,7 +101,10 @@ export class Aquarius extends Instantiable {
public async queryMetadataByText(query: SearchQuery): Promise<QueryResult> {
const fullUrl = new URL(`${this.url}${apiPath}/query`)
fullUrl.searchParams.append('text', query.text)
fullUrl.searchParams.append('sort', decodeURIComponent(JSON.stringify(query.sort)))
fullUrl.searchParams.append(
'sort',
decodeURIComponent(JSON.stringify(query.sort))
)
fullUrl.searchParams.append('offset', query.offset.toString())
fullUrl.searchParams.append('page', query.page.toString())
const result: QueryResult = await this.ocean.utils.fetch
@ -103,7 +113,11 @@ export class Aquarius extends Instantiable {
if (response.ok) {
return response.json() as DDO[]
}
this.logger.log('queryMetadataByText failed:', response.status, response.statusText)
this.logger.log(
'queryMetadataByText failed:',
response.status,
response.statusText
)
return this.transformResult()
})
.then(results => {
@ -130,7 +144,12 @@ export class Aquarius extends Instantiable {
if (response.ok) {
return response.json()
}
this.logger.error('storeDDO failed:', response.status, response.statusText, ddo)
this.logger.error(
'storeDDO failed:',
response.status,
response.statusText,
ddo
)
return null as DDO
})
.then((response: DDO) => {
@ -149,7 +168,10 @@ export class Aquarius extends Instantiable {
* @param {DID | string} did DID of the asset.
* @return {Promise<DDO>} DDO of the asset.
*/
public async retrieveDDO(did: DID | string, metadataServiceEndpoint?: string): Promise<DDO> {
public async retrieveDDO(
did: DID | string,
metadataServiceEndpoint?: string
): Promise<DDO> {
did = did && DID.parse(did)
const fullUrl = metadataServiceEndpoint || `${this.url}${apiPath}/${did.getDid()}`
const result = await this.ocean.utils.fetch
@ -158,7 +180,12 @@ export class Aquarius extends Instantiable {
if (response.ok) {
return response.json()
}
this.logger.log('retrieveDDO failed:', response.status, response.statusText, did)
this.logger.log(
'retrieveDDO failed:',
response.status,
response.statusText,
did
)
return null as DDO
})
.then((response: DDO) => {

24
src/brizo/Brizo.ts
View File

@ -35,7 +35,12 @@ export class Brizo extends Instantiable {
return `${this.url}${apiPath}/publish`
}
public getComputeEndpoint(pubKey: string, serviceIndex: number, _notUsed: string, container: string) {
public getComputeEndpoint(
pubKey: string,
serviceIndex: number,
_notUsed: string,
container: string
) {
return `${this.url}${apiPath}/compute`
}
@ -55,7 +60,10 @@ export class Brizo extends Instantiable {
}
try {
return await this.ocean.utils.fetch.post(this.getPurchaseEndpoint(), decodeURI(JSON.stringify(args)))
return await this.ocean.utils.fetch.post(
this.getPurchaseEndpoint(),
decodeURI(JSON.stringify(args))
)
} catch (e) {
this.logger.error(e)
throw new Error('HTTP request failed')
@ -72,7 +80,10 @@ export class Brizo extends Instantiable {
): Promise<string> {
const signature =
(await account.getToken()) ||
(await this.ocean.utils.signature.signText(noZeroX(agreementId), account.getId()))
(await this.ocean.utils.signature.signText(
noZeroX(agreementId),
account.getId()
))
const filesPromises = files
.filter((_, i) => index === -1 || i === index)
.map(async ({ index: i }) => {
@ -94,7 +105,12 @@ export class Brizo extends Instantiable {
return destination
}
public async encrypt(did: string, signature: string, document: any, publisher: string): Promise<string> {
public async encrypt(
did: string,
signature: string,
document: any,
publisher: string
): Promise<string> {
const args = {
documentId: did,
signature,

21
src/ddo/DDO.ts
View File

@ -50,7 +50,8 @@ export class DDO {
public constructor(ddo: Partial<DDO> = {}) {
Object.assign(this, ddo, {
created: (ddo && ddo.created) || new Date().toISOString().replace(/\.[0-9]{3}/, '')
created:
(ddo && ddo.created) || new Date().toISOString().replace(/\.[0-9]{3}/, '')
})
}
@ -114,10 +115,18 @@ export class DDO {
* @param {string} password Password if it's required.
* @return {Promise<Proof>} Proof object.
*/
public async generateProof(ocean: Ocean, publicKey: string, password?: string): Promise<Proof> {
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)
const signature = await ocean.utils.signature.signText(
checksum,
publicKey,
password
)
return {
created: new Date().toISOString().replace(/\.[0-9]{3}/, ''),
@ -134,7 +143,11 @@ export class DDO {
* @param {string} password Password if it's required.
* @return {Promise<Proof>} Proof object.
*/
public async addProof(ocean: Ocean, publicKey: string, password?: string): Promise<void> {
public async addProof(
ocean: Ocean,
publicKey: string,
password?: string
): Promise<void> {
if (this.proof) {
throw new Error('Proof already exists')
}

6
src/ddo/PublicKey.ts
View File

@ -13,7 +13,11 @@ export interface PublicKey {
* Type of key.
* @type {string}
*/
type: 'Ed25519VerificationKey2018' | 'RsaVerificationKey2018' | 'EdDsaSAPublicKeySecp256k1' | 'EthereumECDSAKey'
type:
| 'Ed25519VerificationKey2018'
| 'RsaVerificationKey2018'
| 'EdDsaSAPublicKeySecp256k1'
| 'EthereumECDSAKey'
/**
* Key owner.

12
src/ddo/Service.ts
View File

@ -2,7 +2,13 @@ import { MetaData } from './MetaData'
import { ServiceAgreementTemplate } from './ServiceAgreementTemplate'
import { Provider } from './ComputingProvider'
export type ServiceType = 'authorization' | 'metadata' | 'access' | 'compute' | 'computing' | 'fitchainCompute'
export type ServiceType =
| 'authorization'
| 'metadata'
| 'access'
| 'compute'
| 'computing'
| 'fitchainCompute'
export interface ServiceCommon {
type: ServiceType
@ -52,7 +58,9 @@ export interface ServiceCompute extends ServiceCommon {
templateId?: string
}
export type Service<T extends ServiceType | 'default' = 'default'> = T extends 'authorization'
export type Service<
T extends ServiceType | 'default' = 'default'
> = T extends 'authorization'
? ServiceAuthorization
: T extends 'metadata'
? ServiceMetadata

26
src/keeper/ContractHandler.ts
View File

@ -6,7 +6,11 @@ export default class ContractHandler extends Instantiable {
return ContractHandler.contracts.get(this.getHash(what, networkId))
}
protected static setContract(what: string, networkId: number, contractInstance: Contract) {
protected static setContract(
what: string,
networkId: number,
contractInstance: Contract
) {
ContractHandler.contracts.set(this.getHash(what, networkId), contractInstance)
}
@ -29,7 +33,10 @@ export default class ContractHandler extends Instantiable {
const where = (await this.ocean.keeper.getNetworkName()).toLowerCase()
const networkId = await this.ocean.keeper.getNetworkId()
try {
return ContractHandler.getContract(what, networkId) || (await this.load(what, where, networkId))
return (
ContractHandler.getContract(what, networkId) ||
(await this.load(what, where, networkId))
)
} catch (err) {
if (!optional) {
this.logger.error('Failed to load', what, 'from', where, err)
@ -38,7 +45,11 @@ export default class ContractHandler extends Instantiable {
}
}
private async load(what: string, where: string, networkId: number): Promise<Contract> {
private async load(
what: string,
where: string,
networkId: number
): Promise<Contract> {
this.logger.debug('Loading', what, 'from', where)
const artifact = require(`@oceanprotocol/keeper-contracts/artifacts/${what}.${where}.json`)
// Logger.log('Loaded artifact', artifact)
@ -49,7 +60,14 @@ export default class ContractHandler extends Instantiable {
}
const contract = new this.web3.eth.Contract(artifact.abi, artifact.address)
this.logger.debug('Getting instance of', what, 'from', where, 'at address', artifact.address)
this.logger.debug(
'Getting instance of',
what,
'from',
where,
'at address',
artifact.address
)
ContractHandler.setContract(what, networkId, contract)
return ContractHandler.getContract(what, networkId)
}

11
src/keeper/EventHandler.ts
View File

@ -41,7 +41,11 @@ export class EventHandler extends Instantiable {
}
}
public getEvent(contract: ContractBase, eventName: string, filter: { [key: string]: any }) {
public getEvent(
contract: ContractBase,
eventName: string,
filter: { [key: string]: any }
) {
return new ContractEvent(this, contract, eventName, filter)
}
@ -61,6 +65,9 @@ export class EventHandler extends Instantiable {
this.events.forEach(fn => fn(this.lastBlock + 1))
this.lastBlock = blockNumber
}
this.lastTimeout = global.setTimeout(() => this.checkBlock(true, n++), this.interval)
this.lastTimeout = global.setTimeout(
() => this.checkBlock(true, n++),
this.interval
)
}
}

36
src/keeper/Keeper.ts
View File

@ -15,7 +15,11 @@ import {
EscrowAccessSecretStoreTemplate,
EscrowComputeExecutionTemplate
} from './contracts/templates'
import { TemplateStoreManager, AgreementStoreManager, ConditionStoreManager } from './contracts/managers'
import {
TemplateStoreManager,
AgreementStoreManager,
ConditionStoreManager
} from './contracts/managers'
import { objectPromiseAll } from '../utils'
import { EventHandler } from './EventHandler'
@ -55,11 +59,17 @@ export class Keeper extends Instantiable {
// Conditions
lockRewardCondition: LockRewardCondition.getInstance(config),
escrowReward: EscrowReward.getInstance(config),
accessSecretStoreCondition: AccessSecretStoreCondition.getInstance(config),
accessSecretStoreCondition: AccessSecretStoreCondition.getInstance(
config
),
computeExecutionCondition: ComputeExecutionCondition.getInstance(config),
// Templates
escrowAccessSecretStoreTemplate: EscrowAccessSecretStoreTemplate.getInstance(config),
escrowComputeExecutionTemplate: EscrowComputeExecutionTemplate.getInstance(config)
escrowAccessSecretStoreTemplate: EscrowAccessSecretStoreTemplate.getInstance(
config
),
escrowComputeExecutionTemplate: EscrowComputeExecutionTemplate.getInstance(
config
)
})
keeper.connected = true
@ -92,8 +102,10 @@ export class Keeper extends Instantiable {
}
// Conditions
keeper.templates = {
escrowAccessSecretStoreTemplate: keeper.instances.escrowAccessSecretStoreTemplate,
escrowComputeExecutionTemplate: keeper.instances.escrowComputeExecutionTemplate
escrowAccessSecretStoreTemplate:
keeper.instances.escrowAccessSecretStoreTemplate,
escrowComputeExecutionTemplate:
keeper.instances.escrowComputeExecutionTemplate
}
// Utils
keeper.utils = {
@ -178,7 +190,9 @@ export class Keeper extends Instantiable {
* @return {Condition} Condition instance.
*/
public getConditionByAddress(address: string): Condition {
return Object.values(this.conditions).find(condition => condition.getAddress() === address)
return Object.values(this.conditions).find(
condition => condition.getAddress() === address
)
}
/**
@ -187,7 +201,9 @@ export class Keeper extends Instantiable {
* @return {AgreementTemplate} Agreement template instance.
*/
public getTemplateByName(name: string): AgreementTemplate {
return Object.values(this.templates).find(template => template.contractName === name)
return Object.values(this.templates).find(
template => template.contractName === name
)
}
/**
@ -196,7 +212,9 @@ export class Keeper extends Instantiable {
* @return {AgreementTemplate} Agreement template instance.
*/
public getTemplateByAddress(address: string): AgreementTemplate {
return Object.values(this.templates).find(template => template.getAddress() === address)
return Object.values(this.templates).find(
template => template.getAddress() === address
)
}
/**

6
src/keeper/Web3Provider.ts
View File

@ -7,6 +7,10 @@ export default class Web3Provider {
* @return {Web3}
*/
public static getWeb3(config: Partial<Config> = {}): Web3 {
return new Web3(config.web3Provider || Web3.givenProvider || new Web3.providers.HttpProvider(config.nodeUri))
return new Web3(
config.web3Provider ||
Web3.givenProvider ||
new Web3.providers.HttpProvider(config.nodeUri)
)
}
}

46
src/keeper/contracts/ContractBase.ts
View File

@ -22,7 +22,9 @@ export abstract class ContractBase extends Instantiable {
public async getEventData(eventName: string, options: any) {
if (!this.contract.events[eventName]) {
throw new Error(`Event "${eventName}" not found on contract "${this.contractName}"`)
throw new Error(
`Event "${eventName}" not found on contract "${this.contractName}"`
)
}
return this.contract.getPastEvents(eventName, options)
}
@ -62,14 +64,24 @@ export abstract class ContractBase extends Instantiable {
return from
}
protected async sendFrom(name: string, args: any[], from?: string): Promise<TransactionReceipt> {
protected async sendFrom(
name: string,
args: any[],
from?: string
): Promise<TransactionReceipt> {
from = await this.getFromAddress(from)
return this.send(name, from, args)
}
protected async send(name: string, from: string, args: any[]): Promise<TransactionReceipt> {
protected async send(
name: string,
from: string,
args: any[]
): Promise<TransactionReceipt> {
if (!this.contract.methods[name]) {
throw new Error(`Method "${name}" is not part of contract "${this.contractName}"`)
throw new Error(
`Method "${name}" is not part of contract "${this.contractName}"`
)
}
// Logger.log(name, args)
const method = this.contract.methods[name]
@ -91,7 +103,9 @@ export abstract class ContractBase extends Instantiable {
}
})
this.logger.error('-'.repeat(40))
this.logger.error(`Sending transaction "${name}" on contract "${this.contractName}" failed.`)
this.logger.error(
`Sending transaction "${name}" on contract "${this.contractName}" failed.`
)
this.logger.error(`Error: ${err.message}`)
this.logger.error(`From: ${from}`)
this.logger.error(`Parameters: ${JSON.stringify(mappedArgs, null, 2)}`)
@ -100,7 +114,11 @@ export abstract class ContractBase extends Instantiable {
}
}
protected async call<T extends any>(name: string, args: any[], from?: string): Promise<T> {
protected async call<T extends any>(
name: string,
args: any[],
from?: string
): Promise<T> {
if (!this.contract.methods[name]) {
throw new Error(`Method ${name} is not part of contract ${this.contractName}`)
}
@ -109,14 +127,19 @@ export abstract class ContractBase extends Instantiable {
const method = this.contract.methods[name](...args)
return method.call(from ? { from } : null)
} catch (err) {
this.logger.error(`Calling method "${name}" on contract "${this.contractName}" failed. Args: ${args}`, err)
this.logger.error(
`Calling method "${name}" on contract "${this.contractName}" failed. Args: ${args}`,
err
)
throw err
}
}
protected getEvent(eventName: string, filter: { [key: string]: any }) {
if (!this.contract.events[eventName]) {
throw new Error(`Event ${eventName} is not part of contract ${this.contractName}`)
throw new Error(
`Event ${eventName} is not part of contract ${this.contractName}`
)
}
return this.ocean.keeper.utils.eventHandler.getEvent(this, eventName, filter)
}
@ -128,9 +151,12 @@ export abstract class ContractBase extends Instantiable {
signature: (method as any).signature
}))
.filter((method: any) => method.name === methodName)
const foundMethod = methods.find(({ inputs }) => inputs.length === args.length) || methods[0]
const foundMethod =
methods.find(({ inputs }) => inputs.length === args.length) || methods[0]
if (!foundMethod) {
throw new Error(`Method "${methodName}" is not part of contract "${this.contractName}"`)
throw new Error(
`Method "${methodName}" is not part of contract "${this.contractName}"`
)
}
return foundMethod
}

30
src/keeper/contracts/DIDRegistry.ts
View File

@ -17,7 +17,12 @@ export default class DIDRegistry extends ContractBase {
value: string,
ownerAddress: string
) {
return this.send('registerAttribute', ownerAddress, [zeroX(did), zeroX(checksum), providers.map(zeroX), value])
return this.send('registerAttribute', ownerAddress, [
zeroX(did),
zeroX(checksum),
providers.map(zeroX),
value
])
}
public async getDIDOwner(did: string): Promise<string> {
@ -42,16 +47,22 @@ export default class DIDRegistry extends ContractBase {
.map(didPrefixed)
}
public async getAttributesByDid(did: string): Promise<{ did: string; serviceEndpoint: string; checksum: string }> {
public async getAttributesByDid(
did: string
): Promise<{ did: string; serviceEndpoint: string; checksum: string }> {
return (
await this.getPastEvents('DIDAttributeRegistered', {
_did: didZeroX(did)
})
).map(({ returnValues: { _did, _checksum: checksum, _value: serviceEndpoint } }) => ({
did: didPrefixed(_did),
serviceEndpoint,
checksum
}))[0]
).map(
({
returnValues: { _did, _checksum: checksum, _value: serviceEndpoint }
}) => ({
did: didPrefixed(_did),
serviceEndpoint,
checksum
})
)[0]
}
public async grantPermission(did: string, grantee: string, ownerAddress: string) {
@ -71,6 +82,9 @@ export default class DIDRegistry extends ContractBase {
newOwnerAddress: string,
ownerAddress: string
): Promise<TransactionReceipt> {
return this.send('transferDIDOwnership', ownerAddress, [didZeroX(did), noZeroX(newOwnerAddress)])
return this.send('transferDIDOwnership', ownerAddress, [
didZeroX(did),
noZeroX(newOwnerAddress)
])
}
}

5
src/keeper/contracts/GenericContract.ts
View File

@ -2,7 +2,10 @@ import ContractBase from './ContractBase'
import { InstantiableConfig } from '../../Instantiable.abstract'
export default class GenericContract extends ContractBase {
public static async getInstance(config: InstantiableConfig, contractName: string): Promise<ContractBase> {
public static async getInstance(
config: InstantiableConfig,
contractName: string
): Promise<ContractBase> {
const contract: GenericContract = new GenericContract(contractName)
await contract.init(config)
return contract

4
src/keeper/contracts/Token.ts
View File

@ -18,7 +18,9 @@ export default class OceanToken extends ContractBase {
}
public async balanceOf(address: string): Promise<number> {
return this.call('balanceOf', [address]).then((balance: string) => new BigNumber(balance).toNumber())
return this.call('balanceOf', [address]).then((balance: string) =>
new BigNumber(balance).toNumber()
)
}
public async transfer(to: string, amount: number, from: string) {

20
src/keeper/contracts/conditions/AccessSecretStoreCondition.ts
View File

@ -3,8 +3,14 @@ import { zeroX, didZeroX, didPrefixed } from '../../../utils'
import { InstantiableConfig } from '../../../Instantiable.abstract'
export class AccessSecretStoreCondition extends Condition {
public static async getInstance(config: InstantiableConfig): Promise<AccessSecretStoreCondition> {
return Condition.getInstance(config, 'AccessSecretStoreCondition', AccessSecretStoreCondition)
public static async getInstance(
config: InstantiableConfig
): Promise<AccessSecretStoreCondition> {
return Condition.getInstance(
config,
'AccessSecretStoreCondition',
AccessSecretStoreCondition
)
}
public hashValues(did: string, grantee: string) {
@ -16,10 +22,16 @@ export class AccessSecretStoreCondition extends Condition {
}
public checkPermissions(grantee: string, did: string, from?: string) {
return this.call<boolean>('checkPermissions', [grantee, didZeroX(did)].map(zeroX), from)
return this.call<boolean>(
'checkPermissions',
[grantee, didZeroX(did)].map(zeroX),
from
)
}
public async getGrantedDidByConsumer(consumer: string): Promise<{ did: string; agreementId: string }[]> {
public async getGrantedDidByConsumer(
consumer: string
): Promise<{ did: string; agreementId: string }[]> {
return (
await this.getPastEvents('Fulfilled', {
_grantee: zeroX(consumer)

29
src/keeper/contracts/conditions/ComputeExecutionCondition.ts
View File

@ -3,19 +3,38 @@ import { zeroX, didZeroX, didPrefixed } from '../../../utils'
import { InstantiableConfig } from '../../../Instantiable.abstract'
export class ComputeExecutionCondition extends Condition {
public static async getInstance(config: InstantiableConfig): Promise<ComputeExecutionCondition> {
return Condition.getInstance(config, 'ComputeExecutionCondition', ComputeExecutionCondition)
public static async getInstance(
config: InstantiableConfig
): Promise<ComputeExecutionCondition> {
return Condition.getInstance(
config,
'ComputeExecutionCondition',
ComputeExecutionCondition
)
}
public hashValues(did: string, computeConsumer: string) {
return super.hashValues(didZeroX(did), zeroX(computeConsumer))
}
public fulfill(agreementId: string, did: string, computeConsumer: string, from?: string) {
return super.fulfill(agreementId, [didZeroX(did), computeConsumer].map(zeroX), from)
public fulfill(
agreementId: string,
did: string,
computeConsumer: string,
from?: string
) {
return super.fulfill(
agreementId,
[didZeroX(did), computeConsumer].map(zeroX),
from
)
}
public wasComputeTriggered(did: string, computeConsumer: string, from?: string) {
return this.call<boolean>('wasComputeTriggered', [didZeroX(did), computeConsumer].map(zeroX), from)
return this.call<boolean>(
'wasComputeTriggered',
[didZeroX(did), computeConsumer].map(zeroX),
from
)
}
}

7
src/keeper/contracts/conditions/Condition.abstract.ts
View File

@ -9,7 +9,12 @@ export enum ConditionState {
Aborted = 3
}
export const conditionStateNames = ['Uninitialized', 'Unfulfilled', 'Fulfilled', 'Aborted']
export const conditionStateNames = [
'Uninitialized',
'Unfulfilled',
'Fulfilled',
'Aborted'
]
export abstract class Condition extends ContractBase {
public static async getInstance(

5
src/keeper/contracts/conditions/EscrowReward.ts
View File

@ -14,7 +14,10 @@ export class EscrowReward extends Condition {
lockCondition: string,
releaseCondition: string
) {
return super.hashValues(amount, ...[receiver, sender, lockCondition, releaseCondition].map(zeroX))
return super.hashValues(
amount,
...[receiver, sender, lockCondition, releaseCondition].map(zeroX)
)
}
public fulfill(

11
src/keeper/contracts/conditions/LockRewardCondition.ts
View File

@ -3,7 +3,9 @@ import { zeroX } from '../../../utils'
import { InstantiableConfig } from '../../../Instantiable.abstract'
export class LockRewardCondition extends Condition {
public static async getInstance(config: InstantiableConfig): Promise<LockRewardCondition> {
public static async getInstance(
config: InstantiableConfig
): Promise<LockRewardCondition> {
return Condition.getInstance(config, 'LockRewardCondition', LockRewardCondition)
}
@ -11,7 +13,12 @@ export class LockRewardCondition extends Condition {
return super.hashValues(zeroX(rewardAddress), String(amount))
}
public fulfill(agreementId: string, rewardAddress: string, amount: number | string, from?: string) {
public fulfill(
agreementId: string,
rewardAddress: string,
amount: number | string,
from?: string
) {
return super.fulfill(agreementId, [zeroX(rewardAddress), String(amount)], from)
}
}

8
src/keeper/contracts/managers/AgreementStoreManager.ts
View File

@ -12,8 +12,12 @@ export interface AgreementData {
}
export class AgreementStoreManager extends ContractBase {
public static async getInstance(config: InstantiableConfig): Promise<AgreementStoreManager> {
const templateStoreManeger: AgreementStoreManager = new AgreementStoreManager('AgreementStoreManager')
public static async getInstance(
config: InstantiableConfig
): Promise<AgreementStoreManager> {
const templateStoreManeger: AgreementStoreManager = new AgreementStoreManager(
'AgreementStoreManager'
)
await templateStoreManeger.init(config)
return templateStoreManeger
}

8
src/keeper/contracts/managers/ConditionStoreManager.ts
View File

@ -14,8 +14,12 @@ export interface ConditionData {
}
export class ConditionStoreManager extends ContractBase {
public static async getInstance(config: InstantiableConfig): Promise<ConditionStoreManager> {
const templateStoreManeger: ConditionStoreManager = new ConditionStoreManager('ConditionStoreManager')
public static async getInstance(
config: InstantiableConfig
): Promise<ConditionStoreManager> {
const templateStoreManeger: ConditionStoreManager = new ConditionStoreManager(
'ConditionStoreManager'
)
await templateStoreManeger.init(config)
return templateStoreManeger
}

21
src/keeper/contracts/managers/TemplateStoreManager.ts
View File

@ -17,8 +17,12 @@ export interface TemplateMetadata {
}
export class TemplateStoreManager extends ContractBase {
public static async getInstance(config: InstantiableConfig): Promise<TemplateStoreManager> {
const templateStoreManeger: TemplateStoreManager = new TemplateStoreManager('TemplateStoreManager')
public static async getInstance(
config: InstantiableConfig
): Promise<TemplateStoreManager> {
const templateStoreManeger: TemplateStoreManager = new TemplateStoreManager(
'TemplateStoreManager'
)
await templateStoreManeger.init(config)
return templateStoreManeger
}
@ -39,7 +43,11 @@ export class TemplateStoreManager extends ContractBase {
}
}
public async approveTemplate(address: string, from?: string, ignoreApproved?: boolean) {
public async approveTemplate(
address: string,
from?: string,
ignoreApproved?: boolean
) {
const template = await this.getTemplate(address)
if (template.state !== TemplateState.Proposed) {
this.logger.warn(`Template "${address}" is not in "proposed" state.`)
@ -56,7 +64,12 @@ export class TemplateStoreManager extends ContractBase {
}
public async getTemplate(address: string) {
const { state, owner, lastUpdatedBy, blockNumberUpdated } = await this.call('getTemplate', [zeroX(address)])
const {
state,
owner,
lastUpdatedBy,
blockNumberUpdated
} = await this.call('getTemplate', [zeroX(address)])
return {
state: +state,
owner,

57
src/keeper/contracts/templates/AgreementTemplate.abstract.ts
View File

@ -1,5 +1,9 @@
import ContractBase from '../ContractBase'
import { Condition, ConditionState, conditionStateNames } from '../conditions/Condition.abstract'
import {
Condition,
ConditionState,
conditionStateNames
} from '../conditions/Condition.abstract'
import { DDO } from '../../../ddo/DDO'
import { ServiceAgreementTemplate } from '../../../ddo/ServiceAgreementTemplate'
import { zeroX } from '../../../utils'
@ -50,7 +54,14 @@ export abstract class AgreementTemplate extends ContractBase {
) {
return this.sendFrom(
'createAgreement',
[zeroX(agreementId), zeroX(did), conditionIds.map(zeroX), timeLocks, timeOuts, ...extraArgs],
[
zeroX(agreementId),
zeroX(did),
conditionIds.map(zeroX),
timeLocks,
timeOuts,
...extraArgs
],
from
)
}
@ -68,7 +79,9 @@ export abstract class AgreementTemplate extends ContractBase {
* @return {Promise<Condition[]>} Conditions contracts.
*/
public async getConditions(): Promise<Condition[]> {
return (await this.getConditionTypes()).map(address => this.ocean.keeper.getConditionByAddress(address))
return (await this.getConditionTypes()).map(address =>
this.ocean.keeper.getConditionByAddress(address)
)
}
/**
@ -110,7 +123,9 @@ export abstract class AgreementTemplate extends ContractBase {
const name = (await this.getServiceAgreementTemplateConditions()).find(
({ name: conditionRef }) => conditionRef === ref
).contractName
return (await this.getConditions()).find(condition => condition.contractName === name)
return (await this.getConditions()).find(
condition => condition.contractName === name
)
}
public async getServiceAgreementTemplateDependencies() {
@ -123,7 +138,9 @@ export abstract class AgreementTemplate extends ContractBase {
* @param {string} agreementId Agreement ID.
* @return {Promise} Conditions status.
*/
public async getAgreementStatus(agreementId: string): Promise<AgreementConditionsStatus | false> {
public async getAgreementStatus(
agreementId: string
): Promise<AgreementConditionsStatus | false> {
const agreementStore = this.ocean.keeper.agreementStoreManager
const conditionStore = this.ocean.keeper.conditionStoreManager
@ -144,11 +161,17 @@ export abstract class AgreementTemplate extends ContractBase {
)
const statesPromises = Object.keys(dependencies).map(async (ref, i) => {
const { contractName } = await this.getServiceAgreementTemplateConditionByRef(ref)
const { contractName } = await this.getServiceAgreementTemplateConditionByRef(
ref
)
return {
ref,
contractName,
state: (await conditionStore.getCondition(conditionIdByConddition[contractName])).state
state: (
await conditionStore.getCondition(
conditionIdByConddition[contractName]
)
).state
}
})
const states = await Promise.all(statesPromises)
@ -184,16 +207,18 @@ export abstract class AgreementTemplate extends ContractBase {
if (!status) {
this.logger.bypass('Agreement not created yet!')
}
Object.values(status || []).forEach(({ condition, contractName, state, blocked, blockedBy }, i) => {
if (i) {
this.logger.bypass('-'.repeat(20))
Object.values(status || []).forEach(
({ condition, contractName, state, blocked, blockedBy }, i) => {
if (i) {
this.logger.bypass('-'.repeat(20))
}
this.logger.bypass(`${condition} (${contractName})`)
this.logger.bypass(' Status:', state, `(${conditionStateNames[state]})`)
if (blocked) {
this.logger.bypass(' Blocked by:', blockedBy)
}
}
this.logger.bypass(`${condition} (${contractName})`)
this.logger.bypass(' Status:', state, `(${conditionStateNames[state]})`)
if (blocked) {
this.logger.bypass(' Blocked by:', blockedBy)
}
})
)
this.logger.bypass('-'.repeat(80))
}

10
src/keeper/contracts/templates/BaseEscrowTemplate.abstract.ts
View File

@ -26,7 +26,15 @@ export abstract class BaseEscrowTemplate extends AgreementTemplate {
accessConsumer: string,
from?: string
) {
return super.createAgreement(agreementId, did, conditionIds, timeLocks, timeOuts, [accessConsumer], from)
return super.createAgreement(
agreementId,
did,
conditionIds,
timeLocks,
timeOuts,
[accessConsumer],
from
)
}
public async getAgreementData(agreementId: string) {

6
src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.serviceAgreementTemplate.ts
View File

@ -13,7 +13,11 @@ export const escrowAccessSecretStoreTemplateServiceAgreementTemplate: ServiceAgr
}
}
],
fulfillmentOrder: ['lockReward.fulfill', 'accessSecretStore.fulfill', 'escrowReward.fulfill'],
fulfillmentOrder: [
'lockReward.fulfill',
'accessSecretStore.fulfill',
'escrowReward.fulfill'
],
conditionDependency: {
lockReward: [],
accessSecretStore: [],

43
src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts
View File

@ -7,15 +7,26 @@ import { InstantiableConfig } from '../../../Instantiable.abstract'
import { escrowAccessSecretStoreTemplateServiceAgreementTemplate } from './EscrowAccessSecretStoreTemplate.serviceAgreementTemplate'
export class EscrowAccessSecretStoreTemplate extends BaseEscrowTemplate {
public static async getInstance(config: InstantiableConfig): Promise<EscrowAccessSecretStoreTemplate> {
return AgreementTemplate.getInstance(config, 'EscrowAccessSecretStoreTemplate', EscrowAccessSecretStoreTemplate)
public static async getInstance(
config: InstantiableConfig
): Promise<EscrowAccessSecretStoreTemplate> {
return AgreementTemplate.getInstance(
config,
'EscrowAccessSecretStoreTemplate',
EscrowAccessSecretStoreTemplate
)
}
public async getServiceAgreementTemplate() {
return escrowAccessSecretStoreTemplateServiceAgreementTemplate
}
public async createAgreementFromDDO(agreementId: string, ddo: DDO, consumer: string, from?: string) {
public async createAgreementFromDDO(
agreementId: string,
ddo: DDO,
consumer: string,
from?: string
) {
return !!(await this.createFullAgreement(
ddo.shortId(),
ddo.findServiceByType('metadata').attributes.main.price,
@ -25,7 +36,12 @@ export class EscrowAccessSecretStoreTemplate extends BaseEscrowTemplate {
))
}
public async getAgreementIdsFromDDO(agreementId: string, ddo: DDO, consumer: string, from?: string) {
public async getAgreementIdsFromDDO(
agreementId: string,
ddo: DDO,
consumer: string,
from?: string
) {
const {
accessSecretStoreConditionId,
lockRewardConditionId,
@ -72,10 +88,19 @@ export class EscrowAccessSecretStoreTemplate extends BaseEscrowTemplate {
return zeroX(agreementId)
}
private async createFullAgreementData(agreementId: string, did: string, amount: number | string, consumer: string) {
private async createFullAgreementData(
agreementId: string,
did: string,
amount: number | string,
consumer: string
) {
const { didRegistry, conditions } = this.ocean.keeper
const { accessSecretStoreCondition, lockRewardCondition, escrowReward } = conditions
const {
accessSecretStoreCondition,
lockRewardCondition,
escrowReward
} = conditions
const publisher = await didRegistry.getDIDOwner(did)
@ -84,7 +109,11 @@ export class EscrowAccessSecretStoreTemplate extends BaseEscrowTemplate {
await escrowReward.getAddress(),
amount
)
const accessSecretStoreConditionId = await accessSecretStoreCondition.generateIdHash(agreementId, did, consumer)
const accessSecretStoreConditionId = await accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer
)
const escrowRewardId = await escrowReward.generateIdHash(
agreementId,
String(amount),

6
src/keeper/contracts/templates/EscrowComputeExecutionTemplate.serviceAgreementTemplate.ts
View File

@ -13,7 +13,11 @@ export const escrowComputeExecutionTemplateServiceAgreementTemplate: ServiceAgre
}
}
],
fulfillmentOrder: ['lockReward.fulfill', 'serviceExecution.fulfill', 'escrowReward.fulfill'],
fulfillmentOrder: [
'lockReward.fulfill',
'serviceExecution.fulfill',
'escrowReward.fulfill'
],
conditionDependency: {
lockReward: [],
serviceExecution: [],

43
src/keeper/contracts/templates/EscrowComputeExecutionTemplate.ts
View File

@ -7,15 +7,26 @@ import { InstantiableConfig } from '../../../Instantiable.abstract'
import { escrowComputeExecutionTemplateServiceAgreementTemplate } from './EscrowComputeExecutionTemplate.serviceAgreementTemplate'
export class EscrowComputeExecutionTemplate extends BaseEscrowTemplate {
public static async getInstance(config: InstantiableConfig): Promise<EscrowComputeExecutionTemplate> {
return AgreementTemplate.getInstance(config, 'EscrowComputeExecutionTemplate', EscrowComputeExecutionTemplate)
public static async getInstance(
config: InstantiableConfig
): Promise<EscrowComputeExecutionTemplate> {
return AgreementTemplate.getInstance(
config,
'EscrowComputeExecutionTemplate',
EscrowComputeExecutionTemplate
)
}
public async getServiceAgreementTemplate() {
return escrowComputeExecutionTemplateServiceAgreementTemplate
}
public async createAgreementFromDDO(agreementId: string, ddo: DDO, consumer: string, from?: string) {
public async createAgreementFromDDO(
agreementId: string,
ddo: DDO,
consumer: string,
from?: string
) {
return !!(await this.createFullAgreement(
ddo.shortId(),
ddo.findServiceByType('metadata').attributes.main.price,
@ -25,7 +36,12 @@ export class EscrowComputeExecutionTemplate extends BaseEscrowTemplate {
))
}
public async getAgreementIdsFromDDO(agreementId: string, ddo: DDO, consumer: string, from?: string) {
public async getAgreementIdsFromDDO(
agreementId: string,
ddo: DDO,
consumer: string,
from?: string
) {
const {
computeExecutionConditionId,
lockRewardConditionId,
@ -72,10 +88,19 @@ export class EscrowComputeExecutionTemplate extends BaseEscrowTemplate {
return zeroX(agreementId)
}
private async createFullAgreementData(agreementId: string, did: string, amount: number | string, consumer: string) {
private async createFullAgreementData(
agreementId: string,
did: string,
amount: number | string,
consumer: string
) {
const { didRegistry, conditions } = this.ocean.keeper
const { computeExecutionCondition, lockRewardCondition, escrowReward } = conditions
const {
computeExecutionCondition,
lockRewardCondition,
escrowReward
} = conditions
const publisher = await didRegistry.getDIDOwner(did)
@ -84,7 +109,11 @@ export class EscrowComputeExecutionTemplate extends BaseEscrowTemplate {
await escrowReward.getAddress(),
amount
)
const computeExecutionConditionId = await computeExecutionCondition.generateIdHash(agreementId, did, consumer)
const computeExecutionConditionId = await computeExecutionCondition.generateIdHash(
agreementId,
did,
consumer
)
const escrowRewardId = await escrowReward.generateIdHash(
agreementId,
String(amount),

8
src/ocean/Account.ts
View File

@ -87,9 +87,11 @@ export default class Account extends Instantiable {
* @return {Promise<number>}
*/
public async getEtherBalance(): Promise<number> {
return this.web3.eth.getBalance(this.id, 'latest').then((balance: string): number => {
return new BigNumber(balance).toNumber()
})
return this.web3.eth
.getBalance(this.id, 'latest')
.then((balance: string): number => {
return new BigNumber(balance).toNumber()
})
}
/**

5
src/ocean/Ocean.ts
View File

@ -14,7 +14,10 @@ import Keeper from '../keeper/Keeper'
import { Config } from '../models/Config'
import { Instantiable, generateIntantiableConfigFromConfig } from '../Instantiable.abstract'
import {
Instantiable,
generateIntantiableConfigFromConfig
} from '../Instantiable.abstract'
/**
* Main interface for Ocean Protocol.

4
src/ocean/OceanAccounts.ts
View File

@ -25,7 +25,9 @@ export class OceanAccounts extends Instantiable {
// retrieve eth accounts
const ethAccounts: string[] = await this.web3.eth.getAccounts()
const accountPromises = ethAccounts.map(address => new Account(address, this.instanceConfig))
const accountPromises = ethAccounts.map(
address => new Account(address, this.instanceConfig)
)
return Promise.all(accountPromises)
}

34
src/ocean/OceanAgreements.ts
View File

@ -21,7 +21,9 @@ export class OceanAgreements extends Instantiable {
* Returns the instance of OceanAgreements.
* @return {Promise<OceanAgreements>}
*/
public static async getInstance(config: InstantiableConfig): Promise<OceanAgreements> {
public static async getInstance(
config: InstantiableConfig
): Promise<OceanAgreements> {
const instance = new OceanAgreements()
instance.setInstanceConfig(config)
instance.conditions = await OceanAgreementsConditions.getInstance(config)
@ -42,12 +44,17 @@ export class OceanAgreements extends Instantiable {
* @param {Account} consumer Consumer account.
* @return {Promise<AgreementPrepareResult>} Agreement ID and signaturee.
*/
public async prepare(did: string, index: number, consumer: Account): Promise<AgreementPrepareResult> {
public async prepare(
did: string,
index: number,
consumer: Account
): Promise<AgreementPrepareResult> {
const d: DID = DID.parse(did as string)
const ddo = await this.ocean.aquarius.retrieveDDO(d)
const agreementId: string = zeroX(generateId())
const templateName = ddo.findServiceByType('access').attributes.serviceAgreementTemplate.contractName
const templateName = ddo.findServiceByType('access').attributes
.serviceAgreementTemplate.contractName
const agreementConditionsIds = await this.ocean.keeper
.getTemplateByName(templateName)
.getAgreementIdsFromDDO(agreementId, ddo, consumer.getId(), consumer.getId())
@ -113,7 +120,8 @@ export class OceanAgreements extends Instantiable {
const d: DID = DID.parse(did)
const ddo = await this.ocean.aquarius.retrieveDDO(d)
const templateName = ddo.findServiceById<'access'>(index).attributes.serviceAgreementTemplate.contractName
const templateName = ddo.findServiceById<'access'>(index).attributes
.serviceAgreementTemplate.contractName
await this.ocean.keeper
.getTemplateByName(templateName)
.createAgreementFromDDO(agreementId, ddo, consumer.getId(), publisher.getId())
@ -127,13 +135,23 @@ export class OceanAgreements extends Instantiable {
* @param {boolean} extended Returns a complete status with dependencies.
* @return {Promise<any>}
*/
public async status(agreementId: string, extended?: false): Promise<{ [condition: string]: ConditionState }>
public async status(
agreementId: string,
extended?: false
): Promise<{ [condition: string]: ConditionState }>
public async status(agreementId: string, extended: true): Promise<AgreementConditionsStatus>
public async status(
agreementId: string,
extended: true
): Promise<AgreementConditionsStatus>
public async status(agreementId: string, extended: boolean = false) {
const { templateId } = await this.ocean.keeper.agreementStoreManager.getAgreement(agreementId)
const fullStatus = await this.ocean.keeper.getTemplateByAddress(templateId).getAgreementStatus(agreementId)
const { templateId } = await this.ocean.keeper.agreementStoreManager.getAgreement(
agreementId
)
const fullStatus = await this.ocean.keeper
.getTemplateByAddress(templateId)
.getAgreementStatus(agreementId)
if (!fullStatus) {
return

56
src/ocean/OceanAgreementsConditions.ts
View File

@ -9,7 +9,9 @@ export class OceanAgreementsConditions extends Instantiable {
* Returns the instance of OceanAgreementsConditions.
* @return {Promise<OceanAgreementsConditions>}
*/
public static async getInstance(config: InstantiableConfig): Promise<OceanAgreementsConditions> {
public static async getInstance(
config: InstantiableConfig
): Promise<OceanAgreementsConditions> {
const instance = new OceanAgreementsConditions()
instance.setInstanceConfig(config)
@ -23,11 +25,19 @@ export class OceanAgreementsConditions extends Instantiable {
* @param {number} amount Asset amount.
* @param {Account} from Account of sender.
*/
public async lockReward(agreementId: string, amount: number | string, from?: Account) {
public async lockReward(
agreementId: string,
amount: number | string,
from?: Account
) {
const { lockRewardCondition, escrowReward } = this.ocean.keeper.conditions
try {
await this.ocean.keeper.token.approve(lockRewardCondition.getAddress(), amount, from.getId())
await this.ocean.keeper.token.approve(
lockRewardCondition.getAddress(),
amount,
from.getId()
)
const receipt = await lockRewardCondition.fulfill(
agreementId,
@ -49,11 +59,21 @@ export class OceanAgreementsConditions extends Instantiable {
* @param {string} grantee Consumer address.
* @param {Account} from Account of sender.
*/
public async grantAccess(agreementId: string, did: string, grantee: string, from?: Account) {
public async grantAccess(
agreementId: string,
did: string,
grantee: string,
from?: Account
) {
try {
const { accessSecretStoreCondition } = this.ocean.keeper.conditions
const receipt = await accessSecretStoreCondition.fulfill(agreementId, did, grantee, from && from.getId())
const receipt = await accessSecretStoreCondition.fulfill(
agreementId,
did,
grantee,
from && from.getId()
)
return !!receipt.events.Fulfilled
} catch {
return false
@ -67,11 +87,21 @@ export class OceanAgreementsConditions extends Instantiable {
* @param {string} grantee Consumer address.
* @param {Account} from Account of sender.
*/
public async grantServiceExecution(agreementId: string, did: string, grantee: string, from?: Account) {
public async grantServiceExecution(
agreementId: string,
did: string,
grantee: string,
from?: Account
) {
try {
const { computeExecutionCondition } = this.ocean.keeper.conditions
const receipt = await computeExecutionCondition.fulfill(agreementId, did, grantee, from && from.getId())
const receipt = await computeExecutionCondition.fulfill(
agreementId,
did,
grantee,
from && from.getId()
)
return !!receipt.events.Fulfilled
} catch {
return false
@ -100,9 +130,17 @@ export class OceanAgreementsConditions extends Instantiable {
from?: Account
) {
try {
const { escrowReward, accessSecretStoreCondition, lockRewardCondition } = this.ocean.keeper.conditions
const {
escrowReward,
accessSecretStoreCondition,
lockRewardCondition
} = this.ocean.keeper.conditions
const conditionIdAccess = await accessSecretStoreCondition.generateIdHash(agreementId, did, consumer)
const conditionIdAccess = await accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer
)
const conditionIdLock = await lockRewardCondition.generateIdHash(
agreementId,
escrowReward.getAddress(),

77
src/ocean/OceanAssets.ts
View File

@ -47,7 +47,9 @@ export class OceanAssets extends Instantiable {
* @return {Promise<DDO>}
*/
public async resolve(did: string): Promise<DDO> {
const { serviceEndpoint } = await this.ocean.keeper.didRegistry.getAttributesByDid(did)
const {
serviceEndpoint
} = await this.ocean.keeper.didRegistry.getAttributesByDid(did)
return this.ocean.aquarius.retrieveDDOByUrl(serviceEndpoint)
}
@ -71,7 +73,11 @@ export class OceanAssets extends Instantiable {
this.logger.log('Encrypting files')
observer.next(CreateProgressStep.EncryptingFiles)
const encryptedFiles = await this.ocean.secretStore.encrypt(did.getId(), metadata.main.files, publisher)
const encryptedFiles = await this.ocean.secretStore.encrypt(
did.getId(),
metadata.main.files,
publisher
)
this.logger.log('Files encrypted')
observer.next(CreateProgressStep.FilesEncrypted)
@ -145,7 +151,10 @@ export class OceanAssets extends Instantiable {
]
// Remove duplications
.reverse()
.filter(({ type }, i, list) => list.findIndex(({ type: t }) => t === type) === i)
.filter(
({ type }, i, list) =>
list.findIndex(({ type: t }) => t === type) === i
)
.reverse()
// Adding index
.map(_ => ({
@ -226,12 +235,16 @@ export class OceanAssets extends Instantiable {
const { serviceEndpoint } = accessService
if (!serviceEndpoint) {
throw new Error('Consume asset failed, service definition is missing the `serviceEndpoint`.')
throw new Error(
'Consume asset failed, service definition is missing the `serviceEndpoint`.'
)
}
this.logger.log('Consuming files')
resultPath = resultPath ? `${resultPath}/datafile.${ddo.shortId()}.${serviceIndex}/` : undefined
resultPath = resultPath
? `${resultPath}/datafile.${ddo.shortId()}.${serviceIndex}/`
: undefined
if (!useSecretStore) {
await this.ocean.brizo.consumeService(
@ -251,7 +264,9 @@ export class OceanAssets extends Instantiable {
)
const downloads = files
.filter(({ index: i }) => index === -1 || index === i)
.map(({ url, index: i }) => this.ocean.utils.fetch.downloadFile(url, resultPath, i))
.map(({ url, index: i }) =>
this.ocean.utils.fetch.downloadFile(url, resultPath, i)
)
await Promise.all(downloads)
}
this.logger.log('Files consumed')
@ -270,7 +285,11 @@ export class OceanAssets extends Instantiable {
* @param {Account} consumer Consumer account.
* @return {Promise<string>} Returns Agreement ID
*/
public order(did: string, index: number, consumer: Account): SubscribablePromise<OrderProgressStep, string> {
public order(
did: string,
index: number,
consumer: Account
): SubscribablePromise<OrderProgressStep, string> {
return new SubscribablePromise(async observer => {
const oceanAgreements = this.ocean.agreements
@ -278,7 +297,8 @@ export class OceanAssets extends Instantiable {
const ddo = await this.resolve(did)
const { keeper } = this.ocean
const templateName = ddo.findServiceByType('access').attributes.serviceAgreementTemplate.contractName
const templateName = ddo.findServiceByType('access').attributes
.serviceAgreementTemplate.contractName
const template = keeper.getTemplateByName(templateName)
const accessCondition = keeper.conditions.accessSecretStoreCondition
@ -293,10 +313,16 @@ export class OceanAssets extends Instantiable {
this.logger.log('Locking payment')
const accessGranted = accessCondition.getConditionFulfilledEvent(agreementId).once()
const accessGranted = accessCondition
.getConditionFulfilledEvent(agreementId)
.once()
observer.next(OrderProgressStep.LockingPayment)
const paid = await oceanAgreements.conditions.lockReward(agreementId, attributes.main.price, consumer)
const paid = await oceanAgreements.conditions.lockReward(
agreementId,
attributes.main.price,
consumer
)
observer.next(OrderProgressStep.LockedPayment)
if (paid) {
@ -316,7 +342,14 @@ export class OceanAssets extends Instantiable {
observer.next(OrderProgressStep.CreatingAgreement)
this.logger.log('Creating agreement')
await oceanAgreements.create(did, agreementId, index, undefined, consumer, consumer)
await oceanAgreements.create(
did,
agreementId,
index,
undefined,
consumer,
consumer
)
this.logger.log('Agreement created')
try {
@ -338,10 +371,15 @@ export class OceanAssets extends Instantiable {
const ddo = await this.resolve(did)
const checksum = ddo.getChecksum()
const { creator, signatureValue } = ddo.proof
const signer = await this.ocean.utils.signature.verifyText(checksum, signatureValue)
const signer = await this.ocean.utils.signature.verifyText(
checksum,
signatureValue
)
if (signer.toLowerCase() !== creator.toLowerCase()) {
this.logger.warn(`Owner of ${ddo.id} doesn't match. Expected ${creator} instead of ${signer}.`)
this.logger.warn(
`Owner of ${ddo.id} doesn't match. Expected ${creator} instead of ${signer}.`
)
}
return creator
@ -362,7 +400,10 @@ export class OceanAssets extends Instantiable {
* @param {string} newOwner Ethereum address of the new owner of the DID.
* @return {Promise<TransactionReceipt>} Returns Web3 transaction receipt.
*/
public async transferOwnership(did: string, newOwner: string): Promise<TransactionReceipt> {
public async transferOwnership(
did: string,
newOwner: string
): Promise<TransactionReceipt> {
const owner = await this.ocean.assets.owner(did)
return this.ocean.keeper.didRegistry.transferDIDOwnership(did, newOwner, owner)
}
@ -373,9 +414,11 @@ export class OceanAssets extends Instantiable {
* @return {Promise<string[]>} List of DIDs.
*/
public async consumerAssets(consumer: string): Promise<string[]> {
return (await this.ocean.keeper.conditions.accessSecretStoreCondition.getGrantedDidByConsumer(consumer)).map(
({ did }) => did
)
return (
await this.ocean.keeper.conditions.accessSecretStoreCondition.getGrantedDidByConsumer(
consumer
)
).map(({ did }) => did)
}
/**

14
src/ocean/OceanAuth.ts
View File

@ -30,7 +30,11 @@ export class OceanAuth extends Instantiable {
const message = `${this.getMessage()}\n${time}`
try {
const signature = await this.ocean.utils.signature.signText(message, account.getId(), account.getPassword())
const signature = await this.ocean.utils.signature.signText(
message,
account.getId(),
account.getPassword()
)
return `${signature}-${time}`
} catch {
@ -53,7 +57,9 @@ export class OceanAuth extends Instantiable {
return `0x${'0'.repeat(40)}`
}
return this.web3.utils.toChecksumAddress(await this.ocean.utils.signature.verifyText(message, signature))
return this.web3.utils.toChecksumAddress(
await this.ocean.utils.signature.verifyText(message, signature)
)
}
/**
@ -121,7 +127,9 @@ export class OceanAuth extends Instantiable {
try {
localStorage.getItem('')
} catch {
throw new Error('LocalStorage is not supported. This feature is only available on browsers.')
throw new Error(
'LocalStorage is not supported. This feature is only available on browsers.'
)
}
return localStorage
}

35
src/ocean/OceanSecretStore.ts
View File

@ -13,7 +13,9 @@ export class OceanSecretStore extends Instantiable {
* Returns the instance of OceanSecretStore.
* @return {Promise<OceanSecretStore>}
*/
public static async getInstance(config: InstantiableConfig): Promise<OceanSecretStore> {
public static async getInstance(
config: InstantiableConfig
): Promise<OceanSecretStore> {
const instance = new OceanSecretStore()
instance.setInstanceConfig(config)
@ -28,12 +30,25 @@ export class OceanSecretStore extends Instantiable {
* @param {string} publisher Publisher account.
* @return {Promise<string>} Encrypted text.
*/
public async encrypt(did: string, document: any, publisher: Account): Promise<string> {
public async encrypt(
did: string,
document: any,
publisher: Account
): Promise<string> {
const signature =
(await publisher.getToken()) ||
(await this.ocean.utils.signature.signText(noDidPrefixed(did), publisher.getId(), publisher.getPassword()))
(await this.ocean.utils.signature.signText(
noDidPrefixed(did),
publisher.getId(),
publisher.getPassword()
))
return this.ocean.brizo.encrypt(noDidPrefixed(did), signature, document, publisher.getId())
return this.ocean.brizo.encrypt(
noDidPrefixed(did),
signature,
document,
publisher.getId()
)
}
/**
@ -44,8 +59,16 @@ export class OceanSecretStore extends Instantiable {
* @param {string} consumer cONSUMER account.
* @return {Promise<string>} Encrypted text.
*/
public async decrypt(did: string, content: string, consumer?: Account, secretStoreUrl?: string): Promise<any> {
return this.getSecretStoreByAccount(consumer, secretStoreUrl).decryptDocument(noDidPrefixed(did), content)
public async decrypt(
did: string,
content: string,
consumer?: Account,
secretStoreUrl?: string
): Promise<any> {
return this.getSecretStoreByAccount(consumer, secretStoreUrl).decryptDocument(
noDidPrefixed(did),
content
)
}
private getSecretStoreByAccount(account: Account, secretStoreUrl?: string) {

10
src/ocean/utils/ServiceAgreement.ts
View File

@ -19,7 +19,10 @@ export class ServiceAgreement extends Instantiable {
consumer: Account
): Promise<string> {
const service = ddo.findServiceById<'access'>(index)
const timelockValues: number[] = this.getTimeValuesFromService(service, 'timelock')
const timelockValues: number[] = this.getTimeValuesFromService(
service,
'timelock'
)
const timeoutValues: number[] = this.getTimeValuesFromService(service, 'timeout')
if (!service.templateId) {
@ -83,7 +86,10 @@ export class ServiceAgreement extends Instantiable {
return this.web3.utils.soliditySha3(...args)
}
private getTimeValuesFromService(service: ServiceAccess, type: 'timeout' | 'timelock'): number[] {
private getTimeValuesFromService(
service: ServiceAccess,
type: 'timeout' | 'timelock'
): number[] {
const timeoutValues: number[] = service.attributes.serviceAgreementTemplate.conditions.map(
(condition: ServiceAgreementTemplateCondition) => condition[type]
)

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

@ -6,8 +6,15 @@ export class SignatureUtils extends Instantiable {
this.setInstanceConfig(config)
}
public async signText(text: string, publicKey: string, password?: string): Promise<string> {
const isMetaMask = this.web3 && this.web3.currentProvider && (this.web3.currentProvider as any).isMetaMask
public async signText(
text: string,
publicKey: string,
password?: string
): Promise<string> {
const isMetaMask =
this.web3 &&
this.web3.currentProvider &&
(this.web3.currentProvider as any).isMetaMask
try {
return await this.web3.eth.personal.sign(text, publicKey, password)
} catch (e) {

10
src/ocean/utils/WebServiceConnector.ts
View File

@ -43,14 +43,20 @@ export class WebServiceConnector extends Instantiable {
})
}
public async downloadFile(url: string, destination?: string, index?: number): Promise<string> {
public async downloadFile(
url: string,
destination?: string,
index?: number
): Promise<string> {
const response = await this.get(url)
if (!response.ok) {
throw new Error('Response error.')
}
let filename: string
try {
filename = response.headers.get('content-disposition').match(/attachment;filename=(.+)/)[1]
filename = response.headers
.get('content-disposition')
.match(/attachment;filename=(.+)/)[1]
} catch {
try {
filename = url.split('/').pop()

18
src/utils/ConversionTypeHelpers.ts
View File

@ -4,7 +4,11 @@ import { LoggerInstance } from './Logger'
export const zeroX = (input: string) => zeroXTransformer(input, true)
export const noZeroX = (input: string) => zeroXTransformer(input, false)
export function zeroXTransformer(input: string = '', zeroOutput: boolean) {
const { valid, output } = inputMatch(input, /^(?:0x)*([a-f0-9]+)$/i, 'zeroXTransformer')
const { valid, output } = inputMatch(
input,
/^(?:0x)*([a-f0-9]+)$/i,
'zeroXTransformer'
)
return (zeroOutput && valid ? '0x' : '') + output
}
@ -12,7 +16,11 @@ export function zeroXTransformer(input: string = '', zeroOutput: boolean) {
export const didPrefixed = (input: string) => didTransformer(input, true)
export const noDidPrefixed = (input: string) => didTransformer(input, false)
export function didTransformer(input: string = '', prefixOutput: boolean) {
const { valid, output } = inputMatch(input, /^(?:0x|did:op:)*([a-f0-9]{64})$/i, 'didTransformer')
const { valid, output } = inputMatch(
input,
/^(?:0x|did:op:)*([a-f0-9]{64})$/i,
'didTransformer'
)
return (prefixOutput && valid ? 'did:op:' : '') + output
}
@ -20,7 +28,11 @@ export function didTransformer(input: string = '', prefixOutput: boolean) {
export const didZeroX = (input: string) => zeroX(didTransformer(input, false))
// Shared functions
function inputMatch(input: string, regexp: RegExp, conversorName: string): { valid: boolean; output: string } {
function inputMatch(
input: string,
regexp: RegExp,
conversorName: string
): { valid: boolean; output: string } {
if (typeof input !== 'string') {
LoggerInstance.debug('Not input string:')
LoggerInstance.debug(input)

5
src/utils/DDOHelpers.ts
View File

@ -1,5 +1,8 @@
import { DDO } from '../ddo/DDO'
import { ServiceAgreementTemplateCondition, ServiceAgreementTemplateParameter } from '../ddo/ServiceAgreementTemplate'
import {
ServiceAgreementTemplateCondition,
ServiceAgreementTemplateParameter
} from '../ddo/ServiceAgreementTemplate'
function fillParameterWithDDO(
parameter: ServiceAgreementTemplateParameter,

6
src/utils/SubscribableObserver.ts
View File

@ -7,7 +7,11 @@ export class SubscribableObserver<T, P> {
onError?: (error: any) => void
}>()
public subscribe(onNext?: (next: T) => void, onComplete?: (complete: P) => void, onError?: (error: any) => void) {
public subscribe(
onNext?: (next: T) => void,
onComplete?: (complete: P) => void,
onError?: (error: any) => void
) {
if (this.completed) {
throw new Error('Observer completed.')
}

7
test/aquarius/Aquarius.test.ts
View File

@ -17,7 +17,12 @@ describe('Aquarius', () => {
let ocean: Ocean
let aquarius: Aquarius
/* eslint-disable @typescript-eslint/camelcase */
const getResults = (results: DDO[], page = 0, total_pages = 1, total_results = 1) => ({
const getResults = (
results: DDO[],
page = 0,
total_pages = 1,
total_results = 1
) => ({
results,
page,
total_pages,

20
test/ddo/DDO.test.ts
View File

@ -54,7 +54,8 @@ describe('DDO', () => {
},
{
type: 'HubService',
serviceEndpoint: 'https://hub.example.com/.identity/did:op:0123456789abcdef/'
serviceEndpoint:
'https://hub.example.com/.identity/did:op:0123456789abcdef/'
},
{
type: 'MessagingService',
@ -87,7 +88,8 @@ describe('DDO', () => {
{
type: 'metadata',
index: 0,
serviceEndpoint: 'http://myaquarius.org/api/v1/provider/assets/metadata/{did}',
serviceEndpoint:
'http://myaquarius.org/api/v1/provider/assets/metadata/{did}',
attributes: {
main: {
name: 'UK Weather information 2011',
@ -103,7 +105,8 @@ describe('DDO', () => {
checksum: 'efb2c764274b745f5fc37f97c6b0e761',
contentLength: '4535431',
contentType: 'application/json',
resourceId: 'access-log2018-02-13-15-17-29-18386C502CAEA932'
resourceId:
'access-log2018-02-13-15-17-29-18386C502CAEA932'
},
{
index: 1,
@ -123,9 +126,11 @@ describe('DDO', () => {
schema: 'Binary Voting'
},
additionalInformation: {
description: 'Weather information of UK including temperature and humidity',
description:
'Weather information of UK including temperature and humidity',
copyrightHolder: 'Met Office',
workExample: '423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68',
workExample:
'423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68',
links: [
{
sample1:
@ -235,7 +240,10 @@ describe('DDO', () => {
const ddo = new DDO(testDDO)
const checksum = ddo.getChecksum()
assert.equal(checksum, '0x15f27a7a3c7b15d2b06dec7347c6b8da168adddd7df51a8ebbbe87b59b80049b')
assert.equal(
checksum,
'0x15f27a7a3c7b15d2b06dec7347c6b8da168adddd7df51a8ebbbe87b59b80049b'
)
})
})

4
test/keeper/ContractEvent.test.ts
View File

@ -22,7 +22,9 @@ describe('ContractEvent', () => {
describe('#subscribe()', () => {
it('should be able to listen to events', async () => {
const event = eventHandler.getEvent(ocean.keeper.token, 'Transfer', { to: account })
const event = eventHandler.getEvent(ocean.keeper.token, 'Transfer', {
to: account
})
let validResolve = false
let subscription: ContractEventSubscription

50
test/keeper/DIDRegistry.test.ts
View File

@ -21,7 +21,13 @@ describe('DIDRegistry', () => {
const ownerAccount: Account = (await ocean.accounts.list())[0]
const did = generateId()
const data = 'my nice provider, is nice'
const receipt = await didRegistry.registerAttribute(did, `0123456789abcdef`, [], data, ownerAccount.getId())
const receipt = await didRegistry.registerAttribute(
did,
`0123456789abcdef`,
[],
data,
ownerAccount.getId()
)
assert(receipt.status)
assert(receipt.events.DIDAttributeRegistered)
})
@ -32,7 +38,13 @@ describe('DIDRegistry', () => {
{
// register the first attribute
const data = 'my nice provider, is nice'
await didRegistry.registerAttribute(did, '0123456789abcdef', [], data, ownerAccount.getId())
await didRegistry.registerAttribute(
did,
'0123456789abcdef',
[],
data,
ownerAccount.getId()
)
}
{
// register the second attribute with the same did
@ -55,11 +67,21 @@ describe('DIDRegistry', () => {
const ownerAccount: Account = (await ocean.accounts.list())[0]
const did = generateId()
const data = 'my nice provider, is nice'
await didRegistry.registerAttribute(did, '0123456789abcdef', [], data, ownerAccount.getId())
await didRegistry.registerAttribute(
did,
'0123456789abcdef',
[],
data,
ownerAccount.getId()
)
const owner = await didRegistry.getDIDOwner(did)
assert.equal(owner, ownerAccount.getId(), `Got ${owner} but expected ${ownerAccount.getId()}`)
assert.equal(
owner,
ownerAccount.getId(),
`Got ${owner} but expected ${ownerAccount.getId()}`
)
})
it('should get 0x0 for a not registered did', async () => {
@ -74,15 +96,29 @@ describe('DIDRegistry', () => {
const ownerAccount: Account = (await ocean.accounts.list())[0]
const did = generateId()
const data = 'my nice provider, is nice'
await didRegistry.registerAttribute(did, '0123456789abcdef', [], data, ownerAccount.getId())
await didRegistry.registerAttribute(
did,
'0123456789abcdef',
[],
data,
ownerAccount.getId()
)
// transfer
const newOwnerAccount: Account = (await ocean.accounts.list())[1]
await didRegistry.transferDIDOwnership(did, newOwnerAccount.getId(), ownerAccount.getId())
await didRegistry.transferDIDOwnership(
did,
newOwnerAccount.getId(),
ownerAccount.getId()
)
// check
const newOwner = await didRegistry.getDIDOwner(did)
assert.equal(newOwner, newOwnerAccount.getId(), `Got ${newOwner} but expected ${newOwnerAccount.getId()}`)
assert.equal(
newOwner,
newOwnerAccount.getId(),
`Got ${newOwner} but expected ${newOwnerAccount.getId()}`
)
})
})
})

107
test/keeper/TestContractHandler.ts
View File

@ -25,23 +25,33 @@ export default class TestContractHandler extends ContractHandler {
Logger.log('Trying to deploy contracts')
// Libraries
const epochLibrary = await TestContractHandler.deployContract('EpochLibrary', deployerAddress)
const didRegistryLibrary = await TestContractHandler.deployContract('DIDRegistryLibrary', deployerAddress)
const epochLibrary = await TestContractHandler.deployContract(
'EpochLibrary',
deployerAddress
)
const didRegistryLibrary = await TestContractHandler.deployContract(
'DIDRegistryLibrary',
deployerAddress
)
// Contracts
const token = await TestContractHandler.deployContract('OceanToken', deployerAddress, [
const token = await TestContractHandler.deployContract(
'OceanToken',
deployerAddress,
deployerAddress
])
[deployerAddress, deployerAddress]
)
const dispenser = await TestContractHandler.deployContract('Dispenser', deployerAddress, [
token.options.address,
deployerAddress
])
const dispenser = await TestContractHandler.deployContract(
'Dispenser',
deployerAddress,
[token.options.address, deployerAddress]
)
// Add dispenser as Token minter
if (!token.$initialized) {
await token.methods.addMinter(dispenser.options.address).send({ from: deployerAddress })
await token.methods
.addMinter(dispenser.options.address)
.send({ from: deployerAddress })
}
const didRegistry = await TestContractHandler.deployContract(
@ -54,9 +64,11 @@ export default class TestContractHandler extends ContractHandler {
)
// Managers
const templateStoreManager = await TestContractHandler.deployContract('TemplateStoreManager', deployerAddress, [
deployerAddress
])
const templateStoreManager = await TestContractHandler.deployContract(
'TemplateStoreManager',
deployerAddress,
[deployerAddress]
)
const conditionStoreManager = await TestContractHandler.deployContract(
'ConditionStoreManager',
deployerAddress,
@ -77,33 +89,49 @@ export default class TestContractHandler extends ContractHandler {
)
// Conditions
const lockRewardCondition = await TestContractHandler.deployContract('LockRewardCondition', deployerAddress, [
const lockRewardCondition = await TestContractHandler.deployContract(
'LockRewardCondition',
deployerAddress,
conditionStoreManager.options.address,
token.options.address
])
[
deployerAddress,
conditionStoreManager.options.address,
token.options.address
]
)
const accessSecretStoreCondition = await TestContractHandler.deployContract(
'AccessSecretStoreCondition',
deployerAddress,
[deployerAddress, conditionStoreManager.options.address, agreementStoreManager.options.address]
[
deployerAddress,
conditionStoreManager.options.address,
agreementStoreManager.options.address
]
)
// Conditions rewards
const escrowReward = await TestContractHandler.deployContract('EscrowReward', deployerAddress, [
const escrowReward = await TestContractHandler.deployContract(
'EscrowReward',
deployerAddress,
conditionStoreManager.options.address,
token.options.address
])
[
deployerAddress,
conditionStoreManager.options.address,
token.options.address
]
)
// Templates
await TestContractHandler.deployContract('EscrowAccessSecretStoreTemplate', deployerAddress, [
await TestContractHandler.deployContract(
'EscrowAccessSecretStoreTemplate',
deployerAddress,
agreementStoreManager.options.address,
didRegistry.options.address,
accessSecretStoreCondition.options.address,
lockRewardCondition.options.address,
escrowReward.options.address
])
[
deployerAddress,
agreementStoreManager.options.address,
didRegistry.options.address,
accessSecretStoreCondition.options.address,
lockRewardCondition.options.address,
escrowReward.options.address
]
)
}
private static async deployContract(
@ -151,7 +179,10 @@ export default class TestContractHandler extends ContractHandler {
contractInstance = await tempContract
.deploy({
data: TestContractHandler.replaceTokens(artifact.bytecode.toString(), tokens),
data: TestContractHandler.replaceTokens(
artifact.bytecode.toString(),
tokens
),
arguments: isZos ? undefined : args
})
.send(sendConfig)
@ -162,16 +193,26 @@ export default class TestContractHandler extends ContractHandler {
ContractHandler.setContract(name, where, contractInstance)
// Logger.log('Deployed', name, 'at', contractInstance.options.address)
} catch (err) {
Logger.error('Deployment failed for', name, 'with args', JSON.stringify(args, null, 2), err.message)
Logger.error(
'Deployment failed for',
name,
'with args',
JSON.stringify(args, null, 2),
err.message
)
throw err
}
return contractInstance
}
private static replaceTokens(bytecode: string, tokens: { [name: string]: string }): string {
private static replaceTokens(
bytecode: string,
tokens: { [name: string]: string }
): string {
return Object.entries(tokens).reduce(
(acc, [token, address]) => acc.replace(new RegExp(`_+${token}_+`, 'g'), address.substr(2)),
(acc, [token, address]) =>
acc.replace(new RegExp(`_+${token}_+`, 'g'), address.substr(2)),
bytecode
)
}

3
test/keeper/conditions/AccessSecretStoreCondition.test.ts
View File

@ -13,7 +13,8 @@ describe('AccessSecretStoreCondition', () => {
before(async () => {
await TestContractHandler.prepareContracts()
condition = (await Ocean.getInstance(config)).keeper.conditions.accessSecretStoreCondition
condition = (await Ocean.getInstance(config)).keeper.conditions
.accessSecretStoreCondition
})
describe('#hashValues()', () => {

28
test/keeper/conditions/EscrowReward.test.ts
View File

@ -21,13 +21,27 @@ describe('EscrowReward', () => {
await TestContractHandler.prepareContracts()
condition = keeper.conditions.escrowReward
lockCondition = await keeper.conditions.lockRewardCondition.generateIdHash(agreementId, publisher, amount)
releaseCondition = await keeper.conditions.accessSecretStoreCondition.generateIdHash(agreementId, did, consumer)
lockCondition = await keeper.conditions.lockRewardCondition.generateIdHash(
agreementId,
publisher,
amount
)
releaseCondition = await keeper.conditions.accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer
)
})
describe('#hashValues()', () => {
it('should hash the values', async () => {
const hash = await condition.hashValues(amount, consumer, publisher, lockCondition, releaseCondition)
const hash = await condition.hashValues(
amount,
consumer,
publisher,
lockCondition,
releaseCondition
)
assert.match(hash, /^0x[a-f0-9]{64}$/i)
})
@ -35,7 +49,13 @@ describe('EscrowReward', () => {
describe('#generateId()', () => {
it('should generate an ID', async () => {
const hash = await condition.hashValues(amount, consumer, publisher, lockCondition, releaseCondition)
const hash = await condition.hashValues(
amount,
consumer,
publisher,
lockCondition,
releaseCondition
)
const id = await condition.generateId(agreementId, hash)
assert.match(id, /^0x[a-f0-9]{64}$/i)

3
test/keeper/conditions/LockRewardCondition.test.ts
View File

@ -13,7 +13,8 @@ describe('LockRewardCondition', () => {
before(async () => {
await TestContractHandler.prepareContracts()
condition = (await Ocean.getInstance(config)).keeper.conditions.lockRewardCondition
condition = (await Ocean.getInstance(config)).keeper.conditions
.lockRewardCondition
})
describe('#hashValues()', () => {

4
test/mocks/WebServiceConnector.mock.ts
View File

@ -15,7 +15,9 @@ export default class WebServiceConnectorMock extends WebServiceConnector {
return this.returnData ? this.returnData : {}
},
text: () => {
return this.returnData ? JSON.stringify(this.returnData.toString()) : ''
return this.returnData
? JSON.stringify(this.returnData.toString())
: ''
}
})
})

10
test/ocean/Account.test.ts
View File

@ -39,7 +39,10 @@ describe('Account', () => {
const balance = await account.getEtherBalance()
const web3 = Web3Provider.getWeb3()
assert(Number(web3.utils.toWei('100', 'ether')) === balance, `ether did not match ${balance}`)
assert(
Number(web3.utils.toWei('100', 'ether')) === balance,
`ether did not match ${balance}`
)
})
})
@ -49,7 +52,10 @@ describe('Account', () => {
const balance = await account.getBalance()
const web3 = Web3Provider.getWeb3()
assert(Number(web3.utils.toWei('100', 'ether')) === balance.eth, `ether did not match ${balance.eth}`)
assert(
Number(web3.utils.toWei('100', 'ether')) === balance.eth,
`ether did not match ${balance.eth}`
)
assert(balance.ocn === 0, `tokens did not match ${balance.ocn}`)
})
})

6
test/ocean/OceanSecretStore.test.ts
View File

@ -27,7 +27,11 @@ describe('OceanSecretStore', () => {
describe('#encrypt()', () => {
it('should encrypt a content', async () => {
const secretStoreEncryptSpy = spy.on(ocean.brizo, 'encrypt', () => 'encryptedResult')
const secretStoreEncryptSpy = spy.on(
ocean.brizo,
'encrypt',
() => 'encryptedResult'
)
const result = await oceanSecretStore.encrypt(did, 'test', accounts[0])

11
test/ocean/utils/SignatureUtils.test.ts
View File

@ -47,9 +47,16 @@ describe('SignatureUtils', () => {
describe('#verifyText', () => {
it('should recover the privateKey of a signed message', async () => {
const personalRecoverSpy = spy.on(web3.eth.personal, 'ecRecover', () => publicKey)
const personalRecoverSpy = spy.on(
web3.eth.personal,
'ecRecover',
() => publicKey
)
const verifiedPublicKey = await ocean.utils.signature.verifyText(text, signature)
const verifiedPublicKey = await ocean.utils.signature.verifyText(
text,
signature
)
assert.equal(publicKey, verifiedPublicKey)
expect(personalRecoverSpy).to.have.been.called.with(text, signature)

7
test/utils/ConversionTypeHelpers.test.ts
View File

@ -1,5 +1,10 @@
import { assert } from 'chai'
import { zeroX, noZeroX, didPrefixed, noDidPrefixed } from '../../src/utils/ConversionTypeHelpers'
import {
zeroX,
noZeroX,
didPrefixed,
noDidPrefixed
} from '../../src/utils/ConversionTypeHelpers'
describe('ConversionTypeHelpers', () => {
describe('#zeroXTransformer()', () => {