fix lock Payment

package.json

@@ -48,7 +48,7 @@
   },
   "homepage": "https://github.com/oceanprotocol/squid-js#readme",
   "dependencies": {
-    "@oceanprotocol/keeper-contracts": "0.3.23",
+    "@oceanprotocol/keeper-contracts": "0.3.25",
     "@oceanprotocol/secret-store-client": "0.0.12",
     "bignumber.js": "^8.0.1",
     "eth-crypto": "^1.2.7",
@@ -64,7 +64,7 @@
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.12.7",
+    "@types/node": "^10.12.10",
     "chai": "^4.2.0",
     "mocha": "^5.2.0",
     "nyc": "^13.1.0",

src/keeper/contracts/ContractBase.ts

@@ -60,7 +60,7 @@ export default abstract class ContractBase {
         if (!this.contract.methods[name]) {
             throw new Error(`Method "${name}" is not part of contract "${this.contractName}"`)
         }
-        // Logger.log(name)
+        // Logger.log(name, args)
         const method = this.contract.methods[name]
         try {
             const methodInstance = method(...args)

src/keeper/contracts/ServiceAgreement.ts

@@ -16,12 +16,12 @@ export default class ServiceAgreement extends ContractBase {
                                         name: any,
                                         fulfillmentIndices: number[],
                                         fulfillmentOperator: number,
-                                        ownerAddress: string)
+                                        ownerAddress: string): Promise<Receipt> {
-        : Promise<Receipt> {
 
         return this.send("setupAgreementTemplate", ownerAddress, [
             templateId, methodReflections.map((r) => r.address),
-            methodReflections.map((r) => r.signature), dependencyMatrix, name, fulfillmentIndices, fulfillmentOperator,
+            methodReflections.map((r) => r.signature), dependencyMatrix, name, fulfillmentIndices,
+            fulfillmentOperator,
         ])
     }
 

src/ocean/ServiceAgreements/ServiceAgreement.ts

@@ -205,8 +205,10 @@ export default class ServiceAgreement extends OceanBase {
         super(serviceAgreementId)
     }
 
-    public async lockPayment(assetId: string, price: number, consumer: Account): Promise<boolean> {
+    public async buyAsset(assetId: string, price: number, consumer: Account): Promise<boolean> {
-        const {paymentConditions} = await Keeper.getInstance()
+        const {paymentConditions, token} = await Keeper.getInstance()
+
+        await token.approve(paymentConditions.getAddress(), price, consumer.getId())
 
         const lockPaymentReceipt =
             await paymentConditions.lockPayment(this.getId(), assetId, price,
@@ -222,7 +224,7 @@ export default class ServiceAgreement extends OceanBase {
             await accessConditions.grantAccess(this.getId(), assetId, documentId,
                 this.publisher.getId())
 
-        return grantAccessReceipt.status
+        return !!grantAccessReceipt.events.AccessGranted
     }
 
     public async getStatus() {

src/ocean/ServiceAgreements/ServiceAgreementTemplate.ts

@@ -35,15 +35,11 @@ export default class ServiceAgreementTemplate extends OceanBase {
             }))
 
         const fulfillmentIndices: number[] = this.template.Methods
-            .map((method: Method, i: number) => method.isTerminalCondition ? i : undefined)
+            .map((method: Method, i: number) => method.isTerminalCondition ? i : null)
-            .filter((index: number) => index !== undefined)
+            .filter((index: number) => index !== null)
-
-        Logger.log(dependencyMatrix, fulfillmentIndices, this.template.fulfillmentOperator)
 
         const {serviceAgreement} = await Keeper.getInstance()
 
-        const methodReflections = await this.getMethodReflections()
-
         const owner = await this.getOwner()
 
         if (owner.getId() === templateOwnerAddress) {
@@ -60,7 +56,7 @@ export default class ServiceAgreementTemplate extends OceanBase {
         const receipt = await serviceAgreement
             .setupAgreementTemplate(
                 this.template.id,
-                methodReflections,
+                await this.getMethodReflections(),
                 dependencyMatrix,
                 Web3Provider.getWeb3().utils.fromAscii(this.template.templateName),
                 fulfillmentIndices,
@@ -126,21 +122,20 @@ export default class ServiceAgreementTemplate extends OceanBase {
             throw new Error("Deps and timeouts need the same length")
         }
 
-        // map name to index
         const mappedDependencies: number[] = []
         const mappedDependencyTimeoutFlags: number[] = []
 
         this.template.Methods.forEach((m, i) => {
             const di = dependencies.findIndex((d) => d === m.name)
             mappedDependencies.push(di > -1 ? 1 : 0)
-            mappedDependencyTimeoutFlags.push(dependencyTimeoutFlags[i] ? 1 : 0)
+            mappedDependencyTimeoutFlags.push((di > -1 && dependencyTimeoutFlags[di]) ? 1 : 0)
         })
 
         if (mappedDependencies.length !== mappedDependencyTimeoutFlags.length) {
             throw new Error("Deps and timeouts need the same length")
         }
 
-        Logger.log(dependencies, mappedDependencies, dependencyTimeoutFlags, mappedDependencyTimeoutFlags)
+        // Logger.log(dependencies, mappedDependencies, dependencyTimeoutFlags, mappedDependencyTimeoutFlags)
 
         let compressedDependencyValue: number = 0
         const numBits: number = 2  // 1st for dependency, 2nd for timeout flag

test/ocean/ServiceAgreement.test.ts

@@ -73,7 +73,8 @@ describe("ServiceAgreement", () => {
                         case "assetId":
                             return "0x" + assetId
                         case "documentKeyId":
-                            return "0x1234"
+                            return "0x" + assetId
+
                     }
 
                     return null
@@ -118,8 +119,7 @@ describe("ServiceAgreement", () => {
     describe("#signServiceAgreement()", () => {
         it("should sign an service agreement", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
@@ -138,8 +138,7 @@ describe("ServiceAgreement", () => {
     describe("#executeServiceAgreement()", () => {
         it("should execute an service agreement", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
@@ -163,8 +162,7 @@ describe("ServiceAgreement", () => {
     describe("#getStatus()", () => {
         it("should get the status of a newly created service agreement", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
@@ -185,16 +183,16 @@ describe("ServiceAgreement", () => {
         })
     })
 
-    describe("#lockPayment()", () => {
+    describe("#buyAsset()", () => {
         it("should lock the payment in that service agreement", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService, metaDataService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
             // @ts-ignore
             WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
+
             const serviceAgreementSignature: string =
                 await ServiceAgreement.signServiceAgreement(assetId, ddo, accessService.serviceDefinitionId,
                     serviceAgreementId, consumerAccount)
@@ -208,7 +206,7 @@ describe("ServiceAgreement", () => {
             // get funds
             await consumerAccount.requestTokens(metaDataService.metadata.base.price)
 
-            const paid: boolean = await serviceAgreement.lockPayment(assetId, metaDataService.metadata.base.price,
+            const paid: boolean = await serviceAgreement.buyAsset(assetId, metaDataService.metadata.base.price,
                 consumerAccount)
             assert(paid)
         })
@@ -217,8 +215,7 @@ describe("ServiceAgreement", () => {
     describe("#grantAccess()", () => {
         it("should grant access in that service agreement", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
@@ -237,18 +234,18 @@ describe("ServiceAgreement", () => {
             // get funds
             await consumerAccount.requestTokens(metaDataService.metadata.base.price)
 
-            const paid: boolean = await serviceAgreement.lockPayment(assetId, metaDataService.metadata.base.price,
+            const paid: boolean = await serviceAgreement.buyAsset(assetId, metaDataService.metadata.base.price,
                 consumerAccount)
             assert(paid)
 
-            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, IdGenerator.generateId())
+            // todo: use document id
+            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId)
             assert(accessGranted)
         })
 
-        xit("should fail to grant grant access if there is no payment", async () => {
+        it("should fail to grant grant access if there is no payment", async () => {
 
-            const id: string = IdGenerator.generateId()
+            const did: string = `did:op:${assetId}`
-            const did: string = `did:op:${id}`
             const ddo = new DDO({id: did, service: [accessService]})
             const serviceAgreementId: string = IdGenerator.generateId()
 
@@ -264,7 +261,8 @@ describe("ServiceAgreement", () => {
                     serviceAgreementId, serviceAgreementSignature, consumerAccount, publisherAccount)
             assert(serviceAgreement)
 
-            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, IdGenerator.generateId())
+            // todo: use document id
+            const accessGranted: boolean = await serviceAgreement.grantAccess(assetId, assetId)
             assert(!accessGranted)
         })
     })