@oceanprotocol/lib 1.0.0-next.7 → 1.0.0-next.8

package/dist/src/@types/DownloadResponse.d.ts

@@ -0,0 +1,4 @@
+export interface DownloadResponse {
+    data: ArrayBuffer;
+    filename: string;
+}

package/dist/src/aquarius/Aquarius.d.ts

@@ -2,9 +2,9 @@ import { Asset, DDO, ValidateMetadata } from '../@types/';
 export declare class Aquarius {
     aquariusURL: any;
     constructor(aquariusURL: string);
-    resolve(did: string, fetchMethod?: any): Promise<DDO>;
+    resolve(did: string, signal?: AbortSignal): Promise<Asset>;
     sleep(ms: number): Promise<unknown>;
-    waitForAqua(did: string, txid?: string, fetchMethod?: any): Promise<Asset>;
-    validate(ddo: DDO, fetchMethod: any): Promise<ValidateMetadata>;
+    waitForAqua(did: string, txid?: string, signal?: AbortSignal): Promise<Asset>;
+    validate(ddo: DDO, signal?: AbortSignal): Promise<ValidateMetadata>;
 }
 export default Aquarius;

package/dist/src/interfaces/Erc721Interface.d.ts

@@ -0,0 +1,12 @@
+import { MetadataProof } from '../@types';
+export interface MetadataAndTokenURI {
+    metaDataState: number;
+    metaDataDecryptorUrl: string;
+    metaDataDecryptorAddress: string;
+    flags: string;
+    data: string;
+    metaDataHash: string;
+    tokenId: number;
+    tokenURI: string;
+    metadataProofs: MetadataProof[];
+}

package/dist/src/pools/balancer/Pool.d.ts

