@oceanprotocol/lib 0.19.3 → 0.20.0

package/dist/node/metadatacache/OnChainMetaData.d.ts

@@ -4,6 +4,7 @@ import { Contract } from 'web3-eth-contract';
 import { AbiItem } from 'web3-utils/types';
 import Web3 from 'web3';
 import { Logger } from '../utils';
+import { ConfigHelperConfig } from '../utils/ConfigHelper';
 import { MetadataCache } from '../metadatacache/MetadataCache';
 export interface rawMetadata {
     flags: number;
@@ -17,7 +18,8 @@ export declare class OnChainMetadata {
     DDOContract: Contract;
     private logger;
     metadataCache: MetadataCache;
-    constructor(web3: Web3, logger: Logger, DDOContractAddress: string, DDOContractABI: AbiItem | AbiItem[], metadataCache: MetadataCache);
+    private config;
+    constructor(web3: Web3, logger: Logger, DDOContractAddress: string, DDOContractABI: AbiItem | AbiItem[], metadataCache: MetadataCache, config?: ConfigHelperConfig);
     compressDDO(data: any): Promise<string>;
     publish(did: string, ddo: DDO, consumerAccount: string, encrypt?: boolean, validate?: boolean): Promise<TransactionReceipt>;
     update(did: string, ddo: DDO, consumerAccount: string, encrypt?: boolean, validate?: boolean): Promise<TransactionReceipt>;

package/dist/node/ocean/Compute.d.ts

@@ -47,8 +47,8 @@ export declare class Compute extends Instantiable {
     start(asset: DDO | string, txId: string, tokenAddress: string, consumerAccount: Account, algorithm: ComputeAlgorithm, output?: ComputeOutput, serviceIndex?: string, serviceType?: string, additionalInputs?: ComputeInput[]): Promise<ComputeJob>;
     stop(consumerAccount: Account, asset: DDO | string, jobId: string): Promise<ComputeJob>;
     delete(consumerAccount: Account, asset: DDO | string, jobId: string): Promise<ComputeJob>;
-    status(consumerAccount: Account, did?: string, ddo?: DDO, service?: ServiceCompute, jobId?: string, txId?: string, sign?: boolean): Promise<ComputeJob[]>;
-    result(consumerAccount: Account, asset: DDO | string, jobId: string): Promise<ComputeJob>;
+    status(consumerAccount: Account, did?: string, ddo?: DDO, service?: ServiceCompute, jobId?: string, txId?: string): Promise<ComputeJob[]>;
+    getResult(consumerAccount: Account, jobId: string, index: number, destination: string, did?: string, ddo?: DDO, service?: ServiceCompute): Promise<any>;
     createServerAttributes(serverId: string, serverType: string, cost: string, cpu: string, gpu: string, memory: string, disk: string, maxExecutionTime: number): Server;
     createContainerAttributes(image: string, tag: string, checksum: string): Container;
     createClusterAttributes(type: string, url: string): Cluster;

package/dist/node/ocean/interfaces/Compute.d.ts

@@ -1,6 +1,12 @@
-import DID from '../DID';
 import { Metadata } from '../../ddo/interfaces/Metadata';
 import { MetadataAlgorithm } from '../../ddo/interfaces/MetadataAlgorithm';
+export declare type ComputeResultType = 'algorithmLog' | 'output';
+export interface ComputeResult {
+    filename: string;
+    filesize: number;
+    type: ComputeResultType;
+    index: number;
+}
 export interface ComputeJob {
     owner: string;
     did?: string;
@@ -9,12 +15,11 @@ export interface ComputeJob {
     dateFinished: string;
     status: number;
     statusText: string;
-    algorithmLogUrl: string;
-    resultsUrl: string[];
-    resultsDid?: DID;
+    results: ComputeResult[];
     inputDID?: string[];
     algoDID?: string;
     agreementId?: string;
+    expireTimestamp: number;
 }
 export interface ComputeOutput {
     publishAlgorithmLog?: boolean;

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

@@ -9,6 +9,10 @@ export interface ServiceEndpoint {
     method: string;
     urlPath: string;
 }
+export interface ComputeLimits {
+    algoTimeLimit?: string;
+    storageExpiry?: string;
+}
 export interface UserCustomParameters {
     [key: string]: any;
 }
@@ -19,6 +23,7 @@ export declare class Provider extends Instantiable {
     computeAddress: string;
     providerAddress: string;
     providerVersion: string;
+    computeLimits: ComputeLimits;
     static getInstance(config: InstantiableConfig): Promise<Provider>;
     setBaseUrl(url: string): Promise<boolean>;
     get url(): string;
@@ -35,7 +40,8 @@ export declare class Provider extends Instantiable {
     computeStart(did: string, consumerAccount: Account, algorithm: ComputeAlgorithm, output?: ComputeOutput, txId?: string, serviceIndex?: string, serviceType?: string, tokenAddress?: string, additionalInputs?: ComputeInput[], userCustomParameters?: UserCustomParameters): Promise<ComputeJob | ComputeJob[]>;
     computeStop(did: string, consumerAccount: Account, jobId: string): Promise<ComputeJob | ComputeJob[]>;
     computeDelete(did: string, consumerAccount: Account, jobId: string): Promise<ComputeJob | ComputeJob[]>;
-    computeStatus(did: string, consumerAccount: Account, jobId?: string, txId?: string, sign?: boolean): Promise<ComputeJob | ComputeJob[]>;
+    computeStatus(did: string, consumerAccount: Account, jobId?: string, txId?: string): Promise<ComputeJob | ComputeJob[]>;
+    computeResult(jobId: string, index: number, destination: string, account: Account): Promise<any>;
     getInitializeEndpoint(): ServiceEndpoint;
     getNonceEndpoint(): ServiceEndpoint;
     getEncryptEndpoint(): ServiceEndpoint;
@@ -44,6 +50,7 @@ export declare class Provider extends Instantiable {
     getComputeStopEndpoint(): ServiceEndpoint;
     getComputeStatusEndpoint(): ServiceEndpoint;
     getComputeDeleteEndpoint(): ServiceEndpoint;
+    getComputeResultEndpoint(): ServiceEndpoint;
     getDownloadEndpoint(): ServiceEndpoint;
     isValidProvider(url: string): Promise<boolean>;
 }

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

@@ -5,6 +5,10 @@ export interface ConfigHelperConfig extends Config {
     subgraphUri: string;
     explorerUri: string;
     oceanTokenSymbol: string;
+    transactionBlockTimeout: number;
+    transactionConfirmationBlocks: number;
+    transactionPollingTimeout: number;
+    gasFeeMultiplier: number;
 }
 export declare const configHelperNetworks: ConfigHelperConfig[];
 export declare class ConfigHelper {

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

@@ -0,0 +1,5 @@
+import Web3 from 'web3';
+import { Contract } from 'web3-eth-contract';
+import { ConfigHelperConfig } from './ConfigHelper';
+export declare function getFairGasPrice(web3: Web3, config: ConfigHelperConfig): Promise<string>;
+export declare function setContractDefaults(contract: Contract, config: ConfigHelperConfig): Contract;

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

@@ -4,6 +4,6 @@ export * from './ConversionTypeHelpers';
 export * from './GeneratorHelpers';
 export * from './SubscribablePromise';
 export * from './SubscribableObserver';
-export * from './GasUtils';
+export * from './ContractUtils';
 export * from './AssetResolverHelper';
 export * from './Datatokens';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "0.19.3",
+  "version": "0.20.0",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/node/lib.js",
   "exports": "./dist/node/lib.js",
@@ -55,12 +55,12 @@
     "node-abort-controller": "^2.0.0",
     "save-file": "^2.3.1",
     "uuid": "^8.3.2",
-    "web3": "^1.6.0",
+    "web3": "^1.6.1",
     "web3-core": "^1.5.3",
     "web3-eth-contract": "^1.5.2"
   },
   "devDependencies": {
-    "@truffle/hdwallet-provider": "^1.6.0",
+    "@truffle/hdwallet-provider": "^1.7.0",
     "@types/chai": "^4.2.19",
     "@types/chai-spies": "^1.0.3",
     "@types/crypto-js": "^4.0.1",
@@ -77,13 +77,13 @@
     "eslint-config-oceanprotocol": "^1.5.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "microbundle": "^0.14.1",
+    "microbundle": "^0.14.2",
     "mocha": "^9.1.3",
-    "mock-local-storage": "^1.1.17",
+    "mock-local-storage": "^1.1.18",
     "nyc": "^15.1.0",
     "ora": "5.4.1",
     "prettier": "^2.3.1",
-    "release-it": "^14.11.7",
+    "release-it": "^14.11.8",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.4.0",
     "ts-node-register": "^1.0.0",

package/dist/node/utils/GasUtils.d.ts

@@ -1,2 +0,0 @@
-import Web3 from 'web3';
-export declare function getFairGasPrice(web3: Web3): Promise<string>;