Merge pull request #92 from nevermined-io/feature/sdk_stable

feat: adapting to latest sdk and sdk-dtp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/cli",
-  "version": "1.0.0-rc0",
+  "version": "1.0.0",
   "main": "index.js",
   "repository": "[email protected]:nevermined-io/cli.git",
   "author": "Nevermined",
@@ -22,8 +22,8 @@
     "ncli": "./dist/src/index.js"
   },
   "dependencies": {
-    "@nevermined-io/nevermined-sdk-js": "1.0.0-rc18",
-    "@nevermined-io/nevermined-sdk-dtp": "0.3.0-rc15",
+    "@nevermined-io/sdk": "1.0.0",
+    "@nevermined-io/sdk-dtp": "0.3.0",
     "@truffle/hdwallet-provider": "^2.0.9",
     "chalk": "^4.1.2",
     "cross-fetch": "~3.1.5",

src/cli.ts

@@ -19,7 +19,7 @@ import { ExecutionOutput } from './models/ExecutionOutput'
 import fs from 'fs'
 import * as CliCommands from './commands'
 import { CLICommandsDefinition } from './models/CLICommandsDefinition'
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ConfigEntry } from './models/ConfigDefinition'
 type CliCommands = typeof CliCommands
 

src/commands/accounts/fund.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { Logger } from 'log4js'
 import chalk from 'chalk'

src/commands/accounts/list.ts

@@ -3,7 +3,7 @@ import {
   Account,
   NFT721Api,
   BigNumber
-} from '@nevermined-io/nevermined-sdk-js'
+} from '@nevermined-io/sdk'
 import chalk from 'chalk'
 import { Logger } from 'log4js'
 import {

src/commands/accounts/new.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'

src/commands/agreements/listAgreements.ts

@@ -1,6 +1,5 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, ConditionState, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
-import { ConditionState } from '@nevermined-io/nevermined-sdk-js'
 import chalk from 'chalk'
 import { Logger } from 'log4js'
 import { ExecutionOutput } from '../../models/ExecutionOutput'

src/commands/agreements/showAgreement.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes, getContractNameFromAddress } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'

src/commands/assets/downloadAsset.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
 import readline from 'readline'

src/commands/assets/getAsset.ts

