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

merge fixes

Browse Source
This commit is contained in:
Matthias Kretschmann 2020-01-23 10:33:02 +01:00
parent e31aa81dcc
commit c8ea5f77c2
Signed by: m
GPG Key ID: 606EEEF3C479A91F
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ocean/OceanAssets.ts
View File

@ -292,7 +292,7 @@ export class OceanAssets extends Instantiable {
public order(
did: string,
index: number,
consumerAccount: Account
consumerAccount: Account,
provider?: string
): SubscribablePromise<OrderProgressStep, string> {
return new SubscribablePromise(async observer => {

14
src/ocean/OceanCompute.ts
View File

@ -44,7 +44,8 @@ export class OceanCompute extends Instantiable {
*/
public order(
consumerAccount: Account,
datasetDid: string
datasetDid: string,
provider?: string
): SubscribablePromise<OrderProgressStep, string> {
return new SubscribablePromise(async observer => {
const { keeper, assets, agreements } = this.ocean
@ -95,12 +96,23 @@ export class OceanCompute extends Instantiable {
observer.next(OrderProgressStep.CreatingAgreement)
this.logger.log('Creating agreement')
// Get provider from didRegistry if not given in arguments
let _provider = provider
if (!provider) {
const providers = await keeper.didRegistry.getDIDProviders(ddo.shortId())
if (providers) {
_provider = providers[0]
}
}
await agreements.create(
datasetDid,
agreementId,
index,
undefined,
consumerAccount,
_provider,
consumerAccount
)
this.logger.log('Agreement created')