@oceanprotocol/lib 1.0.0 → 1.1.0

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

@@ -0,0 +1,23 @@
+export interface UrlFile {
+    type: 'url';
+    /**
+     * File index.
+     * @type {number}
+     */
+    index?: number;
+    /**
+     * File URL.
+     * @type {string}
+     */
+    url: string;
+    /**
+     * HTTP method used
+     * @type {string}
+     */
+    method: string;
+}
+export interface Files {
+    nftAddress: string;
+    datatokenAddress: string;
+    files: UrlFile[];
+}

package/dist/src/@types/{FileMetadata.d.ts → FileInfo.d.ts}

@@ -1,4 +1,4 @@
-export interface FileMetadata {
+export interface FileInfo {
     /**
      * File URL.
      * @type {string}

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

@@ -3,7 +3,8 @@ export * from './Asset';
 export * from './DDO/Service';
 export * from './DDO/Credentials';
 export * from './DDO/Metadata';
-export * from './FileMetadata';
+export * from './File';
+export * from './FileInfo';
 export * from './Compute';
 export * from './Provider';
 export * from './FixedPrice';

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

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { FileMetadata, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults } from '../@types/';
+import { FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults } from '../@types/';
 export interface HttpCallback {
     (httpMethod: string, url: string, body: string, header: any): Promise<any>;
 }
@@ -46,16 +46,16 @@ export declare class Provider {
      * @param {number} serviceId the id of the service for which to check the files
      * @param {string} providerUri uri of the provider that will be used to check the file
      * @param {AbortSignal} signal abort signal
-     * @return {Promise<FileMetadata[]>} urlDetails
+     * @return {Promise<FileInfo[]>} urlDetails
      */
-    checkDidFiles(did: string, serviceId: number, providerUri: string, signal?: AbortSignal): Promise<FileMetadata[]>;
+    checkDidFiles(did: string, serviceId: number, providerUri: string, signal?: AbortSignal): Promise<FileInfo[]>;
     /** Get URL details (if possible)
      * @param {string} url or did
      * @param {string} providerUri uri of the provider that will be used to check the file
      * @param {AbortSignal} signal abort signal
-     * @return {Promise<FileMetadata[]>} urlDetails
+     * @return {Promise<FileInfo[]>} urlDetails
      */
-    checkFileUrl(url: string, providerUri: string, signal?: AbortSignal): Promise<FileMetadata[]>;
+    checkFileUrl(url: string, providerUri: string, signal?: AbortSignal): Promise<FileInfo[]>;
     /** Get Compute Environments
      * @return {Promise<ComputeEnvironment[]>} urlDetails
      */

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

@@ -22,6 +22,15 @@ export declare function estApprove(web3: Web3, account: string, tokenAddress: st
  * @param {number} tokenDecimals optional number of decimals of the token
  */
 export declare function approve(web3: Web3, account: string, tokenAddress: string, spender: string, amount: string, force?: boolean, tokenDecimals?: number): Promise<TransactionReceipt | string>;
+/**
+ * Approve spender to spent amount tokens
+ * @param {String} account
+ * @param {String} tokenAddress
+ * @param {String} spender
+ * @param {String} amount amount of ERC20 tokens (always expressed as wei)
+ * @param {boolean} force  if true, will overwrite any previous allowence. Else, will check if allowence is enough and will not send a transaction if it's not needed
+ */
+export declare function approveWei(web3: Web3, account: string, tokenAddress: string, spender: string, amount: string, force?: boolean): Promise<TransactionReceipt | string>;
 /**
  * Estimate gas cost for transfer function
  * @param {String} account
@@ -51,6 +60,14 @@ export declare function transfer(web3: Web3, account: string, tokenAddress: stri
  * @param {number} tokenDecimals optional number of decimals of the token
  */
 export declare function allowance(web3: Web3, tokenAddress: string, account: string, spender: string, tokenDecimals?: number): Promise<string>;
+/**
+ * Get Allowance for any erc20
+ * @param {Web3} web3
+ * @param {String } tokenAdress
+ * @param {String} account
+ * @param {String} spender
+ */
+export declare function allowanceWei(web3: Web3, tokenAddress: string, account: string, spender: string, tokenDecimals?: number): Promise<string>;
 /**
  * Get balance for any erc20
  * @param {Web3} web3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -39,10 +39,10 @@
     "test:examples": "npm run mocha -- 'test/integration/CodeExamples.test.ts'",
     "test:provider": "npm run mocha -- 'test/integration/Provider.test.ts'",
     "test:unit": "npm run mocha -- 'test/unit/**/*.test.ts'",
-    "test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
+    "test:unit:cover": "nyc --report-dir coverage/unit --exclude 'src/@types/**/*' npm run test:unit",
     "test:integration": "npm run mocha -- 'test/integration/**/*.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",
+    "test:integration:cover": "nyc --report-dir coverage/integration --exclude 'src/@types/**/*' --no-clean npm run test:integration",
     "create:guide": "chmod +x ./scripts/createCodeExamples.sh && ./scripts/createCodeExamples.sh",
     "create:guide:mac": "chmod +x ./scripts/createCodeExamples-mac.sh && ./scripts/createCodeExamples-mac.sh",
     "commit:guide": "chmod +x scripts/commitChanges.sh && scripts/commitChanges.sh"
@@ -77,16 +77,16 @@
     "@types/chai-spies": "^1.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.35",
+    "@types/node": "^17.0.44",
     "@types/node-fetch": "^3.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.28.0",
+    "@typescript-eslint/parser": "^5.28.0",
     "auto-changelog": "^2.4.0",
     "chai": "^4.3.6",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.17.0",
-    "eslint-config-oceanprotocol": "^1.5.0",
+    "eslint": "^8.17.0",
+    "eslint-config-oceanprotocol": "^2.0.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "fs": "0.0.1-security",