@@ -1,11 +1,11 @@
-import { Account, generateIntantiableConfigFromConfig, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, generateIntantiableConfigFromConfig, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
 import readline from 'readline'
 import { Logger } from 'log4js'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { ConfigEntry } from '../../models/ConfigDefinition'
-import { CryptoConfig, Dtp } from '@nevermined-io/nevermined-sdk-dtp'
+import { CryptoConfig, Dtp } from '@nevermined-io/sdk-dtp'
 
 readline.createInterface({
   input: process.stdin,

src/commands/assets/orderAsset.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
 import readline from 'readline'

src/commands/assets/queryAsset.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, ServiceMetadata } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, ServiceMetadata } from '@nevermined-io/sdk'
 import { StatusCodes, printSearchResult } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'

src/commands/assets/registerAsset.ts

@@ -1,4 +1,4 @@
-import { Account, AssetPrice, AssetAttributes, MetaDataFile, Nevermined, MetaData, MetaDataMain, zeroX, generateIntantiableConfigFromConfig, BigNumber, PublishMetadata } from '@nevermined-io/nevermined-sdk-js'
+import { Account, AssetPrice, AssetAttributes, Nevermined, MetaData, MetaDataMain, zeroX, generateIntantiableConfigFromConfig, BigNumber, PublishMetadata, MetaDataExternalResource } from '@nevermined-io/sdk'
 import {
   StatusCodes,
   printTokenBanner,
@@ -11,7 +11,7 @@ import { ExecutionOutput } from '../../models/ExecutionOutput'
 import fs from 'fs'
 import { Logger } from 'log4js'
 import { ConfigEntry } from '../../models/ConfigDefinition'
-import { Dtp } from '@nevermined-io/nevermined-sdk-dtp'
+import { Dtp } from '@nevermined-io/sdk-dtp'
 
 export const registerAsset = async (
   nvm: Nevermined,
@@ -49,7 +49,7 @@ export const registerAsset = async (
 
   if (!metadata) {
 
-    const _files: MetaDataFile[] = []
+    const _files: MetaDataExternalResource[] = []
     let _fileIndex = 0
     if (isDTP) {
       _files.push({

src/commands/assets/resolveDID.ts

@@ -1,7 +1,7 @@
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { Logger } from 'log4js'
 import { ConfigEntry } from '../../models/ConfigDefinition'
 

src/commands/assets/retireDID.ts

@@ -1,6 +1,6 @@
 import { StatusCodes } from '../../utils'
 import chalk from 'chalk'
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { Logger } from 'log4js'
 import { ConfigEntry } from '../../models/ConfigDefinition'

src/commands/assets/searchAsset.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, ServiceMetadata } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, ServiceMetadata } from '@nevermined-io/sdk'
 import { StatusCodes, printSearchResult } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'

src/commands/network/networkGetConfig.ts

@@ -3,7 +3,7 @@ import {
   StatusCodes
 } from '../../utils'
 import { Logger } from 'log4js'
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'
 import { ConfigEntry } from '../../models/ConfigDefinition'

src/commands/network/networkList.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes, getNetworksConfig } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'

src/commands/network/networkSetConfig.ts

@@ -1,6 +1,6 @@
 import { StatusCodes } from '../../utils'
 import { Logger } from 'log4js'
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'
 import { ConfigEntry } from '../../models/ConfigDefinition'

src/commands/network/networkStatus.ts

@@ -4,7 +4,7 @@ import {
   StatusCodes
 } from '../../utils'
 import { Logger } from 'log4js'
-import { Account, Nevermined, PlatformTechStatus } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, PlatformTechStatus } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'
 import { ConfigEntry } from '../../models/ConfigDefinition'

src/commands/nfts/accessNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, Nevermined, NFTsBaseApi } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, Nevermined, NFTsBaseApi } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'

src/commands/nfts/burnNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, Nevermined } from '@nevermined-io/sdk'
 import {
   StatusCodes,
   printNftTokenBanner,

src/commands/nfts/cloneNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, Nevermined } from '@nevermined-io/sdk'
 import {
   StatusCodes
 } from '../../utils'

src/commands/nfts/createNft.ts

@@ -1,4 +1,4 @@
-import { Account, AssetPrice, getRoyaltyAttributes, Nevermined, NeverminedNFT1155Type, NeverminedNFT721Type, NFTAttributes, RoyaltyKind, ServiceType, BigNumber, zeroX, PublishMetadata, AssetAttributes } from '@nevermined-io/nevermined-sdk-js'
+import { Account, AssetPrice, getRoyaltyAttributes, Nevermined, NeverminedNFT1155Type, NeverminedNFT721Type, NFTAttributes, RoyaltyKind, ServiceType, BigNumber, zeroX, PublishMetadata, AssetAttributes, MetaDataExternalResource } from '@nevermined-io/sdk'
 import {
   StatusCodes,
   printNftTokenBanner,
@@ -7,7 +7,7 @@ import {
   getFeesFromBigNumber
 } from '../../utils'
 import chalk from 'chalk'
-import { MetaDataFile, MetaDataMain } from '@nevermined-io/nevermined-sdk-js'
+import { MetaDataMain } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import fs from 'fs'
 import { Logger } from 'log4js'
@@ -61,7 +61,7 @@ export const createNft = async (
     logger.trace(`DDO Price: ${ddoPrice}`)
     logger.trace(`to Fixed: ${ddoPrice.toString()}`)
 
-    const _files: MetaDataFile[] = []
+    const _files: MetaDataExternalResource[] = []
     let _fileIndex = 0
     argv.urls.forEach((_url: string) => {
       _files.push({

src/commands/nfts/deployNft.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, Nft1155Contract, Nft721Contract, Web3Provider } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, Nft1155Contract, Nft721Contract, Web3Provider } from '@nevermined-io/sdk'
 import { ContractReceipt, ethers } from 'ethers'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
 import {

src/commands/nfts/downloadNft.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, NFTsBaseApi } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, NFTsBaseApi } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'

src/commands/nfts/holdNft.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, NFT1155Api, NFT721Api, zeroX } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, NFT1155Api, NFT721Api, zeroX } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'

src/commands/nfts/mintNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, Nevermined, zeroX } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, Nevermined, zeroX } from '@nevermined-io/sdk'
 import {
   StatusCodes,
   printNftTokenBanner,

src/commands/nfts/orderNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, getAssetPriceFromDDOByService, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, getAssetPriceFromDDOByService, Nevermined } from '@nevermined-io/sdk'
 import { Constants, StatusCodes, loadToken, getNFTAddressFromInput } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import chalk from 'chalk'

