@oceanprotocol/lib 1.0.0-next.13 → 1.0.0-next.17

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/index.d.ts

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

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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.13",
+  "version": "1.0.0-next.17",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -70,14 +70,14 @@
     "@truffle/hdwallet-provider": "^2.0.3",
     "@types/chai": "^4.2.19",
     "@types/chai-spies": "^1.0.3",
-    "@types/crypto-js": "^4.0.1",
+    "@types/crypto-js": "^4.1.0",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.16",
+    "@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.4.0",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.17.0",