From 299b08f4da86085f5667950392530c1de62c40d8 Mon Sep 17 00:00:00 2001
From: Dean Selvey <deanselvey@gmail.com>
Date: Wed, 30 Aug 2023 16:24:34 +0100
Subject: [PATCH 1/8] replace request-promise with request

---
 src/api/deposit.js                                | 4 ++--
 src/api/estimatedNextBatchTime.js                 | 4 ++--
 src/api/eth/getGasStationPrice.js                 | 5 ++---
 src/api/fastWithdrawal.js                         | 4 ++--
 src/api/fastWithdrawalFee.js                      | 4 ++--
 src/api/getConfig.js                              | 4 ++--
 src/api/getGasPrice.js                            | 4 ++--
 src/api/getTickers.js                             | 4 ++--
 src/api/getTokenHolders.js                        | 4 ++--
 src/api/getTokenLiquidityLeft.js                  | 4 ++--
 src/api/getTokenSaleStartEnd.js                   | 4 ++--
 src/api/ledger/deposit.js                         | 4 ++--
 src/api/ledger/transferUsingVaultIdAndStarkKey.js | 4 ++--
 src/api/ledger/withdraw.js                        | 4 ++--
 src/api/submitMarketOrder.js                      | 4 ++--
 src/api/submitOrder.js                            | 4 ++--
 src/api/transferUsingVaultIdAndStarkKey.js        | 4 ++--
 src/api/withdraw.js                               | 4 ++--
 src/lib/dvf/post-generic.js                       | 4 ++--
 19 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/api/deposit.js b/src/api/deposit.js
index 0719cd69..cee2e19b 100644
--- a/src/api/deposit.js
+++ b/src/api/deposit.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const DVFError = require('../lib/dvf/DVFError')
 const validateAssertions = require('../lib/validators/validateAssertions')
 
@@ -51,7 +51,7 @@ module.exports = async (dvf, token, amount, starkPrivateKey, nonce, signature) =
 
   await dvf.contract.approve(token, dvf.token.toBaseUnitAmount(token, amount), dvf.config.DVF.starkExContractAddress, 'ETHEREUM')
 
