@oceanprotocol/lib 1.0.0-next.26 → 1.0.0-next.29

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

@@ -8,5 +8,5 @@ export interface MetadataAndTokenURI {
     metaDataHash: string;
     tokenId: number;
     tokenURI: string;
-    metadataProofs: MetadataProof[];
+    metadataProofs?: MetadataProof[];
 }

package/dist/src/pools/Router.d.ts

@@ -35,10 +35,10 @@ export declare class Router {
      * @return {Promise<TransactionReceipt>} Transaction receipt
      */
     buyDTBatch(address: string, operations: Operation[]): Promise<TransactionReceipt>;
-    /** Check if a token is on ocean tokens list, if true opfFee is ZERO in pools with that token/DT
+    /** Check if a token is on approved tokens list, if true opfFee is lower in pools with that token/DT
      * @return {Promise<boolean>} true if is on the list.
      */
-    isOceanTokens(address: string): Promise<boolean>;
+    isApprovedToken(address: string): Promise<boolean>;
     /** Check if an address is a side staking contract.
      * @return {Promise<boolean>} true if is a SS contract
      */
@@ -60,35 +60,35 @@ export declare class Router {
      */
     isPoolTemplate(address: string): Promise<boolean>;
     /**
-     * Estimate gas cost for addOceanToken
+     * Estimate gas cost for addApprovedToken
      * @param {String} address
      * @param {String} tokenAddress token address we want to add
      * @param {Contract} routerContract optional contract instance
      * @return {Promise<any>}
      */
-    estGasAddOceanToken(address: string, tokenAddress: string, contractInstance?: Contract): Promise<any>;
+    estGasAddApprovedToken(address: string, tokenAddress: string, contractInstance?: Contract): Promise<any>;
     /**
      * Add a new token to oceanTokens list, pools with baseToken in this list have NO opf Fee
      * @param {String} address caller address
      * @param {String} tokenAddress token address to add
      * @return {Promise<TransactionReceipt>}
      */
-    addOceanToken(address: string, tokenAddress: string): Promise<TransactionReceipt>;
+    addApprovedToken(address: string, tokenAddress: string): Promise<TransactionReceipt>;
     /**
-     * Estimate gas cost for removeOceanToken
+     * Estimate gas cost for removeApprovedToken
      * @param {String} address caller address
      * @param {String} tokenAddress token address we want to add
      * @param {Contract} routerContract optional contract instance
      * @return {Promise<any>}
      */
-    estGasRemoveOceanToken(address: string, tokenAddress: string, contractInstance?: Contract): Promise<any>;
+    estGasRemoveApprovedToken(address: string, tokenAddress: string, contractInstance?: Contract): Promise<any>;
     /**
      * Remove a token from oceanTokens list, pools without baseToken in this list have a opf Fee
      * @param {String} address
      * @param {String} tokenAddress address to remove
      * @return {Promise<TransactionReceipt>}
      */
-    removeOceanToken(address: string, tokenAddress: string): Promise<TransactionReceipt>;
+    removeApprovedToken(address: string, tokenAddress: string): Promise<TransactionReceipt>;
     /**
      * Estimate gas cost for addSSContract method
      * @param {String} address

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
@@ -119,7 +119,7 @@ export declare class FixedRateExchange {
      * Estimate gas cost for setRate
      * @param {String} account
      * @param {String} exchangeId ExchangeId
-     * @param {Number} newRate New rate
+     * @param {String} newRate New rate
      * @param {Contract} contractInstance optional contract instance
      * @return {Promise<number>}
      */
@@ -127,7 +127,7 @@ export declare class FixedRateExchange {
     /**
      * Set new rate
      * @param {String} exchangeId ExchangeId
-     * @param {Number} newRate New rate
+     * @param {String} newRate New rate
      * @param {String} address User account
      * @return {Promise<TransactionReceipt>} transaction receipt
      */
@@ -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/src/utils/ContractUtils.d.ts

@@ -7,6 +7,6 @@ export declare function getFairGasPrice(web3: Web3, config: Config): Promise<str
 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 getPoolCreationParams(web3: Web3, poolParams: PoolCreationParams): Promise<any>;
 export declare function unitsToAmount(web3: Web3, token: string, amount: string): Promise<string>;
 export declare function amountToUnits(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.26",
+  "version": "1.0.0-next.29",
   "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.21",
+    "@oceanprotocol/contracts": "1.0.0-alpha.26",
     "bignumber.js": "^9.0.2",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",
@@ -86,7 +86,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "fs": "0.0.1-security",
     "microbundle": "^0.14.2",
-    "mocha": "^9.2.1",
+    "mocha": "^9.2.2",
     "mock-local-storage": "^1.1.20",
     "nyc": "^15.1.0",
     "ora": "5.4.1",