@oceanprotocol/lib 1.0.0-next.28 → 1.0.0-next.30

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

@@ -59,11 +59,11 @@ export declare class FixedRateExchange {
     unitsToAmount(token: string, amount: string): Promise<string>;
     /**
      * Creates unique exchange identifier.
+     * @param {String} baseToken baseToken contract address
      * @param {String} datatoken Datatoken contract address
-     * @param {String} owner Owner of the exchange
      * @return {Promise<string>} exchangeId
      */
-    generateExchangeId(baseToken: string, datatoken: string, owner: string): Promise<string>;
+    generateExchangeId(baseToken: string, datatoken: string): Promise<string>;
     /**
      * Estimate gas cost for buyDT
      * @param {String} account
@@ -277,32 +277,36 @@ export declare class FixedRateExchange {
      * Estimate gas cost for collectBT
      * @param {String} account
      * @param {String} exchangeId ExchangeId
+     * @param {String} amount amount to be collected
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estCollectBT(account: string, exchangeId: string, contractInstance?: Contract): Promise<number>;
+    estCollectBT(account: string, exchangeId: string, amount: string, contractInstance?: Contract): Promise<number>;
     /**
-     * Collect BaseTokens in the contract (only exchange owner)
-     * @param {String} exchangeId ExchangeId
+     * Collect BaseTokens in the contract (anyone can call this, funds are sent to erc20.paymentCollector)
      * @param {String} address User address
+     * @param {String} exchangeId ExchangeId
+     * @param {String} amount amount to be collected
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    collectBT(address: string, exchangeId: string): Promise<TransactionReceipt>;
+    collectBT(address: string, exchangeId: string, amount: string): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for collecDT
      * @param {String} account
      * @param {String} exchangeId ExchangeId
+     * @param {String} amount amount to be collected
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estCollectDT(account: string, exchangeId: string, contractInstance?: Contract): Promise<number>;
+    estCollectDT(account: string, exchangeId: string, amount: string, contractInstance?: Contract): Promise<number>;
     /**
-     * Collect datatokens in the contract (only exchange owner)
-     * @param {String} exchangeId ExchangeId
+     * Collect datatokens in the contract (anyone can call this, funds are sent to erc20.paymentCollector)
      * @param {String} address User address
+     * @param {String} exchangeId ExchangeId
+     * @param {String} amount amount to be collected
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    collectDT(address: string, exchangeId: string): Promise<TransactionReceipt>;
+    collectDT(address: string, exchangeId: string, amount: string): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for collecMarketFee
      * @param {String} account

package/dist/test/config.d.ts

@@ -0,0 +1,4 @@
+import Web3 from 'web3';
+export declare const web3: Web3;
+export declare const getTestConfig: (web3: Web3) => Promise<import("../src").Config>;
+export declare const getAddresses: () => any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.28",
+  "version": "1.0.0-next.30",
   "description": "JavaScript client library for Ocean Protocol",
   "main": "./dist/lib.js",
   "umd:main": "dist/lib.umd.js",
@@ -57,7 +57,7 @@
     "web3": "^1.7.1"
   },
   "dependencies": {
-    "@oceanprotocol/contracts": "1.0.0-alpha.22",
+    "@oceanprotocol/contracts": "1.0.0-alpha.26",
     "bignumber.js": "^9.0.2",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",
@@ -72,7 +72,7 @@
     "@types/chai-spies": "^1.0.3",
     "@types/crypto-js": "^4.1.1",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.21",
+    "@types/node": "^17.0.23",
     "@types/node-fetch": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
@@ -90,13 +90,13 @@
     "mock-local-storage": "^1.1.20",
     "nyc": "^15.1.0",
     "ora": "5.4.1",
-    "prettier": "^2.3.1",
-    "release-it": "^14.12.5",
+    "prettier": "^2.6.0",
+    "release-it": "^14.13.1",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.7.0",
     "ts-node-register": "^1.0.0",
     "typedoc": "0.22.13",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
   },
   "nyc": {
     "include": [

package/dist/test/integration/config.d.ts

@@ -1,3 +0,0 @@
-import { Config } from '../../src/models/Config';
-declare const _default: Config;
-export default _default;

package/dist/test/unit/config.d.ts

@@ -1,3 +0,0 @@
-import { Config } from '../../src/models/Config';
-declare const _default: Config;
-export default _default;