src/commands/nfts/showNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, DDO, getAssetPriceFromDDOByService, Nevermined, zeroX } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, DDO, getAssetPriceFromDDOByService, Nevermined, zeroX } from '@nevermined-io/sdk'
 import {
   Constants,
   StatusCodes,

src/commands/nfts/transferNft.ts

@@ -1,4 +1,4 @@
-import { Account, BigNumber, getAssetPriceFromDDOByService, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, BigNumber, getAssetPriceFromDDOByService, Nevermined } from '@nevermined-io/sdk'
 import { Constants, StatusCodes, loadToken, getNFTAddressFromInput } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'

src/commands/provenance/provenanceHistory.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { printProvenanceEvents } from '../../utils/utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'

src/commands/provenance/provenanceInspect.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { printProvenanceEntry } from '../../utils/utils'

src/commands/provenance/registerProvenance.ts

@@ -1,4 +1,4 @@
-import { Account, generateId, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, generateId, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { Logger } from 'log4js'

src/commands/utils/cleanArtifacts.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ARTIFACTS_PATH } from '../../utils/config'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { Logger } from 'log4js'

src/commands/utils/decrypt.ts

@@ -1,10 +1,10 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import fs from 'fs'
 import { Logger } from 'log4js'
 import { StatusCodes } from '../../utils'
 import { ConfigEntry } from '../../models/ConfigDefinition'
-import { aes_decryption_256 } from '@nevermined-io/nevermined-sdk-dtp/dist/utils'
+import { aes_decryption_256 } from '@nevermined-io/sdk-dtp'
 import chalk from 'chalk'
 
 export const decryptFile = async (

src/commands/utils/downloadArtifacts.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ARTIFACTS_PATH, ARTIFACTS_REPOSITORY } from '../../utils/config'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { Logger } from 'log4js'

src/commands/utils/encrypt.ts

@@ -1,10 +1,10 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import fs from 'fs'
 import { Logger } from 'log4js'
 import { StatusCodes } from '../../utils'
 import { ConfigEntry } from '../../models/ConfigDefinition'
-import { aes_encryption_256 } from '@nevermined-io/nevermined-sdk-dtp/dist/utils'
+import { aes_encryption_256 } from '@nevermined-io/sdk-dtp'
 import chalk from 'chalk'
 import crypto from 'crypto'
 

src/commands/utils/getNftMetadata.ts

@@ -1,4 +1,4 @@
-import { Account, didZeroX, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, didZeroX, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes, getNFTAddressFromInput } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import IpfsHelper from '../../utils/IpfsHelper'

src/commands/utils/publishNftMetadata.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined } from '@nevermined-io/sdk'
 import { StatusCodes } from '../../utils'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { NFTMetadata } from '../../models/NFTMetadata'

src/commands/utils/upload.ts

@@ -1,4 +1,4 @@
-import { Account, Nevermined, NodeUploadBackends } from '@nevermined-io/nevermined-sdk-js'
+import { Account, Nevermined, NodeUploadBackends } from '@nevermined-io/sdk'
 import fs from 'fs'
 import { ExecutionOutput } from '../../models/ExecutionOutput'
 import { StatusCodes } from '../../utils'

src/models/ConfigDefinition.ts

@@ -1,4 +1,4 @@
-import { NeverminedOptions } from '@nevermined-io/nevermined-sdk-js'
+import { NeverminedOptions } from '@nevermined-io/sdk'
 import { Signer } from 'ethers'
 
 export interface CliConfig {

src/utils/config.ts

@@ -10,7 +10,7 @@ import { getLogger } from 'log4js'
 import { ConfigEntry, CliConfig } from '../models/ConfigDefinition'
 import path from 'path'
 import { Wallet, Signer } from 'ethers'
-import { Web3Provider } from '@nevermined-io/nevermined-sdk-js'
+import { Web3Provider } from '@nevermined-io/sdk'
 
 dotenv.config()
 

src/utils/utils.ts

@@ -13,7 +13,7 @@ import {
   ServiceType,
   Token,
   ConditionType
-} from '@nevermined-io/nevermined-sdk-js'
+} from '@nevermined-io/sdk'
 import chalk from 'chalk'
 import { Constants } from './enums'
 import { ARTIFACTS_PATH, logger } from './config'

test/helpers/Config.ts

@@ -1,4 +1,4 @@
-import { generateId } from '@nevermined-io/nevermined-sdk-js'
+import { generateId } from '@nevermined-io/sdk'
 import { ethers } from 'ethers'
 
 const NETWORK = process.env.NETWORK || 'geth-localnet'

test/integration-tests/Assets.test.ts

@@ -8,7 +8,7 @@ import {
 import * as fs from 'fs'
 import { mkdtempSync } from 'fs'
 import * as Path from 'path'
-import { generateId } from '@nevermined-io/nevermined-sdk-js'
+import { generateId } from '@nevermined-io/sdk'
 import execCommand from '../helpers/ExecCommand'
 
 describe('Assets e2e Testing', () => {

test/integration-tests/NFTs721.test.ts

@@ -8,7 +8,7 @@ import {
 import * as fs from 'fs'
 import * as Path from 'path'
 import execCommand from '../helpers/ExecCommand'
-import { didZeroX } from '@nevermined-io/nevermined-sdk-js'
+import { didZeroX } from '@nevermined-io/sdk'
 
 describe('NFTs (ERC-721) e2e Testing', () => {
   const abiPath = 'test/resources/nfts/TestNFT721.json'

test/integration-tests/Provenance.test.ts

@@ -1,4 +1,4 @@
-import { generateId } from '@nevermined-io/nevermined-sdk-js'
+import { generateId } from '@nevermined-io/sdk'
 import { execOpts, metadataConfig, baseCommands } from '../helpers/Config'
 import {
   parseDIDFromNewAsset,