@oceanprotocol/lib 1.0.0-next.34 → 1.0.0-next.37

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

@@ -1,5 +1,5 @@
 import { Metadata, MetadataAlgorithm } from './DDO/Metadata';
-export declare type ComputeResultType = 'algorithmLog' | 'output';
+export declare type ComputeResultType = 'algorithmLog' | 'output' | 'configrationLog' | 'publishLog';
 export interface ComputeEnvironment {
     id: string;
     cpuNumber: number;

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

@@ -1,6 +1,5 @@
 import Web3 from 'web3';
 import { FileMetadata, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize } from '../@types/';
-import { DownloadResponse } from '../@types/DownloadResponse';
 export interface HttpCallback {
     (httpMethod: string, url: string, body: string, header: any): Promise<any>;
 }
@@ -25,7 +24,7 @@ export declare class Provider {
      * @return {Promise<ServiceEndpoint[]>}
      */
     getServiceEndpoints(providerEndpoint: string, endpoints: any): Promise<ServiceEndpoint[]>;
-    /** Encrypt DDO using the Provider's own symmetric key
+    /** Gets current nonce
      * @param {string} providerUri provider uri address
      * @param {string} consumerAddress Publisher address
      * @param {AbortSignal} signal abort signal
@@ -34,7 +33,7 @@ export declare class Provider {
      * @return {Promise<string>} urlDetails
      */
     getNonce(providerUri: string, consumerAddress: string, signal?: AbortSignal, providerEndpoints?: any, serviceEndpoints?: ServiceEndpoint[]): Promise<string>;
-    signProviderRequest(web3: Web3, accountId: string, message: string): Promise<string>;
+    signProviderRequest(web3: Web3, accountId: string, message: string, password?: string): Promise<string>;
     /** Encrypt data using the Provider's own symmetric key
      * @param {string} data data in json format that needs to be sent , it can either be a DDO or a File array
      * @param {string} providerUri provider uri address
@@ -114,16 +113,15 @@ export declare class Provider {
      * @return {Promise<ComputeJob | ComputeJob[]>}
      */
     computeStatus(providerUri: string, consumerAddress: string, jobId?: string, did?: string, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
-    /** Get status for a specific jobId/documentId/owner.
-     * @param {string} jobId
-     * @param {number} index
-     * @param {string} providerUri
-     * @param {string} destination
-     * @param {Web3} web3
-     * @param {AbortSignal} signal abort signal
-     * @return {Promise<ComputeJob | ComputeJob[]>}
+    /** Get compute result url
+     * @param {string} providerUri The URI of the provider we want to query
+     * @param {Web3} web3 Web3 instance
+     * @param {string} consumerAddress The consumer ethereum address
+     * @param {string} jobId The ID of a compute job.
+     * @param {number} index Result index
+     * @return {Promise<string>}
      */
-    computeResult(jobId: string, index: number, accountId: string, providerUri: string, web3: Web3, signal?: AbortSignal): Promise<DownloadResponse | void>;
+    getComputeResultUrl(providerUri: string, web3: Web3, consumerAddress: string, jobId: string, index: number): Promise<string>;
     /** Deletes a compute job.
      * @param {string} did
      * @param {string} consumerAddress

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

@@ -261,6 +261,25 @@ export declare class Datatoken {
      * @return {Promise<TransactionReceipt>} string
      */
     startOrder(dtAddress: string, address: string, consumer: string, serviceIndex: number, providerFees: ProviderFees, consumeMarketFee?: ConsumeMarketFee): Promise<TransactionReceipt>;
+    /** Estimate gas cost for reuseOrder method
+     * @param {String} dtAddress Datatoken address
+     * @param {String} address User address which calls
+     * @param {String} orderTxId previous valid order
+     * @param {providerFees} providerFees provider fees
+     * @param {Contract} contractInstance optional contract instance
+     * @return {Promise<any>}
+     */
+    estGasReuseOrder(dtAddress: string, address: string, orderTxId: string, providerFees: ProviderFees, contractInstance?: Contract): Promise<any>;
+    /** Reuse Order: called by payer or consumer having a valid order, but with expired provider access.
+     * Pays the provider fee again, but it will not require a new datatoken payment
+     * Requires previous approval of provider fee.
+     * @param {String} dtAddress Datatoken address
+     * @param {String} address User address which calls
+     * @param {String} orderTxId previous valid order
+     * @param {providerFees} providerFees provider fees
+     * @return {Promise<TransactionReceipt>} string
+     */
+    reuseOrder(dtAddress: string, address: string, orderTxId: string, providerFees: ProviderFees): Promise<TransactionReceipt>;
     /** Estimate gas cost for buyFromFreAndOrder method
      * @param {String} dtAddress Datatoken address
      * @param {String} address User address which calls

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.34",
+  "version": "1.0.0-next.37",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -40,6 +40,7 @@
     "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
     "test:integration": "npm run mocha -- 'test/integration/**/*.test.ts'",
     "test:provider": "npm run mocha -- 'test/integration/Provider.test.ts'",
+    "test:compute": "npm run mocha -- 'test/integration/ComputeFlow.test.ts'",
     "test:integration:cover": "nyc --report-dir coverage/integration --no-clean npm run test:integration"
   },
   "repository": {
@@ -72,7 +73,7 @@
     "@types/chai-spies": "^1.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.23",
+    "@types/node": "^17.0.25",
     "@types/node-fetch": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",