-  const depositResponse = await post(url, { json: data })
+  const depositResponse = await request.post(url, { json: data })
 
   const { status, transactionHash } = await dvf.contract.deposit(
     tempVaultId,
diff --git a/src/api/estimatedNextBatchTime.js b/src/api/estimatedNextBatchTime.js
index 2e306414..29adc557 100644
--- a/src/api/estimatedNextBatchTime.js
+++ b/src/api/estimatedNextBatchTime.js
@@ -1,4 +1,4 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async dvf => {
   // avoid browser cache with timestamp as querystring
@@ -6,7 +6,7 @@ module.exports = async dvf => {
 
   const url = `${dvf.config.api}/v1/trading/r/estimatedNextBatchTime?t=${t}`
   try {
-    const data = await get(url)
+    const data = await request.get(url)
     return JSON.parse(data)
   }
   catch(e) {
diff --git a/src/api/eth/getGasStationPrice.js b/src/api/eth/getGasStationPrice.js
index 3a7d3325..972c796a 100644
--- a/src/api/eth/getGasStationPrice.js
+++ b/src/api/eth/getGasStationPrice.js
@@ -1,12 +1,11 @@
-const { get } = require('request-promise')
-
+const { request } = require('@rhino.fi/dvf-utils')
 /**
  * Provides a safe average gas price
  */
 
 module.exports = async (dvf)  => {
   try {
-    const res = await get(`${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
+    const res = await request.get(`${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
     dvf.config.defaultGasPrice = parseInt((JSON.parse(res).average * 1.25 *100000000))
   } catch(e)  {
     console.log('Error getting safe gas priec, using default ', e)
diff --git a/src/api/fastWithdrawal.js b/src/api/fastWithdrawal.js
index 4a6cca57..4e4fb202 100644
--- a/src/api/fastWithdrawal.js
+++ b/src/api/fastWithdrawal.js
@@ -1,7 +1,7 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, withdrawalData) => {
   const url = dvf.config.api + '/v1/trading/w/fastWithdrawal'
   const json = await dvf.createFastWithdrawalPayload(withdrawalData)
-  return post(url, { json })
+  return request.post(url, { json })
 }
diff --git a/src/api/fastWithdrawalFee.js b/src/api/fastWithdrawalFee.js
index e0fa377b..179b0e79 100644
--- a/src/api/fastWithdrawalFee.js
+++ b/src/api/fastWithdrawalFee.js
@@ -1,7 +1,7 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 // TODO: Deprecated (CHAIN-719)
 module.exports = async (dvf, token) => {
   const url = dvf.config.api + '/v1/trading/r/fastWithdrawalFee'
-  return get(url, { json: true, qs: { token } })
+  return request.get(url, { json: true, qs: { token } })
 }
diff --git a/src/api/getConfig.js b/src/api/getConfig.js
index d0afe3b7..bc49a7e5 100644
--- a/src/api/getConfig.js
+++ b/src/api/getConfig.js
@@ -1,9 +1,9 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async dvf => {
   const url = dvf.config.api + '/v1/trading/r/getConf'
   try {
-    const exchangeConf = await post(url, { json: {} })
+    const exchangeConf = await request.post(url, { json: {} })
     dvf.config = Object.assign({}, dvf.config, exchangeConf)
     return exchangeConf
   } catch (error) {
diff --git a/src/api/getGasPrice.js b/src/api/getGasPrice.js
index 1a340579..c0bda05e 100644
--- a/src/api/getGasPrice.js
+++ b/src/api/getGasPrice.js
@@ -1,4 +1,4 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf) => {
   const defaultGasPrice = dvf.config.defaultGasPrice
@@ -8,7 +8,7 @@ module.exports = async (dvf) => {
   const url = dvf.config.api + endpoint
 
   try {
-    const newGasPrice = await get(url, { json: true })
+    const newGasPrice = await request.get(url, { json: true })
     dvf.config.defaultGasPrice = newGasPrice.fast || dvf.config.defaultGasPrice
     return newGasPrice ||  oldGasPrice
   }
diff --git a/src/api/getTickers.js b/src/api/getTickers.js
index e6c46dba..ae9f035c 100644
--- a/src/api/getTickers.js
+++ b/src/api/getTickers.js
@@ -1,10 +1,10 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, symbols) => {
   if (symbols.constructor !== Array) {
     symbols = [symbols]
   }
 
-  const response = await get(`${dvf.config.api}/market-data/tickers?symbols=${symbols.join(',')}`)
+  const response = await request.get(`${dvf.config.api}/market-data/tickers?symbols=${symbols.join(',')}`)
   return JSON.parse(response)
 }
diff --git a/src/api/getTokenHolders.js b/src/api/getTokenHolders.js
index 58f09d92..07824e1f 100644
--- a/src/api/getTokenHolders.js
+++ b/src/api/getTokenHolders.js
@@ -1,8 +1,8 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    const response = await request.get(
       `${dvf.config.api}/v1/trading/r/getTokenHolders?token=${token}`
     )
     return response
diff --git a/src/api/getTokenLiquidityLeft.js b/src/api/getTokenLiquidityLeft.js
index 8f6f0911..f98160fa 100644
--- a/src/api/getTokenLiquidityLeft.js
+++ b/src/api/getTokenLiquidityLeft.js
@@ -1,8 +1,8 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    const response = await request.get(
       `${dvf.config.api}/v1/trading/r/getTokenLiquidityLeft?token=${token}`
     )
     return response
diff --git a/src/api/getTokenSaleStartEnd.js b/src/api/getTokenSaleStartEnd.js
index fb37e538..f935eca3 100644
--- a/src/api/getTokenSaleStartEnd.js
+++ b/src/api/getTokenSaleStartEnd.js
@@ -1,8 +1,8 @@
-const { get } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    const response = await request.get(
       `${dvf.config.api}/v1/trading/r/getTokenSaleStartEnd?token=${token}`
     )
     return response
diff --git a/src/api/ledger/deposit.js b/src/api/ledger/deposit.js
index 43e9724c..06aec592 100644
--- a/src/api/ledger/deposit.js
+++ b/src/api/ledger/deposit.js
@@ -1,4 +1,4 @@
-const {post} = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const validateAssertions = require('../../lib/validators/validateAssertions')
 
 module.exports = async (dvf, token, amount, path, nonce, signature) => {
@@ -19,7 +19,7 @@ module.exports = async (dvf, token, amount, path, nonce, signature) => {
 
   const url = dvf.config.api + '/v1/trading/w/deposit'
 
-  const deposit = await post(url, {json: data})
+  const deposit = await request.post(url, {json: data})
   const ctDeposit = await dvf.contract.deposit(tempVaultId, token, amount, `0x${starkDeposit.starkPublicKey.x}`)
 
   return {...deposit, ...ctDeposit}
diff --git a/src/api/ledger/transferUsingVaultIdAndStarkKey.js b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
index 7a2e45b6..15b2ccff 100644
--- a/src/api/ledger/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
@@ -1,9 +1,9 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const makeCreateSignedTransferTxLedger = require('../../lib/ledger/makeCreateSignedTransferTxLedger')
 
 module.exports = async (dvf, transferData, path, feeRecipient) => {
   const url = dvf.config.api + '/v1/trading/w/transfer'
   const createSignedTransferTx = makeCreateSignedTransferTxLedger(dvf)(path)
   const json = await dvf.createTransferPayload(transferData, feeRecipient, createSignedTransferTx)
-  return post(url, { json })
+  return request.post(url, { json })
 }
diff --git a/src/api/ledger/withdraw.js b/src/api/ledger/withdraw.js
index cc3a5e56..1fefb148 100644
--- a/src/api/ledger/withdraw.js
+++ b/src/api/ledger/withdraw.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const validateAssertions = require('../../lib/validators/validateAssertions')
 
 module.exports = async (dvf, token, amount, starkWithdrawal) => {
@@ -31,7 +31,7 @@ module.exports = async (dvf, token, amount, starkWithdrawal) => {
   //console.log({ data })
   const url = dvf.config.api + '/v1/trading/w/withdraw'
   
-  return post(url, {
+  return request.post(url, {
     json: data
   })
 }
diff --git a/src/api/submitMarketOrder.js b/src/api/submitMarketOrder.js
index ab8fce8e..8f6c1748 100644
--- a/src/api/submitMarketOrder.js
+++ b/src/api/submitMarketOrder.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const { Joi } = require('@rhino.fi/dvf-utils')
 /*
 Keeping the schema visible and not in a seperate method
@@ -30,7 +30,7 @@ const schema = Joi.object({
 module.exports = async (dvf, orderData) => {
   const { value, error } = schema.validate(orderData)
   // TODO handle error
-  return post(dvf.config.api + '/v1/trading/w/submitOrder', {
+  return request.post(dvf.config.api + '/v1/trading/w/submitOrder', {
     json: await dvf.createMarketOrderPayload(value)
   })
 }
diff --git a/src/api/submitOrder.js b/src/api/submitOrder.js
index 7d8b5854..6acd0728 100644
--- a/src/api/submitOrder.js
+++ b/src/api/submitOrder.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const DVFError = require('../lib/dvf/DVFError')
 const { Joi } = require('@rhino.fi/dvf-utils')
 const P = require('@rhino.fi/aigle')
@@ -67,5 +67,5 @@ module.exports = async (dvf, orderData) => {
       : dvf.createOrderPayload(value)
   )
 
-  return post(dvf.config.api + '/v1/trading/w/submitOrder', { json })
+  return request.post(dvf.config.api + '/v1/trading/w/submitOrder', { json })
 }
diff --git a/src/api/transferUsingVaultIdAndStarkKey.js b/src/api/transferUsingVaultIdAndStarkKey.js
index bf9f3d01..0f607fe0 100644
--- a/src/api/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/transferUsingVaultIdAndStarkKey.js
@@ -1,8 +1,8 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 
 module.exports = async (dvf, transferData, feeRecipient) => {
   const url = dvf.config.api + '/v1/trading/w/transfer'
 
   const json = await dvf.createTransferPayload(transferData, feeRecipient)
-  return post(url, { json })
+  return request.post(url, { json })
 }
diff --git a/src/api/withdraw.js b/src/api/withdraw.js
index 9759b608..6ba4f7f4 100644
--- a/src/api/withdraw.js
+++ b/src/api/withdraw.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const DVFError = require('../lib/dvf/DVFError')
 const validateAssertions = require('../lib/validators/validateAssertions')
 const { Joi } = require('@rhino.fi/dvf-utils')
@@ -55,5 +55,5 @@ module.exports = async (dvf, token, amount, starkPrivateKey) => {
     expireTime
   }
   //console.log({ data })
-  return post(url, { json: data })
+  return request.post(url, { json: data })
 }
diff --git a/src/lib/dvf/post-generic.js b/src/lib/dvf/post-generic.js
index a08fdce1..156d4ab1 100644
--- a/src/lib/dvf/post-generic.js
+++ b/src/lib/dvf/post-generic.js
@@ -1,4 +1,4 @@
-const { post } = require('request-promise')
+const { request } = require('@rhino.fi/dvf-utils')
 const _omitBy = require('lodash/omitBy')
 const _isNil = require('lodash/isNil')
 
@@ -12,5 +12,5 @@ module.exports = async (dvf, endpoint, json = {}, headers = {}) => {
     json: _omitBy(json, _isNil)
   }
 
-  return post(options)
+  return request.post(options)
 }

From fc49b7983a47412a5fdc1e56e64572cf5a5e7fa2 Mon Sep 17 00:00:00 2001
From: Dean Selvey <deanselvey@gmail.com>
Date: Thu, 31 Aug 2023 09:47:05 +0100
Subject: [PATCH 2/8] changed to use post and get generic

---
 src/api/deposit.js                                | 5 +++--
 src/api/estimatedNextBatchTime.js                 | 4 ++--
 src/api/eth/getGasStationPrice.js                 | 4 ++--
 src/api/fastWithdrawal.js                         | 4 ++--
 src/api/fastWithdrawalFee.js                      | 4 ++--
 src/api/getConfig.js                              | 4 ++--
 src/api/getGasPrice.js                            | 4 ++--
 src/api/getTickers.js                             | 4 ++--
 src/api/getTokenHolders.js                        | 5 +++--
 src/api/getTokenLiquidityLeft.js                  | 5 +++--
 src/api/getTokenSaleStartEnd.js                   | 5 +++--
 src/api/ledger/deposit.js                         | 4 ++--
 src/api/ledger/transferUsingVaultIdAndStarkKey.js | 4 ++--
 src/api/ledger/withdraw.js                        | 4 ++--
 src/api/submitMarketOrder.js                      | 4 ++--
 src/api/submitOrder.js                            | 4 ++--
 src/api/transferUsingVaultIdAndStarkKey.js        | 4 ++--
 src/api/withdraw.js                               | 4 ++--
 18 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/api/deposit.js b/src/api/deposit.js
index cee2e19b..f3456277 100644
--- a/src/api/deposit.js
+++ b/src/api/deposit.js
@@ -1,4 +1,5 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
+
 const DVFError = require('../lib/dvf/DVFError')
 const validateAssertions = require('../lib/validators/validateAssertions')
 
@@ -51,7 +52,7 @@ module.exports = async (dvf, token, amount, starkPrivateKey, nonce, signature) =
 
   await dvf.contract.approve(token, dvf.token.toBaseUnitAmount(token, amount), dvf.config.DVF.starkExContractAddress, 'ETHEREUM')
 
-  const depositResponse = await request.post(url, { json: data })
+  const depositResponse = await post(dvf, url, { json: data })
 
   const { status, transactionHash } = await dvf.contract.deposit(
     tempVaultId,
diff --git a/src/api/estimatedNextBatchTime.js b/src/api/estimatedNextBatchTime.js
index 29adc557..9d0bc454 100644
--- a/src/api/estimatedNextBatchTime.js
+++ b/src/api/estimatedNextBatchTime.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async dvf => {
   // avoid browser cache with timestamp as querystring
@@ -6,7 +6,7 @@ module.exports = async dvf => {
 
   const url = `${dvf.config.api}/v1/trading/r/estimatedNextBatchTime?t=${t}`
   try {
-    const data = await request.get(url)
+    const data = await get(dvf, url)
     return JSON.parse(data)
   }
   catch(e) {
diff --git a/src/api/eth/getGasStationPrice.js b/src/api/eth/getGasStationPrice.js
index 972c796a..7729db6e 100644
--- a/src/api/eth/getGasStationPrice.js
+++ b/src/api/eth/getGasStationPrice.js
@@ -1,11 +1,11 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../../lib/dvf/get-generic')
 /**
  * Provides a safe average gas price
  */
 
 module.exports = async (dvf)  => {
   try {
-    const res = await request.get(`${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
+    const res = await get(dvf, `${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
     dvf.config.defaultGasPrice = parseInt((JSON.parse(res).average * 1.25 *100000000))
   } catch(e)  {
     console.log('Error getting safe gas priec, using default ', e)
diff --git a/src/api/fastWithdrawal.js b/src/api/fastWithdrawal.js
index 4e4fb202..12368851 100644
--- a/src/api/fastWithdrawal.js
+++ b/src/api/fastWithdrawal.js
@@ -1,7 +1,7 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 
 module.exports = async (dvf, withdrawalData) => {
   const url = dvf.config.api + '/v1/trading/w/fastWithdrawal'
   const json = await dvf.createFastWithdrawalPayload(withdrawalData)
-  return request.post(url, { json })
+  return post(dvf, url, { json })
 }
diff --git a/src/api/fastWithdrawalFee.js b/src/api/fastWithdrawalFee.js
index 179b0e79..51017d47 100644
--- a/src/api/fastWithdrawalFee.js
+++ b/src/api/fastWithdrawalFee.js
@@ -1,7 +1,7 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 // TODO: Deprecated (CHAIN-719)
 module.exports = async (dvf, token) => {
   const url = dvf.config.api + '/v1/trading/r/fastWithdrawalFee'
-  return request.get(url, { json: true, qs: { token } })
+  return get(dvf, url, { json: true, qs: { token } })
 }
diff --git a/src/api/getConfig.js b/src/api/getConfig.js
index bc49a7e5..b82015b9 100644
--- a/src/api/getConfig.js
+++ b/src/api/getConfig.js
@@ -1,9 +1,9 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 
 module.exports = async dvf => {
   const url = dvf.config.api + '/v1/trading/r/getConf'
   try {
-    const exchangeConf = await request.post(url, { json: {} })
+    const exchangeConf = await post(dvf, url, { json: {} })
     dvf.config = Object.assign({}, dvf.config, exchangeConf)
     return exchangeConf
   } catch (error) {
diff --git a/src/api/getGasPrice.js b/src/api/getGasPrice.js
index c0bda05e..6e97c7be 100644
--- a/src/api/getGasPrice.js
+++ b/src/api/getGasPrice.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf) => {
   const defaultGasPrice = dvf.config.defaultGasPrice
@@ -8,7 +8,7 @@ module.exports = async (dvf) => {
   const url = dvf.config.api + endpoint
 
   try {
-    const newGasPrice = await request.get(url, { json: true })
+    const newGasPrice = await get(dvf, url, { json: true })
     dvf.config.defaultGasPrice = newGasPrice.fast || dvf.config.defaultGasPrice
     return newGasPrice ||  oldGasPrice
   }
diff --git a/src/api/getTickers.js b/src/api/getTickers.js
index ae9f035c..79cc9fd3 100644
--- a/src/api/getTickers.js
+++ b/src/api/getTickers.js
@@ -1,10 +1,10 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, symbols) => {
   if (symbols.constructor !== Array) {
     symbols = [symbols]
   }
 
-  const response = await request.get(`${dvf.config.api}/market-data/tickers?symbols=${symbols.join(',')}`)
+  const response = await get(dvf, `${dvf.config.api}/market-data/tickers?symbols=${symbols.join(',')}`)
   return JSON.parse(response)
 }
diff --git a/src/api/getTokenHolders.js b/src/api/getTokenHolders.js
index 07824e1f..76770c5e 100644
--- a/src/api/getTokenHolders.js
+++ b/src/api/getTokenHolders.js
@@ -1,8 +1,9 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await request.get(
+    const response = await get(
+      dvf,
       `${dvf.config.api}/v1/trading/r/getTokenHolders?token=${token}`
     )
     return response
diff --git a/src/api/getTokenLiquidityLeft.js b/src/api/getTokenLiquidityLeft.js
index f98160fa..9f23060e 100644
--- a/src/api/getTokenLiquidityLeft.js
+++ b/src/api/getTokenLiquidityLeft.js
@@ -1,8 +1,9 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await request.get(
+    const response = await get(
+      dvf,
       `${dvf.config.api}/v1/trading/r/getTokenLiquidityLeft?token=${token}`
     )
     return response
diff --git a/src/api/getTokenSaleStartEnd.js b/src/api/getTokenSaleStartEnd.js
index f935eca3..6ad94e0e 100644
--- a/src/api/getTokenSaleStartEnd.js
+++ b/src/api/getTokenSaleStartEnd.js
@@ -1,8 +1,9 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await request.get(
+    const response = await get(
+      dvf,
       `${dvf.config.api}/v1/trading/r/getTokenSaleStartEnd?token=${token}`
     )
     return response
diff --git a/src/api/ledger/deposit.js b/src/api/ledger/deposit.js
index 06aec592..586e64ce 100644
--- a/src/api/ledger/deposit.js
+++ b/src/api/ledger/deposit.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../../lib/dvf/post-generic')
 const validateAssertions = require('../../lib/validators/validateAssertions')
 
 module.exports = async (dvf, token, amount, path, nonce, signature) => {
@@ -19,7 +19,7 @@ module.exports = async (dvf, token, amount, path, nonce, signature) => {
 
   const url = dvf.config.api + '/v1/trading/w/deposit'
 
-  const deposit = await request.post(url, {json: data})
+  const deposit = await post(dvf, url, {json: data})
   const ctDeposit = await dvf.contract.deposit(tempVaultId, token, amount, `0x${starkDeposit.starkPublicKey.x}`)
 
   return {...deposit, ...ctDeposit}
diff --git a/src/api/ledger/transferUsingVaultIdAndStarkKey.js b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
index 15b2ccff..d064e193 100644
--- a/src/api/ledger/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
@@ -1,9 +1,9 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../../lib/dvf/post-generic')
 const makeCreateSignedTransferTxLedger = require('../../lib/ledger/makeCreateSignedTransferTxLedger')
 
 module.exports = async (dvf, transferData, path, feeRecipient) => {
   const url = dvf.config.api + '/v1/trading/w/transfer'
   const createSignedTransferTx = makeCreateSignedTransferTxLedger(dvf)(path)
   const json = await dvf.createTransferPayload(transferData, feeRecipient, createSignedTransferTx)
-  return request.post(url, { json })
+  return post(dvf, url, { json })
 }
diff --git a/src/api/ledger/withdraw.js b/src/api/ledger/withdraw.js
index 1fefb148..982dee3c 100644
--- a/src/api/ledger/withdraw.js
+++ b/src/api/ledger/withdraw.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../../lib/dvf/post-generic')
 const validateAssertions = require('../../lib/validators/validateAssertions')
 
 module.exports = async (dvf, token, amount, starkWithdrawal) => {
@@ -31,7 +31,7 @@ module.exports = async (dvf, token, amount, starkWithdrawal) => {
   //console.log({ data })
   const url = dvf.config.api + '/v1/trading/w/withdraw'
   
-  return request.post(url, {
+  return post(dvf, url, {
     json: data
   })
 }
diff --git a/src/api/submitMarketOrder.js b/src/api/submitMarketOrder.js
index 8f6c1748..7a9a2e54 100644
--- a/src/api/submitMarketOrder.js
+++ b/src/api/submitMarketOrder.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 const { Joi } = require('@rhino.fi/dvf-utils')
 /*
 Keeping the schema visible and not in a seperate method
@@ -30,7 +30,7 @@ const schema = Joi.object({
 module.exports = async (dvf, orderData) => {
   const { value, error } = schema.validate(orderData)
   // TODO handle error
-  return request.post(dvf.config.api + '/v1/trading/w/submitOrder', {
+  return post(dvf, dvf.config.api + '/v1/trading/w/submitOrder', {
     json: await dvf.createMarketOrderPayload(value)
   })
 }
diff --git a/src/api/submitOrder.js b/src/api/submitOrder.js
index 6acd0728..dc30b768 100644
--- a/src/api/submitOrder.js
+++ b/src/api/submitOrder.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 const DVFError = require('../lib/dvf/DVFError')
 const { Joi } = require('@rhino.fi/dvf-utils')
 const P = require('@rhino.fi/aigle')
@@ -67,5 +67,5 @@ module.exports = async (dvf, orderData) => {
       : dvf.createOrderPayload(value)
   )
 
-  return request.post(dvf.config.api + '/v1/trading/w/submitOrder', { json })
+  return post(dvf, dvf.config.api + '/v1/trading/w/submitOrder', { json })
 }
diff --git a/src/api/transferUsingVaultIdAndStarkKey.js b/src/api/transferUsingVaultIdAndStarkKey.js
index 0f607fe0..dbcccec5 100644
--- a/src/api/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/transferUsingVaultIdAndStarkKey.js
@@ -1,8 +1,8 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 
 module.exports = async (dvf, transferData, feeRecipient) => {
   const url = dvf.config.api + '/v1/trading/w/transfer'
 
   const json = await dvf.createTransferPayload(transferData, feeRecipient)
-  return request.post(url, { json })
+  return post(dvf, url, { json })
 }
diff --git a/src/api/withdraw.js b/src/api/withdraw.js
index 6ba4f7f4..9fa52730 100644
--- a/src/api/withdraw.js
+++ b/src/api/withdraw.js
@@ -1,4 +1,4 @@
-const { request } = require('@rhino.fi/dvf-utils')
+const post = require('../lib/dvf/post-generic')
 const DVFError = require('../lib/dvf/DVFError')
 const validateAssertions = require('../lib/validators/validateAssertions')
 const { Joi } = require('@rhino.fi/dvf-utils')
@@ -55,5 +55,5 @@ module.exports = async (dvf, token, amount, starkPrivateKey) => {
     expireTime
   }
   //console.log({ data })
-  return request.post(url, { json: data })
+  return post(dvf, url, { json: data })
 }

From 682c4fe55c4a5eaf4c764e04bde142ae96972a24 Mon Sep 17 00:00:00 2001
From: Dean Selvey <deanselvey@gmail.com>
Date: Thu, 31 Aug 2023 11:08:07 +0100
Subject: [PATCH 3/8] changes related to use of request from dvf utils

---
 src/api/deposit.js                                |  2 +-
 src/api/estimatedNextBatchTime.js                 | 11 ++---------
 src/api/eth/getGasStationPrice.js                 |  4 ++--
 src/api/fastWithdrawal.js                         |  2 +-
 src/api/fastWithdrawalFee.js                      |  2 +-
 src/api/getConfig.js                              |  2 +-
 src/api/getGasPrice.js                            |  3 +--
 src/api/getTickers.js                             |  3 +--
 src/api/getTokenHolders.js                        |  5 ++---
 src/api/getTokenLiquidityLeft.js                  |  5 ++---
 src/api/getTokenSaleStartEnd.js                   |  2 +-
 src/api/ledger/deposit.js                         |  2 +-
 src/api/ledger/transferUsingVaultIdAndStarkKey.js |  2 +-
 src/api/ledger/withdraw.js                        |  3 +--
 src/api/submitMarketOrder.js                      |  2 +-
 src/api/submitOrder.js                            |  2 +-
 src/api/transferUsingVaultIdAndStarkKey.js        |  2 +-
 src/api/withdraw.js                               |  2 +-
 src/lib/dvf/post-generic.js                       |  7 +++----
 19 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/src/api/deposit.js b/src/api/deposit.js
index f3456277..8023ef73 100644
--- a/src/api/deposit.js
+++ b/src/api/deposit.js
@@ -37,7 +37,7 @@ module.exports = async (dvf, token, amount, starkPrivateKey, nonce, signature) =
 
   const starkSignature = dvf.stark.sign(starkKeyPair, starkMessage)
 
-  const url = dvf.config.api + '/v1/trading/w/deposit'
+  const url = '/v1/trading/w/deposit'
 
   const data = {
     token,
diff --git a/src/api/estimatedNextBatchTime.js b/src/api/estimatedNextBatchTime.js
index 9d0bc454..8e7822ff 100644
--- a/src/api/estimatedNextBatchTime.js
+++ b/src/api/estimatedNextBatchTime.js
@@ -3,13 +3,6 @@ const get = require('../lib/dvf/get-generic')
 module.exports = async dvf => {
   // avoid browser cache with timestamp as querystring
   const t = Date.now()
-
-  const url = `${dvf.config.api}/v1/trading/r/estimatedNextBatchTime?t=${t}`
-  try {
-    const data = await get(dvf, url)
-    return JSON.parse(data)
-  }
-  catch(e) {
-    return null;
-  }
+  const url = `/v1/trading/r/estimatedNextBatchTime?t=${t}`
+  return get(dvf, url)
 }
diff --git a/src/api/eth/getGasStationPrice.js b/src/api/eth/getGasStationPrice.js
index 7729db6e..972c796a 100644
--- a/src/api/eth/getGasStationPrice.js
+++ b/src/api/eth/getGasStationPrice.js
@@ -1,11 +1,11 @@
-const get = require('../../lib/dvf/get-generic')
+const { request } = require('@rhino.fi/dvf-utils')
 /**
  * Provides a safe average gas price
  */
 
 module.exports = async (dvf)  => {
   try {
-    const res = await get(dvf, `${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
+    const res = await request.get(`${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
     dvf.config.defaultGasPrice = parseInt((JSON.parse(res).average * 1.25 *100000000))
   } catch(e)  {
     console.log('Error getting safe gas priec, using default ', e)
diff --git a/src/api/fastWithdrawal.js b/src/api/fastWithdrawal.js
index 12368851..ac9b00d0 100644
--- a/src/api/fastWithdrawal.js
+++ b/src/api/fastWithdrawal.js
@@ -1,7 +1,7 @@
 const post = require('../lib/dvf/post-generic')
 
 module.exports = async (dvf, withdrawalData) => {
-  const url = dvf.config.api + '/v1/trading/w/fastWithdrawal'
+  const url = '/v1/trading/w/fastWithdrawal'
   const json = await dvf.createFastWithdrawalPayload(withdrawalData)
   return post(dvf, url, { json })
 }
diff --git a/src/api/fastWithdrawalFee.js b/src/api/fastWithdrawalFee.js
index 51017d47..0aeccb02 100644
--- a/src/api/fastWithdrawalFee.js
+++ b/src/api/fastWithdrawalFee.js
@@ -2,6 +2,6 @@ const get = require('../lib/dvf/get-generic')
 
 // TODO: Deprecated (CHAIN-719)
 module.exports = async (dvf, token) => {
-  const url = dvf.config.api + '/v1/trading/r/fastWithdrawalFee'
+  const url = '/v1/trading/r/fastWithdrawalFee'
   return get(dvf, url, { json: true, qs: { token } })
 }
diff --git a/src/api/getConfig.js b/src/api/getConfig.js
index b82015b9..8e9de8fc 100644
--- a/src/api/getConfig.js
+++ b/src/api/getConfig.js
@@ -1,7 +1,7 @@
 const post = require('../lib/dvf/post-generic')
 
 module.exports = async dvf => {
-  const url = dvf.config.api + '/v1/trading/r/getConf'
+  const url = '/v1/trading/r/getConf'
   try {
     const exchangeConf = await post(dvf, url, { json: {} })
     dvf.config = Object.assign({}, dvf.config, exchangeConf)
diff --git a/src/api/getGasPrice.js b/src/api/getGasPrice.js
index 6e97c7be..8b12c933 100644
--- a/src/api/getGasPrice.js
+++ b/src/api/getGasPrice.js
@@ -4,8 +4,7 @@ module.exports = async (dvf) => {
   const defaultGasPrice = dvf.config.defaultGasPrice
   const oldGasPrice = { fast: defaultGasPrice * 1.2, average: defaultGasPrice * 0.9, cheap: defaultGasPrice * 0.8 }
 
-  const endpoint = '/v1/trading/r/getGasPrice'
-  const url = dvf.config.api + endpoint
+  const url = '/v1/trading/r/getGasPrice'
 
   try {
     const newGasPrice = await get(dvf, url, { json: true })
diff --git a/src/api/getTickers.js b/src/api/getTickers.js
index 79cc9fd3..09db7150 100644
--- a/src/api/getTickers.js
+++ b/src/api/getTickers.js
@@ -5,6 +5,5 @@ module.exports = async (dvf, symbols) => {
     symbols = [symbols]
   }
 
-  const response = await get(dvf, `${dvf.config.api}/market-data/tickers?symbols=${symbols.join(',')}`)
-  return JSON.parse(response)
+  return get(dvf, `/market-data/tickers?symbols=${symbols.join(',')}`)
 }
diff --git a/src/api/getTokenHolders.js b/src/api/getTokenHolders.js
index 76770c5e..e7e5d9e4 100644
--- a/src/api/getTokenHolders.js
+++ b/src/api/getTokenHolders.js
@@ -2,11 +2,10 @@ const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    return get(
       dvf,
-      `${dvf.config.api}/v1/trading/r/getTokenHolders?token=${token}`
+      `/v1/trading/r/getTokenHolders?token=${token}`
     )
-    return response
   }
   return null
 }
diff --git a/src/api/getTokenLiquidityLeft.js b/src/api/getTokenLiquidityLeft.js
index 9f23060e..33edbb3d 100644
--- a/src/api/getTokenLiquidityLeft.js
+++ b/src/api/getTokenLiquidityLeft.js
@@ -2,11 +2,10 @@ const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    return get(
       dvf,
-      `${dvf.config.api}/v1/trading/r/getTokenLiquidityLeft?token=${token}`
+      `/v1/trading/r/getTokenLiquidityLeft?token=${token}`
     )
-    return response
   }
   return null
 }
diff --git a/src/api/getTokenSaleStartEnd.js b/src/api/getTokenSaleStartEnd.js
index 6ad94e0e..f944c02a 100644
--- a/src/api/getTokenSaleStartEnd.js
+++ b/src/api/getTokenSaleStartEnd.js
@@ -4,7 +4,7 @@ module.exports = async (dvf, token) => {
   if (token) {
     const response = await get(
       dvf,
-      `${dvf.config.api}/v1/trading/r/getTokenSaleStartEnd?token=${token}`
+      `/v1/trading/r/getTokenSaleStartEnd?token=${token}`
     )
     return response
   }
diff --git a/src/api/ledger/deposit.js b/src/api/ledger/deposit.js
index 586e64ce..170bc01d 100644
--- a/src/api/ledger/deposit.js
+++ b/src/api/ledger/deposit.js
@@ -17,7 +17,7 @@ module.exports = async (dvf, token, amount, path, nonce, signature) => {
     starkPublicKey: starkDeposit.starkPublicKey
   }
 
-  const url = dvf.config.api + '/v1/trading/w/deposit'
+  const url = '/v1/trading/w/deposit'
 
   const deposit = await post(dvf, url, {json: data})
   const ctDeposit = await dvf.contract.deposit(tempVaultId, token, amount, `0x${starkDeposit.starkPublicKey.x}`)
diff --git a/src/api/ledger/transferUsingVaultIdAndStarkKey.js b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
index d064e193..f86d7466 100644
--- a/src/api/ledger/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
@@ -2,7 +2,7 @@ const post = require('../../lib/dvf/post-generic')
 const makeCreateSignedTransferTxLedger = require('../../lib/ledger/makeCreateSignedTransferTxLedger')
 
 module.exports = async (dvf, transferData, path, feeRecipient) => {
-  const url = dvf.config.api + '/v1/trading/w/transfer'
+  const url = '/v1/trading/w/transfer'
   const createSignedTransferTx = makeCreateSignedTransferTxLedger(dvf)(path)
   const json = await dvf.createTransferPayload(transferData, feeRecipient, createSignedTransferTx)
   return post(dvf, url, { json })
diff --git a/src/api/ledger/withdraw.js b/src/api/ledger/withdraw.js
index 982dee3c..428f98c6 100644
--- a/src/api/ledger/withdraw.js
+++ b/src/api/ledger/withdraw.js
@@ -28,8 +28,7 @@ module.exports = async (dvf, token, amount, starkWithdrawal) => {
     expireTime
   }
 
-  //console.log({ data })
-  const url = dvf.config.api + '/v1/trading/w/withdraw'
+  const url = '/v1/trading/w/withdraw'
   
   return post(dvf, url, {
     json: data
diff --git a/src/api/submitMarketOrder.js b/src/api/submitMarketOrder.js
index 7a9a2e54..ecd482fe 100644
--- a/src/api/submitMarketOrder.js
+++ b/src/api/submitMarketOrder.js
@@ -30,7 +30,7 @@ const schema = Joi.object({
 module.exports = async (dvf, orderData) => {
   const { value, error } = schema.validate(orderData)
   // TODO handle error
-  return post(dvf, dvf.config.api + '/v1/trading/w/submitOrder', {
+  return post(dvf, '/v1/trading/w/submitOrder', {
     json: await dvf.createMarketOrderPayload(value)
   })
 }
diff --git a/src/api/submitOrder.js b/src/api/submitOrder.js
index dc30b768..5843e6df 100644
--- a/src/api/submitOrder.js
+++ b/src/api/submitOrder.js
@@ -67,5 +67,5 @@ module.exports = async (dvf, orderData) => {
       : dvf.createOrderPayload(value)
   )
 
-  return post(dvf, dvf.config.api + '/v1/trading/w/submitOrder', { json })
+  return post(dvf, '/v1/trading/w/submitOrder', { json })
 }
diff --git a/src/api/transferUsingVaultIdAndStarkKey.js b/src/api/transferUsingVaultIdAndStarkKey.js
index dbcccec5..fb644c25 100644
--- a/src/api/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/transferUsingVaultIdAndStarkKey.js
@@ -1,7 +1,7 @@
 const post = require('../lib/dvf/post-generic')
 
 module.exports = async (dvf, transferData, feeRecipient) => {
-  const url = dvf.config.api + '/v1/trading/w/transfer'
+  const url = '/v1/trading/w/transfer'
 
   const json = await dvf.createTransferPayload(transferData, feeRecipient)
   return post(dvf, url, { json })
diff --git a/src/api/withdraw.js b/src/api/withdraw.js
index 9fa52730..eeb549b8 100644
--- a/src/api/withdraw.js
+++ b/src/api/withdraw.js
@@ -43,7 +43,7 @@ module.exports = async (dvf, token, amount, starkPrivateKey) => {
 
   const starkSignature = dvf.stark.sign(starkKeyPair, starkMessage)
 
-  const url = dvf.config.api + '/v1/trading/w/withdraw'
+  const url = '/v1/trading/w/withdraw'
 
   const data = {
     token,
diff --git a/src/lib/dvf/post-generic.js b/src/lib/dvf/post-generic.js
index 156d4ab1..ccd8d908 100644
--- a/src/lib/dvf/post-generic.js
+++ b/src/lib/dvf/post-generic.js
@@ -6,11 +6,10 @@ module.exports = async (dvf, endpoint, json = {}, headers = {}) => {
   const url = dvf.config.api + endpoint
 
   const options = {
-    uri: url,
     headers,
     // removes null and undefined values
-    json: _omitBy(json, _isNil)
+    data: _omitBy(json, _isNil)
   }
 
-  return request.post(options)
-}
+  return request.post(url, options)
+}
\ No newline at end of file

From bccda574d2366fd666189c0aee580c17967c9999 Mon Sep 17 00:00:00 2001
From: Dean Selvey <deanselvey@gmail.com>
Date: Thu, 31 Aug 2023 11:09:54 +0100
Subject: [PATCH 4/8] removed parsing of response as not required

---
 src/api/eth/getGasStationPrice.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/eth/getGasStationPrice.js b/src/api/eth/getGasStationPrice.js
index 972c796a..a86a89d2 100644
--- a/src/api/eth/getGasStationPrice.js
+++ b/src/api/eth/getGasStationPrice.js
@@ -6,7 +6,7 @@ const { request } = require('@rhino.fi/dvf-utils')
 module.exports = async (dvf)  => {
   try {
     const res = await request.get(`${dvf.config.gasApi}/json/ethgasAPI.json?api-key=${dvf.config.gasStationApiKey || ''}`)
-    dvf.config.defaultGasPrice = parseInt((JSON.parse(res).average * 1.25 *100000000))
+    dvf.config.defaultGasPrice = parseInt((res.average * 1.25 *100000000))
   } catch(e)  {
     console.log('Error getting safe gas priec, using default ', e)
   }

From 37433fdf4e04b2219779e65545d8a486215a337a Mon Sep 17 00:00:00 2001
From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Thu, 31 Aug 2023 12:56:50 +0200
Subject: [PATCH 5/8] [PI-387] fix submitOrder

---
 src/api/submitOrder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/submitOrder.js b/src/api/submitOrder.js
index 5843e6df..a5b3805d 100644
--- a/src/api/submitOrder.js
+++ b/src/api/submitOrder.js
@@ -67,5 +67,5 @@ module.exports = async (dvf, orderData) => {
       : dvf.createOrderPayload(value)
   )
 
-  return post(dvf, '/v1/trading/w/submitOrder', { json })
+  return post(dvf, '/v1/trading/w/submitOrder', json)
 }

From e10df9752ae908d1f4aa7cc7b750850667ba767f Mon Sep 17 00:00:00 2001
From: Dean Selvey <deanselvey@gmail.com>
Date: Thu, 31 Aug 2023 13:29:15 +0100
Subject: [PATCH 6/8] issue params when using post/get generic

---
 src/api/deposit.js                                | 2 +-
 src/api/fastWithdrawal.js                         | 2 +-
 src/api/fastWithdrawalFee.js                      | 2 +-
 src/api/getConfig.js                              | 2 +-
 src/api/getGasPrice.js                            | 2 +-
 src/api/getTokenSaleStartEnd.js                   | 3 +--
 src/api/ledger/deposit.js                         | 2 +-
 src/api/ledger/transferUsingVaultIdAndStarkKey.js | 2 +-
 src/api/ledger/withdraw.js                        | 4 +---
 src/api/submitMarketOrder.js                      | 5 ++---
 src/api/submitOrder.js                            | 2 +-
 src/api/transferUsingVaultIdAndStarkKey.js        | 2 +-
 src/api/withdraw.js                               | 2 +-
 13 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/api/deposit.js b/src/api/deposit.js
index 8023ef73..24e46638 100644
--- a/src/api/deposit.js
+++ b/src/api/deposit.js
@@ -52,7 +52,7 @@ module.exports = async (dvf, token, amount, starkPrivateKey, nonce, signature) =
 
   await dvf.contract.approve(token, dvf.token.toBaseUnitAmount(token, amount), dvf.config.DVF.starkExContractAddress, 'ETHEREUM')
 
-  const depositResponse = await post(dvf, url, { json: data })
+  const depositResponse = await post(dvf, url, data)
 
   const { status, transactionHash } = await dvf.contract.deposit(
     tempVaultId,
diff --git a/src/api/fastWithdrawal.js b/src/api/fastWithdrawal.js
index ac9b00d0..e15c5b8a 100644
--- a/src/api/fastWithdrawal.js
+++ b/src/api/fastWithdrawal.js
@@ -3,5 +3,5 @@ const post = require('../lib/dvf/post-generic')
 module.exports = async (dvf, withdrawalData) => {
   const url = '/v1/trading/w/fastWithdrawal'
   const json = await dvf.createFastWithdrawalPayload(withdrawalData)
-  return post(dvf, url, { json })
+  return post(dvf, url, json)
 }
diff --git a/src/api/fastWithdrawalFee.js b/src/api/fastWithdrawalFee.js
index 0aeccb02..c3275a4b 100644
--- a/src/api/fastWithdrawalFee.js
+++ b/src/api/fastWithdrawalFee.js
@@ -3,5 +3,5 @@ const get = require('../lib/dvf/get-generic')
 // TODO: Deprecated (CHAIN-719)
 module.exports = async (dvf, token) => {
   const url = '/v1/trading/r/fastWithdrawalFee'
-  return get(dvf, url, { json: true, qs: { token } })
+  return get(dvf, url, { token })
 }
diff --git a/src/api/getConfig.js b/src/api/getConfig.js
index 8e9de8fc..fa0d1bc3 100644
--- a/src/api/getConfig.js
+++ b/src/api/getConfig.js
@@ -3,7 +3,7 @@ const post = require('../lib/dvf/post-generic')
 module.exports = async dvf => {
   const url = '/v1/trading/r/getConf'
   try {
-    const exchangeConf = await post(dvf, url, { json: {} })
+    const exchangeConf = await post(dvf, url)
     dvf.config = Object.assign({}, dvf.config, exchangeConf)
     return exchangeConf
   } catch (error) {
diff --git a/src/api/getGasPrice.js b/src/api/getGasPrice.js
index 8b12c933..d6929836 100644
--- a/src/api/getGasPrice.js
+++ b/src/api/getGasPrice.js
@@ -7,7 +7,7 @@ module.exports = async (dvf) => {
   const url = '/v1/trading/r/getGasPrice'
 
   try {
-    const newGasPrice = await get(dvf, url, { json: true })
+    const newGasPrice = await get(dvf, url)
     dvf.config.defaultGasPrice = newGasPrice.fast || dvf.config.defaultGasPrice
     return newGasPrice ||  oldGasPrice
   }
diff --git a/src/api/getTokenSaleStartEnd.js b/src/api/getTokenSaleStartEnd.js
index f944c02a..f7764ae3 100644
--- a/src/api/getTokenSaleStartEnd.js
+++ b/src/api/getTokenSaleStartEnd.js
@@ -2,11 +2,10 @@ const get = require('../lib/dvf/get-generic')
 
 module.exports = async (dvf, token) => {
   if (token) {
-    const response = await get(
+    return get(
       dvf,
       `/v1/trading/r/getTokenSaleStartEnd?token=${token}`
     )
-    return response
   }
   return null
 }
diff --git a/src/api/ledger/deposit.js b/src/api/ledger/deposit.js
index 170bc01d..b0c69ddb 100644
--- a/src/api/ledger/deposit.js
+++ b/src/api/ledger/deposit.js
@@ -19,7 +19,7 @@ module.exports = async (dvf, token, amount, path, nonce, signature) => {
 
   const url = '/v1/trading/w/deposit'
 
-  const deposit = await post(dvf, url, {json: data})
+  const deposit = await post(dvf, url, data)
   const ctDeposit = await dvf.contract.deposit(tempVaultId, token, amount, `0x${starkDeposit.starkPublicKey.x}`)
 
   return {...deposit, ...ctDeposit}
diff --git a/src/api/ledger/transferUsingVaultIdAndStarkKey.js b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
index f86d7466..328eaee1 100644
--- a/src/api/ledger/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/ledger/transferUsingVaultIdAndStarkKey.js
@@ -5,5 +5,5 @@ module.exports = async (dvf, transferData, path, feeRecipient) => {
   const url = '/v1/trading/w/transfer'
   const createSignedTransferTx = makeCreateSignedTransferTxLedger(dvf)(path)
   const json = await dvf.createTransferPayload(transferData, feeRecipient, createSignedTransferTx)
-  return post(dvf, url, { json })
+  return post(dvf, url, json)
 }
diff --git a/src/api/ledger/withdraw.js b/src/api/ledger/withdraw.js
index 428f98c6..a0a7cf5e 100644
--- a/src/api/ledger/withdraw.js
+++ b/src/api/ledger/withdraw.js
@@ -30,7 +30,5 @@ module.exports = async (dvf, token, amount, starkWithdrawal) => {
 
   const url = '/v1/trading/w/withdraw'
   
-  return post(dvf, url, {
-    json: data
-  })
+  return post(dvf, url, data)
 }
diff --git a/src/api/submitMarketOrder.js b/src/api/submitMarketOrder.js
index ecd482fe..139b09fe 100644
--- a/src/api/submitMarketOrder.js
+++ b/src/api/submitMarketOrder.js
@@ -30,7 +30,6 @@ const schema = Joi.object({
 module.exports = async (dvf, orderData) => {
   const { value, error } = schema.validate(orderData)
   // TODO handle error
-  return post(dvf, '/v1/trading/w/submitOrder', {
-    json: await dvf.createMarketOrderPayload(value)
-  })
+  const data = await dvf.createMarketOrderPayload(value)
+  return post(dvf, '/v1/trading/w/submitOrder', data)
 }
diff --git a/src/api/submitOrder.js b/src/api/submitOrder.js
index 5843e6df..a5b3805d 100644
--- a/src/api/submitOrder.js
+++ b/src/api/submitOrder.js
@@ -67,5 +67,5 @@ module.exports = async (dvf, orderData) => {
       : dvf.createOrderPayload(value)
   )
 
-  return post(dvf, '/v1/trading/w/submitOrder', { json })
+  return post(dvf, '/v1/trading/w/submitOrder', json)
 }
diff --git a/src/api/transferUsingVaultIdAndStarkKey.js b/src/api/transferUsingVaultIdAndStarkKey.js
index fb644c25..4f79587b 100644
--- a/src/api/transferUsingVaultIdAndStarkKey.js
+++ b/src/api/transferUsingVaultIdAndStarkKey.js
@@ -4,5 +4,5 @@ module.exports = async (dvf, transferData, feeRecipient) => {
   const url = '/v1/trading/w/transfer'
 
   const json = await dvf.createTransferPayload(transferData, feeRecipient)
-  return post(dvf, url, { json })
+  return post(dvf, url, json)
 }
diff --git a/src/api/withdraw.js b/src/api/withdraw.js
index eeb549b8..0568650a 100644
--- a/src/api/withdraw.js
+++ b/src/api/withdraw.js
@@ -55,5 +55,5 @@ module.exports = async (dvf, token, amount, starkPrivateKey) => {
     expireTime
   }
   //console.log({ data })
-  return post(dvf, url, { json: data })
+  return post(dvf, url, data)
 }

From 65b5e36c8b965518bf78e07e4ee819bfa46e4c2a Mon Sep 17 00:00:00 2001
From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Thu, 31 Aug 2023 15:21:37 +0200
Subject: [PATCH 7/8] [PI-387] add example for estimatedNextBatchTime

---
 examples/34.estimatedNextBatchTime.js | 51 +++++++++++++++++++++++++++
 examples/helpers/examplesList.js      |  1 +
 2 files changed, 52 insertions(+)
 create mode 100755 examples/34.estimatedNextBatchTime.js

diff --git a/examples/34.estimatedNextBatchTime.js b/examples/34.estimatedNextBatchTime.js
new file mode 100755
index 00000000..725d80af
--- /dev/null
+++ b/examples/34.estimatedNextBatchTime.js
@@ -0,0 +1,51 @@
+#!/usr/bin/env -S yarn node
+/* eslint-disable no-unused-vars */
+
+/*
+DO NOT EDIT THIS FILE BY HAND!
+Examples are generated using helpers/buildExamples.js script.
+Check README.md for more details.
+*/
+
+const sw = require('@rhino.fi/starkware-crypto')
+const getWeb3 = require('./helpers/getWeb3')
+
+const RhinofiClientFactory = require('../src')
+const envVars = require('./helpers/loadFromEnvOrConfig')(
+  process.env.CONFIG_FILE_NAME
+)
+const logExampleResult = require('./helpers/logExampleResult')(__filename)
+
+const ethPrivKey = envVars.ETH_PRIVATE_KEY
+// NOTE: you can also generate a new key using:`
+// const starkPrivKey = rhinofi.stark.createPrivateKey()
+const starkPrivKey = envVars.STARK_PRIVATE_KEY
+const rpcUrl = envVars.RPC_URL
+
+const { web3, provider } = getWeb3(ethPrivKey, rpcUrl)
+
+const rhinofiConfig = {
+  api: envVars.API_URL,
+  dataApi: envVars.DATA_API_URL,
+  useAuthHeader: true,
+  wallet: {
+    type: 'tradingKey',
+    meta: {
+      starkPrivateKey: starkPrivKey
+    }
+  }
+  // Add more variables to override default values
+}
+
+;(async () => {
+  const rhinofi = await RhinofiClientFactory(web3, rhinofiConfig)
+
+  const estimatedNextBatchTimeResponse = await rhinofi.estimatedNextBatchTime()
+
+  logExampleResult(estimatedNextBatchTimeResponse)
+
+})()
+.catch(error => {
+  console.error(error)
+  process.exit(1)
+})
diff --git a/examples/helpers/examplesList.js b/examples/helpers/examplesList.js
index ad5a922f..854ca78b 100644
--- a/examples/helpers/examplesList.js
+++ b/examples/helpers/examplesList.js
@@ -34,6 +34,7 @@ module.exports = Object.freeze([
   'transfer',
   'getRegistrationStatuses',
   'generateL1RegistrationPayload',
+  'estimatedNextBatchTime',
   // TODO
   // 'submitBuyOrder',
   // 'submitSellOrder',

From cf8c7c7ed6749ce43d8c0134cff3697164d5cb8e Mon Sep 17 00:00:00 2001
From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Thu, 31 Aug 2023 15:22:23 +0200
Subject: [PATCH 8/8] [PI-387] bump version 5.2.2 => 5.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93b03340..935f3420 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rhino.fi/client-js",
-  "version": "5.2.2",
+  "version": "5.3.0",
   "main": "src/index.js",
   "files": [
     "src",