diff --git a/package.json b/package.json index feaec0a..8c5f668 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nevermined-io/cli", - "version": "1.0.0-rc0", + "version": "1.0.0", "main": "index.js", "repository": "git@github.com: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", diff --git a/src/cli.ts b/src/cli.ts index a59fd7a..73219d5 100644 --- a/src/cli.ts +++ b/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 diff --git a/src/commands/accounts/fund.ts b/src/commands/accounts/fund.ts index 88132f9..767ae39 100644 --- a/src/commands/accounts/fund.ts +++ b/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' diff --git a/src/commands/accounts/list.ts b/src/commands/accounts/list.ts index 7ad94f6..cc0e45a 100644 --- a/src/commands/accounts/list.ts +++ b/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 { diff --git a/src/commands/accounts/new.ts b/src/commands/accounts/new.ts index 9cc6259..774c5cb 100644 --- a/src/commands/accounts/new.ts +++ b/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' diff --git a/src/commands/agreements/listAgreements.ts b/src/commands/agreements/listAgreements.ts index 0c85767..db3b547 100644 --- a/src/commands/agreements/listAgreements.ts +++ b/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' diff --git a/src/commands/agreements/showAgreement.ts b/src/commands/agreements/showAgreement.ts index 87f9445..cb29d4d 100644 --- a/src/commands/agreements/showAgreement.ts +++ b/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' diff --git a/src/commands/assets/downloadAsset.ts b/src/commands/assets/downloadAsset.ts index 57701c4..b676981 100644 --- a/src/commands/assets/downloadAsset.ts +++ b/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' diff --git a/src/commands/assets/getAsset.ts b/src/commands/assets/getAsset.ts index 02d3707..e08907c 100644 --- a/src/commands/assets/getAsset.ts +++ b/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, diff --git a/src/commands/assets/orderAsset.ts b/src/commands/assets/orderAsset.ts index 7550d3d..48d7d9e 100644 --- a/src/commands/assets/orderAsset.ts +++ b/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' diff --git a/src/commands/assets/queryAsset.ts b/src/commands/assets/queryAsset.ts index 93cd1d8..0fed3e4 100644 --- a/src/commands/assets/queryAsset.ts +++ b/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' diff --git a/src/commands/assets/registerAsset.ts b/src/commands/assets/registerAsset.ts index 5fb4d47..5e81c0d 100644 --- a/src/commands/assets/registerAsset.ts +++ b/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({ diff --git a/src/commands/assets/resolveDID.ts b/src/commands/assets/resolveDID.ts index 4dbd3d4..160250f 100644 --- a/src/commands/assets/resolveDID.ts +++ b/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' diff --git a/src/commands/assets/retireDID.ts b/src/commands/assets/retireDID.ts index 5f33e2d..ca29d0b 100644 --- a/src/commands/assets/retireDID.ts +++ b/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' diff --git a/src/commands/assets/searchAsset.ts b/src/commands/assets/searchAsset.ts index cd0f15c..8bd6dfd 100644 --- a/src/commands/assets/searchAsset.ts +++ b/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' diff --git a/src/commands/network/networkGetConfig.ts b/src/commands/network/networkGetConfig.ts index 4d922e7..e1f9e86 100644 --- a/src/commands/network/networkGetConfig.ts +++ b/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' diff --git a/src/commands/network/networkList.ts b/src/commands/network/networkList.ts index 27cf11c..8da6c30 100644 --- a/src/commands/network/networkList.ts +++ b/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' diff --git a/src/commands/network/networkSetConfig.ts b/src/commands/network/networkSetConfig.ts index c3f4fa4..cb2ae98 100644 --- a/src/commands/network/networkSetConfig.ts +++ b/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' diff --git a/src/commands/network/networkStatus.ts b/src/commands/network/networkStatus.ts index 45e0211..c5f3991 100644 --- a/src/commands/network/networkStatus.ts +++ b/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' diff --git a/src/commands/nfts/accessNft.ts b/src/commands/nfts/accessNft.ts index cfd86f3..af103c9 100644 --- a/src/commands/nfts/accessNft.ts +++ b/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' diff --git a/src/commands/nfts/burnNft.ts b/src/commands/nfts/burnNft.ts index bd900b8..e74da9d 100644 --- a/src/commands/nfts/burnNft.ts +++ b/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, diff --git a/src/commands/nfts/cloneNft.ts b/src/commands/nfts/cloneNft.ts index 858cc7e..39f1825 100644 --- a/src/commands/nfts/cloneNft.ts +++ b/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' diff --git a/src/commands/nfts/createNft.ts b/src/commands/nfts/createNft.ts index 0e8e699..2a4eab9 100644 --- a/src/commands/nfts/createNft.ts +++ b/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({ diff --git a/src/commands/nfts/deployNft.ts b/src/commands/nfts/deployNft.ts index 0d7dda9..626b9e5 100644 --- a/src/commands/nfts/deployNft.ts +++ b/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 { diff --git a/src/commands/nfts/downloadNft.ts b/src/commands/nfts/downloadNft.ts index 344e402..ad3356e 100644 --- a/src/commands/nfts/downloadNft.ts +++ b/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' diff --git a/src/commands/nfts/holdNft.ts b/src/commands/nfts/holdNft.ts index 6aff1bc..701acd8 100644 --- a/src/commands/nfts/holdNft.ts +++ b/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' diff --git a/src/commands/nfts/mintNft.ts b/src/commands/nfts/mintNft.ts index e078dc3..1fea009 100644 --- a/src/commands/nfts/mintNft.ts +++ b/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, diff --git a/src/commands/nfts/orderNft.ts b/src/commands/nfts/orderNft.ts index 61813bb..a0ce03d 100644 --- a/src/commands/nfts/orderNft.ts +++ b/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' diff --git a/src/commands/nfts/showNft.ts b/src/commands/nfts/showNft.ts index af8cee8..04bca0e 100644 --- a/src/commands/nfts/showNft.ts +++ b/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, diff --git a/src/commands/nfts/transferNft.ts b/src/commands/nfts/transferNft.ts index ecc7e0f..2c135e6 100644 --- a/src/commands/nfts/transferNft.ts +++ b/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' diff --git a/src/commands/provenance/provenanceHistory.ts b/src/commands/provenance/provenanceHistory.ts index f2f32b1..e76dc4e 100644 --- a/src/commands/provenance/provenanceHistory.ts +++ b/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' diff --git a/src/commands/provenance/provenanceInspect.ts b/src/commands/provenance/provenanceInspect.ts index 648f37d..5c59e8b 100644 --- a/src/commands/provenance/provenanceInspect.ts +++ b/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' diff --git a/src/commands/provenance/registerProvenance.ts b/src/commands/provenance/registerProvenance.ts index 7db1edf..7d0516c 100644 --- a/src/commands/provenance/registerProvenance.ts +++ b/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' diff --git a/src/commands/utils/cleanArtifacts.ts b/src/commands/utils/cleanArtifacts.ts index 698b8f8..3da49e2 100644 --- a/src/commands/utils/cleanArtifacts.ts +++ b/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' diff --git a/src/commands/utils/decrypt.ts b/src/commands/utils/decrypt.ts index ae3ba03..ec0f5f5 100644 --- a/src/commands/utils/decrypt.ts +++ b/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 ( diff --git a/src/commands/utils/downloadArtifacts.ts b/src/commands/utils/downloadArtifacts.ts index 3029c85..5df644d 100644 --- a/src/commands/utils/downloadArtifacts.ts +++ b/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' diff --git a/src/commands/utils/encrypt.ts b/src/commands/utils/encrypt.ts index a7400a8..c1ea668 100644 --- a/src/commands/utils/encrypt.ts +++ b/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' diff --git a/src/commands/utils/getNftMetadata.ts b/src/commands/utils/getNftMetadata.ts index d80e338..32e0110 100644 --- a/src/commands/utils/getNftMetadata.ts +++ b/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' diff --git a/src/commands/utils/publishNftMetadata.ts b/src/commands/utils/publishNftMetadata.ts index 79b89d3..da0da9a 100644 --- a/src/commands/utils/publishNftMetadata.ts +++ b/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' diff --git a/src/commands/utils/upload.ts b/src/commands/utils/upload.ts index dbecb94..3fa7d2c 100644 --- a/src/commands/utils/upload.ts +++ b/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' diff --git a/src/models/ConfigDefinition.ts b/src/models/ConfigDefinition.ts index 5efdf63..4eaf2af 100644 --- a/src/models/ConfigDefinition.ts +++ b/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 { diff --git a/src/utils/config.ts b/src/utils/config.ts index 8ca3223..cd7f340 100644 --- a/src/utils/config.ts +++ b/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() diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 66d0540..eea8ebd 100644 --- a/src/utils/utils.ts +++ b/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' diff --git a/test/helpers/Config.ts b/test/helpers/Config.ts index 8e36b05..bbf3ecd 100644 --- a/test/helpers/Config.ts +++ b/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' diff --git a/test/integration-tests/Assets.test.ts b/test/integration-tests/Assets.test.ts index d9b70d5..8dac29b 100644 --- a/test/integration-tests/Assets.test.ts +++ b/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', () => { diff --git a/test/integration-tests/NFTs721.test.ts b/test/integration-tests/NFTs721.test.ts index 79ac6de..23a1329 100644 --- a/test/integration-tests/NFTs721.test.ts +++ b/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' diff --git a/test/integration-tests/Provenance.test.ts b/test/integration-tests/Provenance.test.ts index a5db3ba..d03c630 100644 --- a/test/integration-tests/Provenance.test.ts +++ b/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,