order asset

src/ocean/Assets.ts

@@ -25,13 +25,6 @@ export enum CreateProgressStep {
     DdoStored
 }
 
-export enum OrderProgressStep {
-    CreatingAgreement,
-    AgreementInitialized,
-    LockingPayment,
-    LockedPayment
-}
-
 /**
  * Assets submodule of Ocean Protocol.
  */
@@ -390,6 +383,22 @@ export class Assets extends Instantiable {
         }
     }
 
+    public async order(
+        did: string,
+        serviceType: string,
+        tokenAddress,
+        consumerAddress: string
+    ): Promise<void> {
+        // provider.initialize
+        const service = await this.getService(did, serviceType)
+        return await this.ocean.provider.initialize(
+            did,
+            service.index,
+            serviceType,
+            consumerAddress
+        )
+    }
+
     public async download(
         dtAddress: string,
         serviceEndpoint: string,
@@ -400,7 +409,7 @@ export class Assets extends Instantiable {
         consumeUrl += `?consumerAddress=${account}`
         consumeUrl += `&tokenAddress=${dtAddress}`
         consumeUrl += `&transferTxId=${txId}`
-
+        console.log(consumeUrl)
         const serviceConnector = new WebServiceConnector(this.logger)
 
         try {

src/provider/Provider.ts

@@ -77,15 +77,15 @@ export class Provider extends Instantiable {
             this.logger.error(e)
             throw new Error('Failed to resolve DID')
         }
-        const { dtAddress } = DDO
 
         const args = {
             documentId: did,
             serviceId: serviceIndex,
             serviceType: serviceType,
-            tokenAddress: dtAddress,
+            tokenAddress: DDO.dataToken,
             consumerAddress: consumerAddress
         }
+        console.log(args)
 
         try {
             return await this.ocean.utils.fetch.post(

test/integration/Marketplaceflow.test.ts

@@ -159,7 +159,15 @@ describe('Marketplace flow', () => {
         })
 
         it('Bob consumes asset 1', async () => {
-            await ocean.assets.download(ddo.did, accessService.index, bob.getId(), '~/my-datasets')
+            console.log(
+                await ocean.assets.order(
+                    ddo.id,
+                    accessService.type,
+                    ddo.dataToken,
+                    bob.getId()
+                )
+            )
+            // await ocean.assets.download(tokenAddress, accessService.serviceEndpoint, accessService.index, bob.getId(), '~/my-datasets')
         })
     })
 })