@oceanprotocol/lib 1.0.0-next.11 → 1.0.0-next.15

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

@@ -1,5 +1,22 @@
 import { Metadata, MetadataAlgorithm } from './DDO/Metadata';
 export declare type ComputeResultType = 'algorithmLog' | 'output';
+export interface ComputeEnvironment {
+    id: string;
+    cpuNumber: number;
+    cpuType: string;
+    gpuNumber: number;
+    gpuType: string;
+    ramGB: number;
+    diskGB: number;
+    priceMin: number;
+    desc: string;
+    currentJobs: number;
+    maxJobs: number;
+    consumerAddress: string;
+    storageExpiry: number;
+    maxJobDuration: number;
+    lastSeen: number;
+}
 export interface ComputeResult {
     filename: string;
     filesize: number;

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

@@ -6,7 +6,7 @@ export interface FreCreationParams {
     baseTokenDecimals: number;
     datatokenDecimals: number;
     fixedRate: string;
-    marketFee: number;
+    marketFee: string;
     withMint?: boolean;
     allowedConsumer?: string;
 }
@@ -17,3 +17,9 @@ export interface FreOrderParams {
     swapMarketFee: string;
     marketFeeAddress: string;
 }
+export interface PriceAndFees {
+    baseTokenAmount: string;
+    baseTokenAmountBeforeFee: string;
+    oceanFeeAmount: string;
+    marketFeeAmount: string;
+}

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

@@ -10,8 +10,8 @@ export interface PoolCreationParams {
     vestingAmount: string;
     vestedBlocks: number;
     initialBaseTokenLiquidity: string;
-    swapFeeLiquidityProvider: number;
-    swapFeeMarketRunner: number;
+    swapFeeLiquidityProvider: string;
+    swapFeeMarketRunner: string;
 }
 export interface CurrentFees {
     tokens: string[];

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

@@ -12,10 +12,6 @@ export declare class Aquarius {
      * @return {Promise<Asset>} Asset
      */
     resolve(did: string, signal?: AbortSignal): Promise<Asset>;
-    /**
-     * Simple blocking sleep function
-     */
-    sleep(ms: number): Promise<unknown>;
     /**
      * Blocks until Aqua will cache the did (or the update for that did) or timeouts
      

package/dist/src/factories/NFTFactory.d.ts

@@ -195,33 +195,33 @@ export declare class NftFactory {
      */
     startMultipleTokenOrder(address: string, orders: TokenOrder[]): Promise<TransactionReceipt>;
     /**
-     * Estimate gas cost for createNftWithErc method
+     * Estimate gas cost for createNftWithErc20 method
      * @param address Caller address
      * @param _NftCreateData input data for nft creation
      * @param _ErcCreateData input data for erc20 creation
      *  @return {Promise<TransactionReceipt>} transaction receipt
      */
-    estGasCreateNftWithErc(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams): Promise<any>;
+    estGasCreateNftWithErc20(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams): Promise<any>;
     /**
-     * @dev createNftWithErc
+     * @dev createNftWithErc20
      *      Creates a new NFT, then a ERC20,all in one call
      * @param address Caller address
      * @param _NftCreateData input data for nft creation
      * @param _ErcCreateData input data for erc20 creation
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    createNftWithErc(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams): Promise<TransactionReceipt>;
+    createNftWithErc20(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams): Promise<TransactionReceipt>;
     /**
-     * Estimate gas cost for createNftErcWithPool method
+     * Estimate gas cost for createNftErc20WithPool method
      * @param address Caller address
      * @param nftCreateData input data for NFT Creation
      * @param ercParams input data for ERC20 Creation
      * @param poolParams input data for Pool Creation
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    estGasCreateNftErcWithPool(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, poolParams: PoolCreationParams): Promise<any>;
+    estGasCreateNftErc20WithPool(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, poolParams: PoolCreationParams): Promise<any>;
     /**
-     * @dev createNftErcWithPool
+     * @dev createNftErc20WithPool
      *      Creates a new NFT, then a ERC20, then a Pool, all in one call
      *      Use this carefully, because if Pool creation fails, you are still going to pay a lot of gas
      * @param address Caller address
@@ -230,17 +230,17 @@ export declare class NftFactory {
      * @param poolParams input data for Pool Creation
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    createNftErcWithPool(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, poolParams: PoolCreationParams): Promise<TransactionReceipt>;
-    /** Estimate gas cost for createNftErcWithFixedRate method
+    createNftErc20WithPool(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, poolParams: PoolCreationParams): Promise<TransactionReceipt>;
+    /** Estimate gas cost for createNftErc20WithFixedRate method
      * @param address Caller address
      * @param nftCreateData input data for NFT Creation
      * @param ercParams input data for ERC20 Creation
      * @param freParams input data for FixedRate Creation
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    estGasCreateNftErcWithFixedRate(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, freParams: FreCreationParams): Promise<any>;
+    estGasCreateNftErc20WithFixedRate(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, freParams: FreCreationParams): Promise<any>;
     /**
-     * @dev createNftErcWithFixedRate
+     * @dev createNftErc20WithFixedRate
      *      Creates a new NFT, then a ERC20, then a FixedRateExchange, all in one call
      *      Use this carefully, because if Fixed Rate creation fails, you are still going to pay a lot of gas
      * @param address Caller address
@@ -249,17 +249,17 @@ export declare class NftFactory {
      * @param freParams input data for FixedRate Creation
      *  @return {Promise<TransactionReceipt>} transaction receipt
      */
-    createNftErcWithFixedRate(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, freParams: FreCreationParams): Promise<TransactionReceipt>;
-    /** Estimate gas cost for createNftErcWithFixedRate method
+    createNftErc20WithFixedRate(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, freParams: FreCreationParams): Promise<TransactionReceipt>;
+    /** Estimate gas cost for createNftErc20WithFixedRate method
      * @param address Caller address
      * @param nftCreateData input data for NFT Creation
      * @param ercParams input data for ERC20 Creation
      * @param dispenserParams input data for Dispenser Creation
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    estGasCreateNftErcWithDispenser(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, dispenserParams: DispenserCreationParams): Promise<any>;
+    estGasCreateNftErc20WithDispenser(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, dispenserParams: DispenserCreationParams): Promise<any>;
     /**
-     * @dev createNftErcWithDispenser
+     * @dev createNftErc20WithDispenser
      *      Creates a new NFT, then a ERC20, then a Dispenser, all in one call
      *      Use this carefully, because if Dispenser creation fails, you are still going to pay a lot of gas
      * @param address Caller address
@@ -268,6 +268,6 @@ export declare class NftFactory {
      * @param dispenserParams input data for Dispenser Creation
      *  @return {Promise<TransactionReceipt>} transaction receipt
      */
-    createNftErcWithDispenser(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, dispenserParams: DispenserCreationParams): Promise<TransactionReceipt>;
+    createNftErc20WithDispenser(address: string, nftCreateData: NftCreateData, ercParams: Erc20CreateParams, dispenserParams: DispenserCreationParams): Promise<TransactionReceipt>;
 }
 export {};

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

@@ -301,9 +301,9 @@ export declare class Pool {
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estJoinswapExternAmountIn(address: string, poolAddress: string, tokenIn: string, tokenAmountIn: string, minPoolAmountOut: string, contractInstance?: Contract): Promise<number>;
+    estJoinswapExternAmountIn(address: string, poolAddress: string, tokenAmountIn: string, minPoolAmountOut: string, contractInstance?: Contract): Promise<number>;
     /**
-     * Pay tokenAmountIn of token tokenIn to join the pool, getting poolAmountOut of the pool shares.
+     * Pay tokenAmountIn of baseToken to join the pool, getting poolAmountOut of the pool shares.
      * @param {String} account
      * @param {String} poolAddress
      * @param {String} tokenIn
@@ -311,41 +311,19 @@ export declare class Pool {
      * @param {String} minPoolAmountOut  will be converted to wei
      * @return {TransactionReceipt}
      */
-    joinswapExternAmountIn(account: string, poolAddress: string, tokenIn: string, tokenAmountIn: string, minPoolAmountOut: string): Promise<TransactionReceipt>;
-    /**
-     * Estimate gas cost for joinswapPoolAmountOut
-     * @param {String} address
-     * @param {String} poolAddress
-     * @param {String} tokenIn
-     * @param {String} poolAmountOut will be converted to wei
-     * @param {String} maxAmountIn  will be converted to wei
-     * @param {Contract} contractInstance optional contract instance
-     * @return {Promise<number>}
-     */
-    estJoinswapPoolAmountOut(address: string, poolAddress: string, tokenIn: string, poolAmountOut: string, maxAmountIn: string, contractInstance?: Contract): Promise<number>;
-    /**
-     * Specify poolAmountOut pool shares that you want to get, and a token tokenIn to pay with. This costs tokenAmountIn tokens (these went into the pool).
-     * @param {String} account
-     * @param {String} poolAddress
-     * @param {String} tokenIn
-     * @param {String} poolAmountOut will be converted to wei
-     * @param {String} maxAmountIn  will be converted to wei
-     * @return {TransactionReceipt}
-     */
-    joinswapPoolAmountOut(account: string, poolAddress: string, tokenIn: string, poolAmountOut: string, maxAmountIn: string): Promise<TransactionReceipt>;
+    joinswapExternAmountIn(account: string, poolAddress: string, tokenAmountIn: string, minPoolAmountOut: string): Promise<TransactionReceipt>;
     /**
     * Estimate gas cost for joinswapExternAmountIn
     * @param {String} address
        @param {String} poolAddress
-     * @param {String} tokenOut
      * @param {String} poolAmountIn will be converted to wei
      * @param {String} minTokenAmountOut  will be converted to wei
        * @param {Contract} contractInstance optional contract instance
        * @return {Promise<number>}
        */
-    estExitswapPoolAmountIn(address: string, poolAddress: string, tokenOut: string, poolAmountIn: string, minTokenAmountOut: string, contractInstance?: Contract): Promise<number>;
+    estExitswapPoolAmountIn(address: string, poolAddress: string, poolAmountIn: string, minTokenAmountOut: string, contractInstance?: Contract): Promise<number>;
     /**
-     * Pay poolAmountIn pool shares into the pool, getting minTokenAmountOut of the given token tokenOut out of the pool.
+     * Pay poolAmountIn pool shares into the pool, getting minTokenAmountOut of the baseToken
      * @param {String} account
      * @param {String} poolAddress
      * @param {String} tokenOut
@@ -353,28 +331,7 @@ export declare class Pool {
      * @param {String} minTokenAmountOut  will be converted to wei
      * @return {TransactionReceipt}
      */
-    exitswapPoolAmountIn(account: string, poolAddress: string, tokenOut: string, poolAmountIn: string, minTokenAmountOut: string): Promise<TransactionReceipt>;
-    /**
-     * Estimate gas cost for joinswapExternAmountIn
-     * @param {String} address
-     * @param {String} poolAddress
-     * @param {String} tokenOut
-     * @param {String} tokenAmountOut will be converted to wei
-     * @param {String} maxPoolAmountIn  will be converted to wei
-     * @param {Contract} contractInstance optional contract instance
-     * @return {Promise<number>}
-     */
-    estExitswapExternAmountOut(address: string, poolAddress: string, tokenOut: string, tokenAmountOut: string, maxPoolAmountIn: string, contractInstance?: Contract): Promise<number>;
-    /**
-     * Specify tokenAmountOut of token tokenOut that you want to get out of the pool. This costs poolAmountIn pool shares (these went into the pool).
-     * @param {String} account
-     * @param {String} poolAddress
-     * @param {String} tokenOut
-     * @param {String} tokenAmountOut will be converted to wei
-     * @param {String} maxPoolAmountIn  will be converted to wei
-     * @return {TransactionReceipt}
-     */
-    exitswapExternAmountOut(account: string, poolAddress: string, tokenOut: string, tokenAmountOut: string, maxPoolAmountIn: string): Promise<TransactionReceipt>;
+    exitswapPoolAmountIn(account: string, poolAddress: string, poolAmountIn: string, minTokenAmountOut: string): Promise<TransactionReceipt>;
     /**
      * Get Spot Price of swaping tokenIn to tokenOut
      * @param {String} poolAddress

package/dist/src/pools/fixedRate/FixedRateExchange.d.ts

@@ -3,6 +3,7 @@ import { Contract } from 'web3-eth-contract';
 import { AbiItem } from 'web3-utils/types';
 import Web3 from 'web3';
 import { Config } from '../../models/index.js';
+import { PriceAndFees } from '../..';
 export interface FixedPriceExchange {
     active: boolean;
     exchangeOwner: string;
@@ -195,12 +196,12 @@ export declare class FixedRateExchange {
      */
     getAllowedSwapper(exchangeId: string): Promise<string>;
     /**
-     * getBTNeeded - returns amount in baseToken that user will pay for datatokenAmount
+     * calcBaseInGivenOutDT - Calculates how many base tokens are needed to get specified amount of datatokens
      * @param {String} exchangeId ExchangeId
-     * @param {Number} datatokenAmount Amount of datatokens user wants to buy
-     * @return {Promise<string>} Amount of baseToken needed for buying
+     * @param {string} datatokenAmount Amount of datatokens user wants to buy
+     * @return {Promise<PriceAndFees>} how many base tokens are needed and fees
      */
-    getAmountBTIn(exchangeId: string, datatokenAmount: string): Promise<string>;
+    calcBaseInGivenOutDT(exchangeId: string, datatokenAmount: string): Promise<PriceAndFees>;
     /**
      * getBTOut - returns amount in baseToken that user will receive for datatokenAmount sold
      * @param {String} exchangeId ExchangeId

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

@@ -1,5 +1,5 @@
 import Web3 from 'web3';
-import { FileMetadata, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ProviderInitialize } from '../@types/';
+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>;
@@ -58,6 +58,10 @@ export declare class Provider {
      * @return {Promise<FileMetadata[]>} urlDetails
      */
     checkFileUrl(url: string, providerUri: string, signal?: AbortSignal): Promise<FileMetadata[]>;
+    /** Get Compute Environments
+     * @return {Promise<ComputeEnvironment[]>} urlDetails
+     */
+    getComputeEnvironments(providerUri: string, signal?: AbortSignal): Promise<ComputeEnvironment[]>;
     /** Initialize a service request.
      * @param {DDO | string} asset
      * @param {number} serviceIndex
@@ -83,6 +87,7 @@ export declare class Provider {
     /** Instruct the provider to start a compute job
      * @param {string} did
      * @param {string} consumerAddress
+     * @param {string} computeEnv
      * @param {ComputeAlgorithm} algorithm
      * @param {string} providerUri
      * @param {Web3} web3

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

@@ -1,10 +1,11 @@
 import Web3 from 'web3';
 import { Contract } from 'web3-eth-contract';
-import { Erc20CreateParams, FreCreationParams, PoolCreationParams } from '../@types';
+import { Erc20CreateParams, FreCreationParams, FreOrderParams, PoolCreationParams } from '../@types';
 import { Config } from '../models';
 export declare function setContractDefaults(contract: Contract, config: Config): Contract;
 export declare function getFairGasPrice(web3: Web3, config: Config): Promise<string>;
 export declare function getErcCreationParams(ercParams: Erc20CreateParams): any;
+export declare function getFreOrderParams(freParams: FreOrderParams): 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>;

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

@@ -0,0 +1,4 @@
+/**
+ * Simple blocking sleep function
+ */
+export declare function sleep(ms: number): Promise<unknown>;

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.11",
+  "version": "1.0.0-next.15",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -54,30 +54,30 @@
   },
   "homepage": "https://github.com/oceanprotocol/ocean.js#readme",
   "peerDependencies": {
-    "web3": ">=1.3.5"
+    "web3": "^1.7.0"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "^1.0.0-alpha.17",
+    "@oceanprotocol/contracts": "1.0.0-alpha.18",
     "bignumber.js": "^9.0.2",
-    "cross-fetch": "^3.1.4",
-    "crypto-js": "^4.0.0",
-    "decimal.js": "^10.2.1",
-    "web3": ">=1.3.5",
-    "web3-core": "^1.6.1",
-    "web3-eth-contract": "^1.6.1"
+    "cross-fetch": "^3.1.5",
+    "crypto-js": "^4.1.1",
+    "decimal.js": "^10.3.1",
+    "web3": "^1.7.0",
+    "web3-core": "^1.7.0",
+    "web3-eth-contract": "^1.7.0"
   },
   "devDependencies": {
-    "@truffle/hdwallet-provider": "^1.5.1",
+    "@truffle/hdwallet-provider": "^2.0.3",
     "@types/chai": "^4.2.19",
     "@types/chai-spies": "^1.0.3",
-    "@types/crypto-js": "^4.0.1",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.10.3",
+    "@types/crypto-js": "^4.1.0",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.17",
     "@types/node-fetch": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "auto-changelog": "^2.3.0",
-    "chai": "^4.3.4",
+    "auto-changelog": "^2.4.0",
+    "chai": "^4.3.6",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.17.0",
@@ -86,17 +86,17 @@
     "eslint-plugin-prettier": "^4.0.0",
     "fs": "0.0.1-security",
     "microbundle": "^0.14.2",
-    "mocha": "^9.1.2",
-    "mock-local-storage": "^1.1.17",
+    "mocha": "^9.2.0",
+    "mock-local-storage": "^1.1.20",
     "nyc": "^15.1.0",
     "ora": "5.4.1",
     "prettier": "^2.3.1",
-    "release-it": "^14.12.1",
+    "release-it": "^14.12.4",
     "source-map-support": "^0.5.19",
-    "ts-node": "^10.0.0",
+    "ts-node": "^10.5.0",
     "ts-node-register": "^1.0.0",
-    "typedoc": "0.22.5",
-    "typescript": "^4.3.4"
+    "typedoc": "0.22.11",
+    "typescript": "^4.5.5"
   },
   "nyc": {
     "include": [