Merge branch 'fix/load_artifacts' into develop

aave_integration/nevermined/AaveCredit.test.ts

@@ -81,6 +81,7 @@ describe('AaveCredit', () => {
 
     nevermined = await Nevermined.getInstance(config)
     ;({ agreementFee } = config.aaveConfig as AaveConfig)
+    await nevermined.keeper.loadAaveInstances()
     ;({ aaveCreditTemplate } = nevermined.keeper.templates)
     ;({ conditionStoreManager, didRegistry, agreementStoreManager } = nevermined.keeper)
     ;({ nft721LockCondition, aaveRepayCondition } = nevermined.keeper.conditions)

integration/nevermined/Artifacts.test.ts

@@ -3,16 +3,15 @@ import { mkdtempSync, writeFileSync } from 'fs'
 import { NeverminedOptions, Nevermined } from '../../src'
 import fetch from 'node-fetch'
 import { x } from 'tar'
-import { infuraToken } from '../config'
 
 describe('Artifacts', () => {
   const artifactsRepo = 'https://artifacts.nevermined.network/'
   const tests = [
     {
-      web3ProviderUri: `https://polygon-mumbai.infura.io/v3/${infuraToken}`,
-      networkName: ['mumbai'],
-      networkId: [80001],
-      versions: ['v3.2.1'],
+      web3ProviderUri: 'https://goerli-rollup.arbitrum.io/rpc',
+      networkName: ['arbitrum-goerli'],
+      networkId: [421613],
+      versions: ['v3.2.2'],
       tag: 'public',
     },
   ]

integration/nevermined/Assets.test.ts

@@ -220,6 +220,57 @@ describe('Assets', () => {
       assert.deepEqual(files, ['LICENSE'], 'Stored files are not correct.')
     })
 
+    it('update the asset files', async () => {
+      const nonce = Math.random()
+      const name = `Updated Files Test ${nonce}`
+      const updatedMetadata = {
+        ...createdMetadata,
+        name,
+      }
+      updatedMetadata.main.files = [
+        {
+          index: 0,
+          contentType: 'text/plain',
+          url: 'https://raw.githubusercontent.com/nevermined-io/sdk-js/main/LICENSE',
+        },
+      ]
+
+      await nevermined.assets.update(ddo.shortId(), updatedMetadata, publisher)
+
+      const resolvedDDO = await nevermined.assets.resolve(ddo.id)
+      assert.isDefined(resolvedDDO)
+
+      const previousMetadata = ddo.findServiceByType('metadata')
+      const metadata = resolvedDDO.findServiceByType('metadata')
+
+      assert.equal(updatedMetadata.main.name, metadata.attributes.main.name)
+
+      assert.equal(metadata.attributes.main.files.length, 1)
+      assert.notEqual(
+        previousMetadata.attributes.main.files.length,
+        metadata.attributes.main.files.length,
+      )
+      assert.notEqual(
+        previousMetadata.attributes.encryptedFiles,
+        metadata.attributes.encryptedFiles,
+      )
+    })
+
+    it('should be able to download the updated files', async () => {
+      const folder = '/tmp/sdk-js/updated-files'
+      if (!fs.existsSync(folder)) fs.mkdirSync(folder, { recursive: true })
+
+      const path = (await nevermined.assets.download(ddo.id, publisher, folder, -1)) as string
+      assert.include(path, folder, 'The storage path is not correct.')
+      const files = await new Promise<string[]>((resolve) => {
+        fs.readdir(path, (e, fileList) => {
+          resolve(fileList)
+        })
+      })
+
+      assert.deepEqual(files, ['LICENSE'], 'Stored files are not correct.')
+    })
+
     it('unlist and list an asset', async () => {
       // Unlisting Asset
       await nevermined.assets.list(ddo.shortId(), false, publisher)

src/keeper/Keeper.ts

@@ -93,14 +93,14 @@ export class Keeper extends Instantiable {
         transferDidOwnershipCondition: TransferDIDOwnershipCondition.getInstance(
           this.instanceConfig,
         ),
-        aaveBorrowCondition: AaveBorrowCondition.getInstance(this.instanceConfig),
-        aaveCollateralDepositCondition: AaveCollateralDepositCondition.getInstance(
-          this.instanceConfig,
-        ),
-        aaveCollateralWithdrawCondition: AaveCollateralWithdrawCondition.getInstance(
-          this.instanceConfig,
-        ),
-        aaveRepayCondition: AaveRepayCondition.getInstance(this.instanceConfig),
+
+        // Aave instances are optional
+        aaveBorrowCondition: undefined,
+        aaveCollateralDepositCondition: undefined,
+        aaveCollateralWithdrawCondition: undefined,
+        aaveRepayCondition: undefined,
+        aaveCreditTemplate: undefined,
+
         nft721LockCondition: NFT721LockCondition.getInstance(this.instanceConfig),
         distributeNftCollateralCondition: DistributeNFTCollateralCondition.getInstance(
           this.instanceConfig,
@@ -115,15 +115,14 @@ export class Keeper extends Instantiable {
         didSalesTemplate: DIDSalesTemplate.getInstance(this.instanceConfig),
         nftSalesTemplate: NFTSalesTemplate.getInstance(this.instanceConfig),
         nft721SalesTemplate: NFT721SalesTemplate.getInstance(this.instanceConfig),
-        aaveCreditTemplate: AaveCreditTemplate.getInstance(this.instanceConfig), // optional
         standardRoyalties: StandardRoyalties.getInstance(this.instanceConfig), // optional
         rewardsDistributor: RewardsDistributor.getInstance(this.instanceConfig),
         nftUpgradeable: Nft1155Contract.getInstance(this.instanceConfig),
       })
 
       this.royalties = {
         standard: this.instances.standardRoyalties,
-        curve: this.instances.curveRoyalties,
+        curve: undefined,
       }
 
       this.rewardsDistributor = this.instances.rewardsDistributor
@@ -136,7 +135,6 @@ export class Keeper extends Instantiable {
         this.instances.didSalesTemplate,
         this.instances.nftSalesTemplate,
         this.instances.nft721SalesTemplate,
-        this.instances.aaveCreditTemplate,
       ]
 
       const templateObj: any = {}
@@ -167,12 +165,6 @@ export class Keeper extends Instantiable {
       this.logger.debug('Token not available on this network.')
     }
 
-    try {
-      this.instances.curveRoyalties = await CurveRoyalties.getInstance(this.instanceConfig)
-    } catch {
-      this.logger.debug('CurveRoyalties not available on this network.')
-    }
-
     // Main contracts
     this.dispenser = this.instances.dispenser
     this.token = this.instances.token
@@ -196,10 +188,10 @@ export class Keeper extends Instantiable {
       transferNftCondition: this.instances.transferNftCondition,
       transferNft721Condition: this.instances.transferNft721Condition,
       transferDidOwnershipCondition: this.instances.transferDidOwnershipCondition,
-      aaveBorrowCondition: this.instances.aaveBorrowCondition,
-      aaveCollateralDepositCondition: this.instances.aaveCollateralDepositCondition,
-      aaveCollateralWithdrawCondition: this.instances.aaveCollateralWithdrawCondition,
-      aaveRepayCondition: this.instances.aaveRepayCondition,
+      aaveBorrowCondition: undefined,
+      aaveCollateralDepositCondition: undefined,
+      aaveCollateralWithdrawCondition: undefined,
+      aaveRepayCondition: undefined,
       nft721LockCondition: this.instances.nft721LockCondition,
       distributeNftCollateralCondition: this.instances.distributeNftCollateralCondition,
     }
@@ -213,7 +205,7 @@ export class Keeper extends Instantiable {
       nft721AccessTemplate: this.instances.nft721AccessTemplate,
       nftSalesTemplate: this.instances.nftSalesTemplate,
       nft721SalesTemplate: this.instances.nft721SalesTemplate,
-      aaveCreditTemplate: this.instances.aaveCreditTemplate,
+      aaveCreditTemplate: undefined,
     }
     this.templateList = [
       this.instances.accessTemplate,
@@ -438,6 +430,40 @@ export class Keeper extends Instantiable {
   public getAllInstances() {
     return this.instances
   }
+
+  public async loadAaveInstances() {
+    if (this.instances.aaveCreditTemplate) return this
+
+    this.logger.debug('Loading Aave contracts')
+    this.instances.aaveBorrowCondition = await AaveBorrowCondition.getInstance(this.instanceConfig)
+    this.instances.aaveCollateralDepositCondition =
+      await AaveCollateralDepositCondition.getInstance(this.instanceConfig)
+    this.instances.aaveCollateralWithdrawCondition =
+      await AaveCollateralWithdrawCondition.getInstance(this.instanceConfig)
+    this.instances.aaveRepayCondition = await AaveRepayCondition.getInstance(this.instanceConfig)
+
+    this.conditions.aaveBorrowCondition = this.instances.aaveBorrowCondition
+    this.conditions.aaveCollateralDepositCondition = this.instances.aaveCollateralDepositCondition
+    this.conditions.aaveCollateralWithdrawCondition = this.instances.aaveCollateralWithdrawCondition
+    this.conditions.aaveRepayCondition = this.instances.aaveRepayCondition
+    this.conditionsList = Object.values(this.conditions)
+
+    this.instances.aaveCreditTemplate = await AaveCreditTemplate.getInstance(this.instanceConfig)
+    this.templates.aaveCreditTemplate = this.instances.aaveCreditTemplate
+    this.agreementStoreManager.addTemplate('AaveCreditTemplate', this.instances.aaveCreditTemplate)
+    return this
+  }
+
+  public async loadCurveRoyaltiesInstance() {
+    if (this.royalties.curve) return this.royalties.curve
+
+    try {
+      this.royalties.curve = await CurveRoyalties.getInstance(this.instanceConfig)
+    } catch {
+      this.logger.debug('CurveRoyalties not available on this network.')
+    }
+    return this.royalties.curve
+  }
 }
 
 export default Keeper

test/bookmarks/Bookmarks.test.ts

@@ -5,6 +5,7 @@ import { Nevermined } from '../../src'
 import { MarketplaceResults } from '../../src/common/interfaces'
 import config from '../config'
 import { Bookmark, Bookmarks, NewBookmark } from '../../src/services'
+import TestContractHandler from '../keeper/TestContractHandler'
 
 use(spies)
 
@@ -20,8 +21,12 @@ describe('Bookmarks', () => {
   let bookmark: Bookmark
   let bookmarksResults: MarketplaceResults<Bookmark>
 
-  beforeEach(async () => {
+  before(async () => {
+    await TestContractHandler.prepareContracts()
     nevermined = await Nevermined.getInstance(config)
+  })
+
+  beforeEach(async () => {
     bookmarks = nevermined.services.bookmarks // eslint-disable-line prefer-destructuring
 
     newBookmark = {

test/keeper/Keeper.test.ts

@@ -27,6 +27,14 @@ describe('Keeper', () => {
     it('should have token', () => {
       assert(keeper.token !== null)
     })
+
+    it('should not have curve royalties', () => {
+      assert(keeper.royalties.curve === undefined, 'should not have curve royalties')
+    })
+
+    it('should not have Aave contracts', () => {
+      assert(keeper.templates!.aaveCreditTemplate! === undefined, 'should not have aave templates')
+    })
   })
 
   describe('#getNetworkName()', () => {

test/keeper/conditions/AaveBorrowCondition.test.ts

@@ -26,7 +26,8 @@ describe('AaveBorrowCondition', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[user] = await nevermined.accounts.list()
     ;({ didRegistry } = nevermined.keeper)
-    condition = (await Nevermined.getInstance(config)).keeper.conditions.aaveBorrowCondition
+    condition = (await (await Nevermined.getInstance(config)).keeper.loadAaveInstances()).conditions
+      .aaveBorrowCondition
   })
 
   beforeEach(async () => {
@@ -48,16 +49,6 @@ describe('AaveBorrowCondition', () => {
 
       const id = await condition.generateId(agreementId, hash)
       assert.match(id, /^0x[a-f0-9]{64}$/i)
-
-      // const txReceipt: TransactionReceipt = await condition.fulfill(
-      //     agreementId,
-      //     did,
-      //     vaultAddress,
-      //     assetToBorrow,
-      //     amount,
-      //     interestRateMode,
-      //     user
-      // )
     })
   })
 })

test/keeper/conditions/AaveCollateralDepositCondition.test.ts

@@ -28,7 +28,7 @@ describe('AaveCollateralDepositCondition', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[user] = await nevermined.accounts.list()
     ;({ didRegistry } = nevermined.keeper)
-    condition = (await Nevermined.getInstance(config)).keeper.conditions
+    condition = (await (await Nevermined.getInstance(config)).keeper.loadAaveInstances()).conditions
       .aaveCollateralDepositCondition
   })
 

test/keeper/conditions/AaveCollateralWithdrawCondition.test.ts

@@ -24,7 +24,7 @@ describe('AaveCollateralWithdrawCondition', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[user] = await nevermined.accounts.list()
     ;({ didRegistry } = nevermined.keeper)
-    condition = (await Nevermined.getInstance(config)).keeper.conditions
+    condition = (await (await Nevermined.getInstance(config)).keeper.loadAaveInstances()).conditions
       .aaveCollateralWithdrawCondition
   })
 

test/keeper/conditions/AaveRepayCondition.test.ts

@@ -26,7 +26,8 @@ describe('AaveRepayCondition', () => {
     nevermined = await Nevermined.getInstance(config)
     ;[user] = await nevermined.accounts.list()
     ;({ didRegistry } = nevermined.keeper)
-    condition = (await Nevermined.getInstance(config)).keeper.conditions.aaveRepayCondition
+    condition = (await (await Nevermined.getInstance(config)).keeper.loadAaveInstances()).conditions
+      .aaveRepayCondition
   })
 
   beforeEach(async () => {