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

Detect the error when a condition is not correctly fulfilled.

Browse Source
This commit is contained in:
Pedro Gutiérrez 2019-07-09 11:39:22 +02:00
parent 031720ad5d
commit d3f15e361a
1 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/ocean/OceanAgreementsConditions.ts
View File

@ -35,19 +35,24 @@ export class OceanAgreementsConditions extends Instantiable {
escrowReward
} = this.ocean.keeper.conditions
await this.ocean.keeper.token.approve(
lockRewardCondition.getAddress(),
amount,
from.getId()
)
try {
await this.ocean.keeper.token.approve(
lockRewardCondition.getAddress(),
amount,
from.getId()
)
const receipt = await lockRewardCondition.fulfill(
agreementId,
escrowReward.getAddress(),
amount,
from && from.getId()
)
return !!receipt.events.Fulfilled
const receipt = await lockRewardCondition.fulfill(
agreementId,
escrowReward.getAddress(),
amount,
from && from.getId()
)
return !!receipt.events.Fulfilled
} catch {
return false
}
}
/**
@ -63,15 +68,19 @@ export class OceanAgreementsConditions extends Instantiable {
grantee: string,
from?: Account
) {
const { accessSecretStoreCondition } = this.ocean.keeper.conditions
try {
const { accessSecretStoreCondition } = this.ocean.keeper.conditions
const receipt = await accessSecretStoreCondition.fulfill(
agreementId,
did,
grantee,
from && from.getId()
)
return !!receipt.events.Fulfilled
const receipt = await accessSecretStoreCondition.fulfill(
agreementId,
did,
grantee,
from && from.getId()
)
return !!receipt.events.Fulfilled
} catch {
return false
}
}
/**
@ -95,32 +104,36 @@ export class OceanAgreementsConditions extends Instantiable {
publisher: string,
from?: Account
) {
const {
escrowReward,
accessSecretStoreCondition,
lockRewardCondition
} = this.ocean.keeper.conditions
try {
const {
escrowReward,
accessSecretStoreCondition,
lockRewardCondition
} = this.ocean.keeper.conditions
const conditionIdAccess = await accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer
)
const conditionIdLock = await lockRewardCondition.generateIdHash(
agreementId,
escrowReward.getAddress(),
amount
)
const conditionIdAccess = await accessSecretStoreCondition.generateIdHash(
agreementId,
did,
consumer
)
const conditionIdLock = await lockRewardCondition.generateIdHash(
agreementId,
escrowReward.getAddress(),
amount
)
const receipt = await escrowReward.fulfill(
agreementId,
amount,
publisher,
consumer,
conditionIdLock,
conditionIdAccess,
from && from.getId()
)
return !!receipt.events.Fulfilled
const receipt = await escrowReward.fulfill(
agreementId,
amount,
publisher,
consumer,
conditionIdLock,
conditionIdAccess,
from && from.getId()
)
return !!receipt.events.Fulfilled
} catch {
return false
}
}
}