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

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

@@ -9,3 +9,8 @@ export interface Erc20CreateParams {
     name?: string;
     symbol?: string;
 }
+export interface ConsumeMarketFee {
+    consumeMarketFeeAddress: string;
+    consumeMarketFeeToken: string;
+    consumeMarketFeeAmount: string;
+}

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

@@ -34,3 +34,10 @@ export interface AmountsOutMaxFee {
     swapMarketFee: string;
     maxPrice?: string;
 }
+export interface PoolPriceAndFees {
+    tokenAmount: string;
+    liquidityProviderSwapFeeAmount: string;
+    oceanFeeAmount: string;
+    publishMarketSwapFeeAmount: string;
+    consumeMarketSwapFeeAmount: string;
+}

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

@@ -3,7 +3,7 @@ import Web3 from 'web3';
 import { TransactionReceipt } from 'web3-core';
 import { AbiItem } from 'web3-utils';
 import { Config } from '../models/index.js';
-import { ProviderFees, FreCreationParams, Erc20CreateParams, PoolCreationParams, DispenserCreationParams } from '../@types/index.js';
+import { ProviderFees, FreCreationParams, Erc20CreateParams, PoolCreationParams, DispenserCreationParams, ConsumeMarketFee } from '../@types/index.js';
 interface Template {
     templateAddress: string;
     isActive: boolean;
@@ -12,7 +12,8 @@ export interface TokenOrder {
     tokenAddress: string;
     consumer: string;
     serviceIndex: number;
-    _providerFees: ProviderFees;
+    _providerFee: ProviderFees;
+    _consumeMarketFee: ConsumeMarketFee;
 }
 export interface NftCreateData {
     name: string;

package/dist/src/index.d.ts

@@ -1,3 +1,4 @@
+export * from './aquarius';
 export * from './pools';
 export * from './tokens';
 export * from './factories';

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

@@ -2,7 +2,7 @@ import Web3 from 'web3';
 import { AbiItem } from 'web3-utils/types';
 import { TransactionReceipt } from 'web3-core';
 import { Contract } from 'web3-eth-contract';
-import { CurrentFees, TokenInOutMarket, AmountsInMaxFee, AmountsOutMaxFee } from '../../@types';
+import { CurrentFees, TokenInOutMarket, AmountsInMaxFee, AmountsOutMaxFee, PoolPriceAndFees } from '../../@types';
 import { Config } from '../../models';
 /**
  * Provides an interface to Ocean friendly fork from Balancer BPool
@@ -32,14 +32,14 @@ export declare class Pool {
      */
     estSetSwapFee(account: string, poolAddress: string, fee: string, contractInstance?: Contract): Promise<number>;
     /**
-     * Set pool fee
+     * Allows controller to change the swapFee
      * @param {String} account
      * @param {String} poolAddress
-     * @param {String} fee 0.1=10% fee(max allowed)
+     * @param {String} fee swap fee (1e17 = 10 % , 1e16 = 1% , 1e15 = 0.1%, 1e14 = 0.01%)
      */
     setSwapFee(account: string, poolAddress: string, fee: string): Promise<TransactionReceipt>;
     /**
-     * Get number of tokens composing this pool
+     * Returns number of tokens bounded to pool
      * @param {String} poolAddress
      * @return {String}
      */
@@ -51,31 +51,33 @@ export declare class Pool {
      */
     getPoolSharesTotalSupply(poolAddress: string): Promise<string>;
     /**
-     * Get tokens composing this pool
+     * Get tokens composing this poo
+     * Returns tokens bounded to pool, before the pool is finalizedl
      * @param {String} poolAddress
      * @return {String[]}
      */
     getCurrentTokens(poolAddress: string): Promise<string[]>;
     /**
      * Get the final tokens composing this pool
+     * Returns tokens bounded to pool, after the pool was finalized
      * @param {String} poolAddress
      * @return {String[]}
      */
     getFinalTokens(poolAddress: string): Promise<string[]>;
     /**
-     * Get controller address of this pool
+     * Returns the current controller address (ssBot)
      * @param {String} poolAddress
      * @return {String}
      */
     getController(poolAddress: string): Promise<string>;
     /**
-     * Get baseToken address of this pool
+     * Returns the current baseToken address of the pool
      * @param {String} poolAddress
      * @return {String}
      */
     getBaseToken(poolAddress: string): Promise<string>;
     /**
-     * Get datatoken address of this pool
+     * Returns the current datatoken address
      * @param {String} poolAddress
      * @return {String}
      */
@@ -94,51 +96,57 @@ export declare class Pool {
     getOPCCollector(poolAddress: string): Promise<string>;
     /**
      * Get if a token is bounded to a pool
+     *  Returns true if token is bound
      * @param {String} poolAddress
-     * @param {String} token  Address of the token
+     * @param {String} token  Address of the token to be checked
      * @return {Boolean}
      */
     isBound(poolAddress: string, token: string): Promise<boolean>;
     /**
-     * Get how many tokens are in the pool
+     * Returns the current token reserve amount
      * @param {String} poolAddress
-     * @param {String} token  Address of the token
+     * @param {String} token  Address of the token to be checked
      * @return {String}
      */
     getReserve(poolAddress: string, token: string): Promise<string>;
     /**
      * Get if a pool is finalized
+     * Returns true if pool is finalized
      * @param {String} poolAddress
      * @return {Boolean}
      */
     isFinalized(poolAddress: string): Promise<boolean>;
     /**
-     * Get pool fee
+     *  Returns the current Liquidity Providers swap fee
      * @param {String} poolAddress
      * @return {String} Swap fee. To get the percentage value, substract by 100. E.g. `0.1` represents a 10% swap fee.
      */
     getSwapFee(poolAddress: string): Promise<string>;
     /**
-     * The normalized weight of a token. The combined normalized weights of all tokens will sum up to 1. (Note: the actual sum may be 1 plus or minus a few wei due to division precision loss)
+     * Returns normalized weight of a token.
+     * The combined normalized weights of all tokens will sum up to 1.
+     * (Note: the actual sum may be 1 plus or minus a few wei due to division precision loss)
      * @param {String} poolAddress
-     * @param {String} token
+     * @param {String} token token to be checked
      * @return {String}
      */
     getNormalizedWeight(poolAddress: string, token: string): Promise<string>;
     /**
-     * getDenormalizedWeight of a token in pool
+     *  Returns denormalized weight of a token
      * @param {String} poolAddress
-     * @param {String} token
+     * @param {String} token token to be checked
      * @return {String}
      */
     getDenormalizedWeight(poolAddress: string, token: string): Promise<string>;
     /**
-     * getTotalDenormalizedWeight in pool
+     * getTotalDenormalizedWeight
+     * Returns total denormalized weught of the pool
      * @param {String} poolAddress
      * @return {String}
      */
     getTotalDenormalizedWeight(poolAddress: string): Promise<string>;
     /**
+     * Returns the current fee of publishingMarket
      * Get Market Fees available to be collected for a specific token
      * @param {String} poolAddress
      * @param {String} token token we want to check fees
@@ -215,22 +223,23 @@ export declare class Pool {
      * Estimate gas cost for swapExactAmountIn
      * @param {String} address
      * @param {String} poolAddress
-     * @param {TokenInOutMarket} tokenInOutMarket
-     * @param {AmountsInMaxFee} amountsInOutMaxFee
+     * @param {TokenInOutMarket} tokenInOutMarket object contianing addresses like tokenIn, tokenOut, consumeMarketFeeAddress
+     * @param {AmountsInMaxFee} amountsInOutMaxFee object contianing tokenAmountIn, minAmountOut, maxPrice, consumeMarketSwapFee
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
     estSwapExactAmountIn(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsInMaxFee, contractInstance?: Contract): Promise<number>;
     /**
-     * swapExactAmountIn - Trades an exact tokenAmountIn of tokenIn taken from the caller by the pool,
-     *  in exchange for at least minAmountOut of tokenOut given to the caller from the pool, with a maximum marginal price of maxPrice.
-     *  Returns (tokenAmountOut, spotPriceAfter), where tokenAmountOut is the amount of token that came out of the pool,
-     *  and spotPriceAfter is the new marginal spot price, ie, the result of getSpotPrice after the call.
+     * Swaps an exact amount of tokensIn to get a mimum amount of tokenOut
+     * Trades an exact tokenAmountIn of tokenIn taken from the caller by the pool,
+     * in exchange for at least minAmountOut of tokenOut given to the caller from the pool, with a maximum marginal price of maxPrice.
+     * Returns (tokenAmountOut, spotPriceAfter), where tokenAmountOut is the amount of token that came out of the pool,
+     * and spotPriceAfter is the new marginal spot price, ie, the result of getSpotPrice after the call.
      * (These values are what are limited by the arguments; you are guaranteed tokenAmountOut >= minAmountOut and spotPriceAfter <= maxPrice).
      * @param {String} address
      * @param {String} poolAddress
-     * @param {TokenInOutMarket} tokenInOutMarket
-     * @param {AmountsInMaxFee} amountsInOutMaxFee
+     * @param {TokenInOutMarket} tokenInOutMarket object contianing addresses like tokenIn, tokenOut, consumeMarketFeeAddress
+     * @param {AmountsInMaxFee} amountsInOutMaxFee object contianing tokenAmountIn, minAmountOut, maxPrice, consumeMarketSwapFee
      * @return {TransactionReceipt}
      */
     swapExactAmountIn(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsInMaxFee): Promise<TransactionReceipt>;
@@ -245,49 +254,54 @@ export declare class Pool {
      */
     estSwapExactAmountOut(address: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsOutMaxFee, contractInstance?: Contract): Promise<number>;
     /**
-     * swapExactAmountOut
+     * Swaps a maximum  maxAmountIn of tokensIn to get an exact amount of tokenOut
      * @param {String} account
      * @param {String} poolAddress
-     * @param {TokenInOutMarket} tokenInOutMarket
-     * @param {AmountsOutMaxFee} amountsInOutMaxFee
+     * @param {TokenInOutMarket} tokenInOutMarket Object containing addresses like tokenIn, tokenOut, consumeMarketFeeAddress
+     * @param {AmountsOutMaxFee} amountsInOutMaxFee Object containging maxAmountIn,tokenAmountOut,maxPrice, consumeMarketSwapFee]
      * @return {TransactionReceipt}
      */
     swapExactAmountOut(account: string, poolAddress: string, tokenInOutMarket: TokenInOutMarket, amountsInOutMaxFee: AmountsOutMaxFee): Promise<TransactionReceipt>;
     /**
-     * Estimate gas cost for swapExactAmountOut
+     * Estimate gas cost for joinPool method
      * @param {String} address
      * @param {String} poolAddress
-     * @param {String} poolAmountOut will be converted to wei
-     * @param {String[]} maxAmountsIn  array holding maxAmount per each token, will be converted to wei
+     * @param {String} poolAmountOut expected number of pool shares that you will get
+     * @param {String[]} maxAmountsIn array with maxium amounts spent
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
     estJoinPool(address: string, poolAddress: string, poolAmountOut: string, maxAmountsIn: string[], contractInstance?: Contract): Promise<number>;
     /**
-     * Join the pool, getting poolAmountOut pool tokens. This will pull some of each of the currently trading tokens in the pool, meaning you must have called approve for each token for this pool. These values are limited by the array of maxAmountsIn in the order of the pool tokens.
+     * Adds dual side liquidity to the pool (both datatoken and basetoken)
+     * This will pull some of each of the currently trading tokens in the pool,
+     * meaning you must have called approve for each token for this pool.
+     * These values are limited by the array of maxAmountsIn in the order of the pool tokens.
      * @param {String} address
      * @param {String} poolAddress
-     * @param {String} poolAmountOut will be converted to wei
-     * @param {String[]} maxAmountsIn  array holding maxAmount per each token, will be converted to wei
+     * @param {String} poolAmountOut expected number of pool shares that you will get
+     * @param {String[]} maxAmountsIn array with maxium amounts spent
      * @return {TransactionReceipt}
      */
     joinPool(address: string, poolAddress: string, poolAmountOut: string, maxAmountsIn: string[]): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for exitPool
-  * @param {String} address
+     * @param {String} address
      * @param {String} poolAddress
-   ``* @param {String} poolAmountIn will be converted to wei
-     * @param {String[]} minAmountsOut  array holding minAmount per each token, will be converted to wei
+   ``* @param {String} poolAmountIn amount of pool shares spent
+     * @param {String[]} minAmountsOut  aarray with minimum amount of tokens expected
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
     estExitPool(address: string, poolAddress: string, poolAmountIn: string, minAmountsOut: string[], contractInstance?: Contract): Promise<number>;
     /**
-     * Exit the pool, paying poolAmountIn pool tokens and getting some of each of the currently trading tokens in return. These values are limited by the array of minAmountsOut in the order of the pool tokens.
+     * Removes dual side liquidity from the pool (both datatoken and basetoken)
+     * Exit the pool, paying poolAmountIn pool tokens and getting some of each of the currently trading tokens in return.
+     * These values are limited by the array of minAmountsOut in the order of the pool tokens.
      * @param {String} account
      * @param {String} poolAddress
-     * @param {String} poolAmountIn will be converted to wei
-     * @param {String[]} minAmountsOut  array holding minAmount per each token, will be converted to wei
+     * @param {String} poolAmountIn amount of pool shares spent
+     * @param {String[]} minAmountsOut array with minimum amount of tokens expected
      * @return {TransactionReceipt}
      */
     exitPool(account: string, poolAddress: string, poolAmountIn: string, minAmountsOut: string[]): Promise<TransactionReceipt>;
@@ -296,56 +310,97 @@ export declare class Pool {
      * @param {String} address
      * @param {String} poolAddress
      * @param {String} tokenIn
-     * @param {String} tokenAmountIn will be converted to wei
-     * @param {String} minPoolAmountOut  will be converted to wei
+     * @param {String} tokenAmountIn exact number of base tokens to spend
+     * @param {String} minPoolAmountOut minimum of pool shares expectex
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
     estJoinswapExternAmountIn(address: string, poolAddress: string, tokenAmountIn: string, minPoolAmountOut: string, contractInstance?: Contract): Promise<number>;
     /**
+     * Single side add liquidity to the pool,
+     * expecting a minPoolAmountOut of shares for spending tokenAmountIn basetokens.
      * Pay tokenAmountIn of baseToken to join the pool, getting poolAmountOut of the pool shares.
      * @param {String} account
      * @param {String} poolAddress
      * @param {String} tokenIn
-     * @param {String} tokenAmountIn will be converted to wei
-     * @param {String} minPoolAmountOut  will be converted to wei
+     * @param {String} tokenAmountIn exact number of base tokens to spend
+     * @param {String} minPoolAmountOut minimum of pool shares expectex
      * @return {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} poolAmountIn will be converted to wei
-     * @param {String} minTokenAmountOut  will be converted to wei
-       * @param {Contract} contractInstance optional contract instance
-       * @return {Promise<number>}
-       */
+     * Estimate gas cost for exitswapPoolAmountIn
+     * @param {String} address
+     *  @param {String} poolAddress
+     * @param {String} poolAmountIn exact number of pool shares to spend
+     * @param {String} minTokenAmountOut minimum amount of basetokens expected
+     * @param {Contract} contractInstance optional contract instance
+     * @return {Promise<number>}
+     */
     estExitswapPoolAmountIn(address: string, poolAddress: string, poolAmountIn: string, minTokenAmountOut: string, contractInstance?: Contract): Promise<number>;
     /**
+     * Single side remove liquidity from the pool,
+     * expecting a minAmountOut of basetokens for spending poolAmountIn pool shares
      * Pay poolAmountIn pool shares into the pool, getting minTokenAmountOut of the baseToken
      * @param {String} account
      * @param {String} poolAddress
      * @param {String} tokenOut
-     * @param {String} poolAmountIn will be converted to wei
-     * @param {String} minTokenAmountOut  will be converted to wei
+     * @param {String} poolAmountIn exact number of pool shares to spend
+     * @param {String} minTokenAmountOut minimum amount of basetokens expected
      * @return {TransactionReceipt}
      */
     exitswapPoolAmountIn(account: string, poolAddress: string, poolAmountIn: string, minTokenAmountOut: string): Promise<TransactionReceipt>;
     /**
-     * Get Spot Price of swaping tokenIn to tokenOut
+     * Return the spot price of swapping tokenIn to tokenOut
      * @param {String} poolAddress
-     * @param {String} tokenIn
-     * @param {String} tokenOut
-     * @param {String} swapMarketFe
+     * @param {String} tokenIn in token
+     * @param {String} tokenOut out token
+     * @param {String} swapMarketFe consume market swap fee
      * @return {String}
      */
     getSpotPrice(poolAddress: string, tokenIn: string, tokenOut: string, swapMarketFee: string): Promise<string>;
-    getAmountInExactOut(poolAddress: string, tokenIn: string, tokenOut: string, tokenAmountOut: string, swapMarketFee: string): Promise<string>;
-    getAmountOutExactIn(poolAddress: string, tokenIn: string, tokenOut: string, tokenAmountIn: string, swapMarketFee: string): Promise<string>;
+    /**
+     * How many tokensIn do you need in order to get exact tokenAmountOut.
+     * Returns: tokenAmountIn, swapFee, opcFee , consumeMarketSwapFee, publishMarketSwapFee
+     * Returns: tokenAmountIn, LPFee, opcFee , publishMarketSwapFee, consumeMarketSwapFee
+     * @param tokenIn token to be swaped
+     * @param tokenOut token to get
+     * @param tokenAmountOut exact amount of tokenOut
+     * @param swapMarketFee consume market swap fee
+     */
+    getAmountInExactOut(poolAddress: string, tokenIn: string, tokenOut: string, tokenAmountOut: string, swapMarketFee: string): Promise<PoolPriceAndFees>;
+    /**
+     *  How many tokensOut you will get for a exact tokenAmountIn
+     *  Returns: tokenAmountOut, LPFee, opcFee ,  publishMarketSwapFee, consumeMarketSwapFee
+     * @param tokenIn token to be swaped
+     * @param tokenOut token to get
+     * @param tokenAmountOut exact amount of tokenOut
+     * @param _consumeMarketSwapFee consume market swap fee
+     */
+    getAmountOutExactIn(poolAddress: string, tokenIn: string, tokenOut: string, tokenAmountIn: string, swapMarketFee: string): Promise<PoolPriceAndFees>;
+    /**
+     * Returns number of poolshares obtain by staking exact tokenAmountIn tokens
+     * @param tokenIn tokenIn
+     * @param tokenAmountIn exact number of tokens staked
+     */
     calcPoolOutGivenSingleIn(poolAddress: string, tokenIn: string, tokenAmountIn: string): Promise<string>;
+    /**
+     * Returns number of tokens to be staked to the pool in order to get an exact number of poolshares
+     * @param tokenIn tokenIn
+     * @param poolAmountOut expected amount of pool shares
+     */
     calcSingleInGivenPoolOut(poolAddress: string, tokenIn: string, poolAmountOut: string): Promise<string>;
+    /**
+     * Returns expected amount of tokenOut for removing exact poolAmountIn pool shares from the pool
+     * @param tokenOut tokenOut
+     * @param poolAmountIn amount of shares spent
+     */
     calcSingleOutGivenPoolIn(poolAddress: string, tokenOut: string, poolAmountIn: string): Promise<string>;
+    /**
+     * Returns number of poolshares needed to withdraw exact tokenAmountOut tokens
+     * @param tokenOut tokenOut
+     * @param tokenAmountOut expected amount of tokensOut
+     */
     calcPoolInGivenSingleOut(poolAddress: string, tokenOut: string, tokenAmountOut: string): Promise<string>;
     /**
      * Get LOG_SWAP encoded topic

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

@@ -2,7 +2,7 @@ import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
 import { TransactionReceipt } from 'web3-eth';
 import { Contract } from 'web3-eth-contract';
-import { FreOrderParams, FreCreationParams, ProviderFees } from '../@types';
+import { ConsumeMarketFee, FreOrderParams, FreCreationParams, ProviderFees } from '../@types';
 import { Nft } from './NFT';
 import { Config } from '../models/index.js';
 /**
@@ -15,7 +15,8 @@ interface Roles {
 export interface OrderParams {
     consumer: string;
     serviceIndex: number;
-    _providerFees: ProviderFees;
+    _providerFee: ProviderFees;
+    _consumeMarketFee: ConsumeMarketFee;
 }
 export interface DispenserParams {
     maxTokens: string;
@@ -245,19 +246,21 @@ export declare class Datatoken {
      * @param {String} consumer Consumer Address
      * @param {Number} serviceIndex  Service index in the metadata
      * @param {providerFees} providerFees provider fees
+     * @param {consumeMarketFee} ConsumeMarketFee consume market fees
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<any>}
      */
-    estGasStartOrder(dtAddress: string, address: string, consumer: string, serviceIndex: number, providerFees: ProviderFees, contractInstance?: Contract): Promise<any>;
+    estGasStartOrder(dtAddress: string, address: string, consumer: string, serviceIndex: number, providerFees: ProviderFees, consumeMarketFee?: ConsumeMarketFee, contractInstance?: Contract): Promise<any>;
     /** Start Order: called by payer or consumer prior ordering a service consume on a marketplace.
      * @param {String} dtAddress Datatoken address
      * @param {String} address User address which calls
      * @param {String} consumer Consumer Address
      * @param {Number} serviceIndex  Service index in the metadata
      * @param {providerFees} providerFees provider fees
+     * @param {consumeMarketFee} ConsumeMarketFee consume market fees
      * @return {Promise<TransactionReceipt>} string
      */
-    startOrder(dtAddress: string, address: string, consumer: string, serviceIndex: number, providerFees: ProviderFees): Promise<TransactionReceipt>;
+    startOrder(dtAddress: string, address: string, consumer: string, serviceIndex: number, providerFees: ProviderFees, consumeMarketFee?: ConsumeMarketFee): 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.15",
+  "version": "1.0.0-next.19",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -57,7 +57,7 @@
     "web3": "^1.7.0"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "1.0.0-alpha.18",
+    "@oceanprotocol/contracts": "1.0.0-alpha.19",
     "bignumber.js": "^9.0.2",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",