Add a function to remove a market + Fix issues with deleted markets + Update gas limit values

Author: Julien

src/infura/api-infura.js

@@ -33,15 +33,21 @@ const getMarketsFromEventLogs = (
             return undefined
           }
           const bytesId = market.raw.topics[1]
-          const strId = await self.marketIdBytesToStr(bytesId)
-          return self.priceFeeds.methods
-            .isMarketActive(bytesId)
-            .call()
-            .then(active => {
-              return { bytesId, strId, active }
-            })
+          try {
+            const strId = await self.marketIdBytesToStr(bytesId)
+            return self.priceFeeds.methods
+              .isMarketActive(bytesId)
+              .call()
+              .then(active => {
+                return { bytesId, strId, active }
+              })
+          } catch(err) {
+            return undefined
+          }
         })
-      ).then(onSuccessCallback)
+      ).then((mappedMarkets) => {
+        onSuccessCallback(mappedMarkets.filter((m) => m != undefined))
+      })
     },
     err => {
       onErrorCallback(err)
@@ -117,6 +123,32 @@ export default class API {
     })
   }
 
+  /**
+   * Remove a kyber market feed.
+   * @param marketId Market ID for market (eg. "0x1234...")
+   * @return Promise resolving to the transaction receipt
+   */
+  async removeMarketKyber(marketId) {
+    const self = this
+    return new Promise(function(resolve, reject) {
+      // Add the market
+      self.priceFeedsKyber.methods
+        .removeMarket(marketId)
+        .send({
+          from: self.config.ownerAccountAddr,
+          gas: addMarketGasLimit
+        })
+        .once('receipt', function(receipt) {
+          // Transaction has been mined
+          resolve(receipt)
+        })
+        .on('error', function(error) {
+          // Error
+          reject(error)
+        })
+    })
+  }
+
   /**
    * Pop the next value in the queue, and start the transaction
    */

src/infura/proxy.js

@@ -308,7 +308,7 @@ export default class Proxy {
     return this.proxyTx(proxy, 'sellCancel', [cfd.options.address], gasLimit, gasPrice, privateKey)
   }
 
-  async proxyBuy(proxy, cfd, buyBuyerSide, buyValue, gasLimit = 500000, gasPrice = undefined, privateKey = undefined) {
+  async proxyBuy(proxy, cfd, buyBuyerSide, buyValue, gasLimit = 800000, gasPrice = undefined, privateKey = undefined) {
     return this.proxyTx(proxy, 'buy', [
       cfd.options.address,
       this.daiToken.options.address,
@@ -325,7 +325,7 @@ export default class Proxy {
     ], gasLimit, gasPrice, privateKey)
   }
 
-  async proxyWithdraw(proxy, cfd, value, gasLimit = 350000, gasPrice = undefined, privateKey = undefined) {
+  async proxyWithdraw(proxy, cfd, value, gasLimit = 700000, gasPrice = undefined, privateKey = undefined) {
     return this.proxyTx(proxy, 'withdraw', [
       cfd.options.address,
       value.toString()
@@ -336,15 +336,15 @@ export default class Proxy {
     return this.proxyTx(proxy, 'cancelNew', [cfd.options.address], gasLimit, gasPrice, privateKey)
   }
 
-  async proxyLiquidateMutual(proxy, cfd, gasLimit = 500000, gasPrice = undefined, privateKey = undefined) {
+  async proxyLiquidateMutual(proxy, cfd, gasLimit = 700000, gasPrice = undefined, privateKey = undefined) {
     return this.proxyTx(proxy, 'liquidateMutual', [cfd.options.address], gasLimit, gasPrice, privateKey)
   }
 
   async proxyLiquidateMutualCancel(proxy, cfd, gasLimit = 150000, gasPrice = undefined, privateKey = undefined) {
     return this.proxyTx(proxy, 'liquidateMutualCancel', [cfd.options.address], gasLimit, gasPrice, privateKey)
   }
 
-  async proxyForceTerminate(proxy, cfd, gasLimit = 400000, gasPrice = undefined, privateKey = undefined) {
+  async proxyForceTerminate(proxy, cfd, gasLimit = 700000, gasPrice = undefined, privateKey = undefined) {
     return this.proxyTx(proxy, 'forceTerminate', [cfd.options.address], gasLimit, gasPrice, privateKey)
   }