@oceanprotocol/lib 1.0.0-next.18 → 1.0.0-next.21

package/dist/src/@types/DDO/Metadata.d.ts

@@ -86,11 +86,15 @@ export interface Metadata {
      */
     links?: string[];
     /**
-     * Mapping of URL strings for data samples, or links to find out more information.
-     * Links may be to either a URL or another asset.
+     * Array of keywords or tags used to describe this content. Empty by default.
      * @type {string[]}
      */
     tags?: string[];
+    /**
+     * Array of categories associated to the asset. Note: recommended to use tags instead of this.
+     * @type {string[]}
+     */
+    categories?: string[];
     /**
      * The party holding the legal copyright. Empty by default.
      * @type {string}

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

@@ -19,7 +19,7 @@ export interface FreOrderParams {
 }
 export interface PriceAndFees {
     baseTokenAmount: string;
-    baseTokenAmountBeforeFee: string;
     oceanFeeAmount: string;
     marketFeeAmount: string;
+    consumeMarketFeeAmount: string;
 }

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

@@ -82,6 +82,12 @@ export declare class Pool {
      * @return {String}
      */
     getDatatoken(poolAddress: string): Promise<string>;
+    /**
+     * Get getMarketFee
+     * @param {String} poolAddress
+     * @return {String}
+     */
+    getMarketFee(poolAddress: string): Promise<string>;
     /**
      * Get marketFeeCollector of this pool
      * @param {String} poolAddress
@@ -203,22 +209,24 @@ export declare class Pool {
      */
     collectMarketFee(address: string, poolAddress: string): Promise<TransactionReceipt>;
     /**
-     * Estimate gas cost for updateMarketFeeCollector
+     * Estimate gas cost for updatePublishMarketFee
      * @param {String} address
      * @param {String} poolAddress
-     * @param {String} newCollector new market fee collector address
+     * @param {String} newPublishMarketAddress new market address
+     * @param {String} newPublishMarketSwapFee new market swap fee
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estUpdateMarketFeeCollector(address: string, poolAddress: string, newCollector: string, contractInstance?: Contract): Promise<number>;
+    estUpdatePublishMarketFee(address: string, poolAddress: string, newPublishMarketAddress: string, newPublishMarketSwapFee: string, contractInstance?: Contract): Promise<number>;
     /**
-     * updateMarketFeeCollector - updates marketFeeCollector - can be called only by the marketFeeCollector
+     * updatePublishMarketFee - sets a new  newPublishMarketAddress and new newPublishMarketSwapFee- can be called only by the marketFeeCollector
      * @param {String} address
      * @param {String} poolAddress
-     * @param {String} newCollector new market fee collector address
+     * @param {String} newPublishMarketAddress new market fee collector address
+     * @param {String} newPublishMarketSwapFee fee recieved by the publisher market when a dt is swaped from a pool, percent
      * @return {TransactionReceipt}
      */
-    updateMarketFeeCollector(address: string, poolAddress: string, newCollector: string): Promise<TransactionReceipt>;
+    updatePublishMarketFee(address: string, poolAddress: string, newPublishMarketAddress: string, newPublishMarketSwapFee: string): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for swapExactAmountIn
      * @param {String} address

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

@@ -69,37 +69,45 @@ export declare class FixedRateExchange {
      * @param {String} account
      * @param {String} dtAmount datatoken amount we want to buy
      * @param {String} datatokenAddress datatokenAddress
+     * @param {String} consumeMarketAddress consumeMarketAddress
+     * @param {String} consumeMarketFee fee recieved by the consume market when a dt is bought from a fixed rate exchange, percent
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estBuyDT(account: string, datatokenAddress: string, dtAmount: string, maxBaseTokenAmount: string, contractInstance?: Contract): Promise<number>;
+    estBuyDT(account: string, datatokenAddress: string, dtAmount: string, maxBaseTokenAmount: string, consumeMarketAddress: string, consumeMarketFee: string, contractInstance?: Contract): Promise<number>;
     /**
      * Atomic swap
      * @param {String} exchangeId ExchangeId
      * @param {String} datatokenAmount Amount of datatokens
      * @param {String} maxBaseTokenAmount max amount of baseToken we want to pay for datatokenAmount
      * @param {String} address User address
+     * @param {String} consumeMarketAddress consumeMarketAddress
+     * @param {String} consumeMarketFee consumeMarketFee
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    buyDT(address: string, exchangeId: string, datatokenAmount: string, maxBaseTokenAmount: string): Promise<TransactionReceipt>;
+    buyDT(address: string, exchangeId: string, datatokenAmount: string, maxBaseTokenAmount: string, consumeMarketAddress?: string, consumeMarketFee?: string): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for sellDT
      * @param {String} account
      * @param {String} dtAmount datatoken amount we want to sell
      * @param {String} datatokenAddress datatokenAddress
+     * @param {String} consumeMarketAddress consumeMarketAddress
+     * @param {String} consumeMarketFee consumeMarketFee
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
-    estSellDT(account: string, datatokenAddress: string, dtAmount: string, maxBaseTokenAmount: string, contractInstance?: Contract): Promise<number>;
+    estSellDT(account: string, datatokenAddress: string, dtAmount: string, maxBaseTokenAmount: string, consumeMarketAddress: string, consumeMarketFee: string, contractInstance?: Contract): Promise<number>;
     /**
      * Atomic swap
      * @param {String} exchangeId ExchangeId
      * @param {String} datatokenAmount Amount of datatokens
      * @param {String} minBaseTokenAmount min amount of baseToken we want to receive back
      * @param {String} address User address
+     * @param {String} consumeMarketAddress consumeMarketAddress
+     * @param {String} consumeMarketFee consumeMarketFee
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
-    sellDT(address: string, exchangeId: string, datatokenAmount: string, minBaseTokenAmount: string): Promise<TransactionReceipt>;
+    sellDT(address: string, exchangeId: string, datatokenAmount: string, minBaseTokenAmount: string, consumeMarketAddress?: string, consumeMarketFee?: string): Promise<TransactionReceipt>;
     /**
      * Gets total number of exchanges
      * @param {String} exchangeId ExchangeId
@@ -199,16 +207,18 @@ export declare class FixedRateExchange {
      * calcBaseInGivenOutDT - Calculates how many base tokens are needed to get specified amount of datatokens
      * @param {String} exchangeId ExchangeId
      * @param {string} datatokenAmount Amount of datatokens user wants to buy
+     * @param {String} consumeMarketFee consumeMarketFee
      * @return {Promise<PriceAndFees>} how many base tokens are needed and fees
      */
-    calcBaseInGivenOutDT(exchangeId: string, datatokenAmount: string): Promise<PriceAndFees>;
+    calcBaseInGivenOutDT(exchangeId: string, datatokenAmount: string, consumeMarketFee?: string): Promise<PriceAndFees>;
     /**
      * getBTOut - returns amount in baseToken that user will receive for datatokenAmount sold
      * @param {String} exchangeId ExchangeId
      * @param {Number} datatokenAmount Amount of datatokens
+     * @param {String} consumeMarketFee consumeMarketFee
      * @return {Promise<string>} Amount of baseTokens user will receive
      */
-    getAmountBTOut(exchangeId: string, datatokenAmount: string): Promise<string>;
+    getAmountBTOut(exchangeId: string, datatokenAmount: string, consumeMarketFee?: string): Promise<string>;
     /**
      * Get exchange details
      * @param {String} exchangeId ExchangeId

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oceanprotocol/lib",
   "source": "./src/index.ts",
-  "version": "1.0.0-next.18",
+  "version": "1.0.0-next.21",
   "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.19",
+    "@oceanprotocol/contracts": "1.0.0-alpha.21",
     "bignumber.js": "^9.0.2",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",
@@ -70,9 +70,9 @@
     "@truffle/hdwallet-provider": "^2.0.3",
     "@types/chai": "^4.2.19",
     "@types/chai-spies": "^1.0.3",
-    "@types/crypto-js": "^4.1.0",
+    "@types/crypto-js": "^4.1.1",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^17.0.17",
+    "@types/node": "^17.0.18",
     "@types/node-fetch": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",