@@ -12,9 +12,6 @@ export declare class Pool {
     private logger;
     private config;
     constructor(web3: Web3, logger: Logger, poolAbi?: AbiItem | AbiItem[], config?: Config);
-    estApprove(account: string, tokenAddress: string, spender: string, amount: string, contractInstance?: Contract): Promise<number>;
-    allowance(tokenAddress: string, owner: string, spender: string): Promise<string>;
-    approve(account: string, tokenAddress: string, spender: string, amount: string, force?: boolean): Promise<TransactionReceipt | string>;
     sharesBalance(account: string, poolAddress: string): Promise<string>;
     estSetSwapFee(account: string, poolAddress: string, fee: string, contractInstance?: Contract): Promise<number>;
     setSwapFee(account: string, poolAddress: string, fee: string): Promise<TransactionReceipt>;
@@ -44,8 +41,6 @@ export declare class Pool {
     collectMarketFee(address: string, poolAddress: string): Promise<TransactionReceipt>;
     estUpdateMarketFeeCollector(address: string, poolAddress: string, newCollector: string, contractInstance?: Contract): Promise<number>;
     updateMarketFeeCollector(address: string, poolAddress: string, newCollector: string): Promise<TransactionReceipt>;
-    amountToUnits(token: string, amount: string): Promise<string>;
-    unitsToAmount(token: string, amount: string): Promise<string>;
     estSwapExactAmountIn(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsInMaxFee, contractInstance?: Contract): Promise<number>;
     swapExactAmountIn(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsInMaxFee): Promise<TransactionReceipt>;
     estSwapExactAmountOut(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsOutMaxFee, contractInstance?: Contract): Promise<number>;

package/dist/src/provider/Provider.d.ts

@@ -1,5 +1,9 @@
 import Web3 from 'web3';
 import { FileMetadata, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ProviderInitialize } from '../@types/';
+import { DownloadResponse } from '../@types/DownloadResponse';
+export interface HttpCallback {
+    (httpMethod: string, url: string, body: string, header: any): Promise<any>;
+}
 export interface ServiceEndpoint {
     serviceName: string;
     method: string;
@@ -12,20 +16,20 @@ export declare class Provider {
     getEndpoints(providerUri: string): Promise<any>;
     getEndpointURL(servicesEndpoints: ServiceEndpoint[], serviceName: string): ServiceEndpoint;
     getServiceEndpoints(providerEndpoint: string, endpoints: any): Promise<ServiceEndpoint[]>;
-    getNonce(providerUri: string, consumerAddress: string, fetchMethod?: any, providerEndpoints?: any, serviceEndpoints?: ServiceEndpoint[]): Promise<string>;
+    getNonce(providerUri: string, consumerAddress: string, signal?: AbortSignal, providerEndpoints?: any, serviceEndpoints?: ServiceEndpoint[]): Promise<string>;
     createSignature(web3: Web3, accountId: string, agreementId: string): Promise<string>;
     createHashSignature(web3: Web3, accountId: string, message: string): Promise<string>;
-    encrypt(data: any, providerUri: string, postMethod?: any): Promise<any>;
-    checkDidFiles(did: string, serviceId: number, providerUri: string, fetchMethod?: any): Promise<FileMetadata[]>;
-    checkFileUrl(url: string, providerUri: string, fetchMethod?: any): Promise<FileMetadata[]>;
-    initialize(did: string, serviceId: string, fileIndex: number, consumerAddress: string, providerUri: string, fetchMethod?: any, userCustomParameters?: UserCustomParameters, computeEnv?: string, validUntil?: number): Promise<ProviderInitialize>;
+    encrypt(data: any, providerUri: string, signal?: AbortSignal): Promise<string>;
+    checkDidFiles(did: string, serviceId: number, providerUri: string, signal?: AbortSignal): Promise<FileMetadata[]>;
+    checkFileUrl(url: string, providerUri: string, signal?: AbortSignal): Promise<FileMetadata[]>;
+    initialize(did: string, serviceId: string, fileIndex: number, consumerAddress: string, providerUri: string, signal?: AbortSignal, userCustomParameters?: UserCustomParameters, computeEnv?: string, validUntil?: number): Promise<ProviderInitialize>;
     getDownloadUrl(did: string, accountId: string, serviceId: string, fileIndex: number, transferTxId: string, providerUri: string, web3: Web3, userCustomParameters?: UserCustomParameters): Promise<any>;
-    computeStart(providerUri: string, web3: Web3, consumerAddress: string, computeEnv: string, dataset: ComputeAsset, algorithm: ComputeAlgorithm, fetchMethod?: any, additionalDatasets?: ComputeAsset[], output?: ComputeOutput): Promise<ComputeJob | ComputeJob[]>;
-    computeStop(did: string, consumerAddress: string, jobId: string, providerUri: string, web3: Web3, fetchMethod?: any): Promise<ComputeJob | ComputeJob[]>;
-    computeStatus(providerUri: string, fetchMethod?: any, jobId?: string, did?: string, consumerAddress?: string): Promise<ComputeJob | ComputeJob[]>;
-    computeResult(jobId: string, index: number, destination: string, accountId: string, providerUri: string, web3: Web3, fetchMethod: any): Promise<any>;
-    computeDelete(did: string, consumerAddress: string, jobId: string, providerUri: string, web3: Web3, fetchMethod?: any): Promise<ComputeJob | ComputeJob[]>;
-    isValidProvider(url: string, fetchMethod?: any): Promise<boolean>;
+    computeStart(providerUri: string, web3: Web3, consumerAddress: string, computeEnv: string, dataset: ComputeAsset, algorithm: ComputeAlgorithm, signal?: AbortSignal, additionalDatasets?: ComputeAsset[], output?: ComputeOutput): Promise<ComputeJob | ComputeJob[]>;
+    computeStop(did: string, consumerAddress: string, jobId: string, providerUri: string, web3: Web3, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
+    computeStatus(providerUri: string, signal?: AbortSignal, jobId?: string, did?: string, consumerAddress?: string): Promise<ComputeJob | ComputeJob[]>;
+    computeResult(jobId: string, index: number, accountId: string, providerUri: string, web3: Web3, signal?: AbortSignal): Promise<DownloadResponse | void>;
+    computeDelete(did: string, consumerAddress: string, jobId: string, providerUri: string, web3: Web3, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
+    isValidProvider(url: string, signal?: AbortSignal): Promise<boolean>;
 }
 export declare const ProviderInstance: Provider;
 export default ProviderInstance;

package/dist/src/tokens/NFT.d.ts

@@ -4,6 +4,7 @@ import { TransactionReceipt } from 'web3-eth';
 import { Contract } from 'web3-eth-contract';
 import { MetadataProof } from '../../src/@types';
 import { Config } from '../models/index.js';
+import { MetadataAndTokenURI } from '../interfaces/Erc721Interface';
 interface Roles {
     manager: boolean;
     deployERC20: boolean;
@@ -43,8 +44,10 @@ export declare class Nft {
     transferNft(nftAddress: string, nftOwner: string, nftReceiver: string, tokenId?: number): Promise<TransactionReceipt>;
     estGasSafeTransferNft(nftAddress: string, nftOwner: string, nftReceiver: string, tokenId: number, contractInstance?: Contract): Promise<any>;
     safeTransferNft(nftAddress: string, nftOwner: string, nftReceiver: string, tokenId?: number): Promise<TransactionReceipt>;
-    estGasSetMetadata(nftAddress: string, metadataUpdater: string, metadataState: number, metaDataDecryptorUrl: string, metaDataDecryptorAddress: string, flags: string, data: string, metadataHash: string, metadataProofs?: MetadataProof[], contractInstance?: Contract): Promise<any>;
-    setMetadata(nftAddress: string, address: string, metadataState: number, metaDataDecryptorUrl: string, metaDataDecryptorAddress: string, flags: string, data: string, metadataHash: string, metadataProofs?: MetadataProof[]): Promise<TransactionReceipt>;
+    estGasSetMetadata(nftAddress: string, metadataUpdater: string, metadataState: number, metadataDecryptorUrl: string, metadataDecryptorAddress: string, flags: string, data: string, metadataHash: string, metadataProofs?: MetadataProof[], contractInstance?: Contract): Promise<any>;
+    setMetadata(nftAddress: string, address: string, metadataState: number, metadataDecryptorUrl: string, metadataDecryptorAddress: string, flags: string, data: string, metadataHash: string, metadataProofs?: MetadataProof[]): Promise<TransactionReceipt>;
+    estGasSetMetadataAndTokenURI(nftAddress: string, metadataUpdater: string, metadataAndTokenURI: MetadataAndTokenURI, contractInstance?: Contract): Promise<any>;
+    setMetadataAndTokenURI(nftAddress: string, metadataUpdater: string, metadataAndTokenURI: MetadataAndTokenURI): Promise<TransactionReceipt>;
     estGasSetMetadataState(nftAddress: string, metadataUpdater: string, metadataState: number, contractInstance?: Contract): Promise<any>;
     setMetadataState(nftAddress: string, address: string, metadataState: number): Promise<TransactionReceipt>;
     estSetTokenURI(nftAddress: string, address: string, data: string): Promise<any>;

package/dist/src/utils/ConfigHelper.d.ts

@@ -1,6 +1,6 @@
 import Config from '../models/Config';
 export declare const configHelperNetworks: Config[];
 export declare class ConfigHelper {
-    getAddressesFromEnv(network: string): Partial<Config>;
+    getAddressesFromEnv(network: string, customAddresses?: any): Partial<Config>;
     getConfig(network: string | number, infuraProjectId?: string): Config;
 }

package/dist/src/utils/Constants.d.ts

@@ -1 +1,2 @@
 export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+export declare const GASLIMIT_DEFAULT = 1000000;

package/dist/src/utils/ContractUtils.d.ts

@@ -7,3 +7,5 @@ export declare function getFairGasPrice(web3: Web3, config: Config): Promise<str
 export declare function getErcCreationParams(ercParams: Erc20CreateParams): any;
 export declare function getFreCreationParams(freParams: FreCreationParams): any;
 export declare function getPoolCreationParams(poolParams: PoolCreationParams): any;
+export declare function unitsToAmount(web3: Web3, token: string, amount: string): Promise<string>;
+export declare function amountToUnits(web3: Web3, token: string, amount: string): Promise<string>;

package/dist/src/utils/FetchHelper.d.ts

@@ -1,5 +1,6 @@
+import { DownloadResponse } from '../@types/DownloadResponse';
 export declare function fetchData(url: string, opts: RequestInit): Promise<Response>;
-export declare function downloadFile(url: string, destination?: string, index?: number): Promise<string>;
+export declare function downloadFileBrowser(url: string): Promise<void>;
+export declare function downloadFile(url: string, index?: number): Promise<DownloadResponse>;
 export declare function getData(url: string): Promise<Response>;
 export declare function postData(url: string, payload: BodyInit): Promise<Response>;
-export declare function crossFetchGeneric(method: string, url: string, body: string, headers: any): Promise<Response>;

package/dist/src/utils/TokenUtils.d.ts

@@ -0,0 +1,7 @@
+import { Contract } from 'web3-eth-contract';
+import { TransactionReceipt } from 'web3-core';
+import Web3 from 'web3';
+export declare function estApprove(web3: Web3, account: string, tokenAddress: string, spender: string, amount: string, contractInstance?: Contract): Promise<number>;
+export declare function approve(web3: Web3, account: string, tokenAddress: string, spender: string, amount: string, force?: boolean): Promise<TransactionReceipt | string>;
+export declare function allowance(web3: Web3, tokenAddress: string, account: string, spender: string): Promise<string>;
+export declare function balance(web3: Web3, tokenAddress: string, account: string): Promise<string>;

package/dist/src/utils/index.d.ts

@@ -6,3 +6,4 @@ export * from './ConfigHelper';
 export * from './DdoHelpers';
 export * from './Constants';
 export * from './SignatureUtils';
+export * from './TokenUtils';

package/dist/src/utils/minAbi.d.ts

@@ -0,0 +1,2 @@
+import { AbiItem } from 'web3-utils/types';
+export declare const minAbi: AbiItem[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.7",
+  "version": "1.0.0-next.8",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -32,7 +32,7 @@
     "test:pool": "npm run mocha -- 'test/unit/pools/balancer/Pool.test.ts'",
     "test:dispenser": "npm run mocha -- 'test/unit/pools/dispenser/Dispenser.test.ts'",
     "test:dt": "npm run mocha -- 'test/unit/tokens/Datatoken.test.ts'",
-    "test:nftDt": "npm run mocha -- 'test/unit/Nft.test.ts'",
+    "test:nftDt": "npm run mocha -- 'test/unit/tokens/Nft.test.ts'",
     "test:factory": "npm run mocha -- 'test/unit/NftFactory.test.ts'",
     "test:router": "npm run mocha -- 'test/unit/pools/Router.test.ts'",
     "test:publishAll": "npm run mocha -- 'test/integration/PublishFlows.test.ts'",
@@ -62,8 +62,6 @@
     "cross-fetch": "^3.1.4",
     "crypto-js": "^4.0.0",
     "decimal.js": "^10.2.1",
-    "fs": "0.0.1-security",
-    "save-file": "^2.3.1",
     "web3": ">=1.3.5",
     "web3-core": "^1.6.1",
     "web3-eth-contract": "^1.6.1"
@@ -83,6 +81,7 @@
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.17.0",
+    "fs": "0.0.1-security",
     "eslint-config-oceanprotocol": "^1.5.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",