@exodus/ethereum-api 6.3.7 → 6.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.7",
+  "version": "6.3.8",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,9 +16,9 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^3.3.26",
+    "@exodus/ethereum-lib": "^3.3.27",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
-    "@exodus/fetch": "^1.3.0-beta.3",
+    "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.1.3",
     "bn.js": "^5.2.1",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "23add284852287667fdf24d1c891915f4caa58bc"
+  "gitHead": "954b8bbebc920fcb88c87a949f7496b59e0379f7"
 }

package/src/etherscan/request.js

@@ -1,6 +1,6 @@
 import ms from 'ms'
 import makeConcurrent from 'make-concurrent'
-import { fetchival } from '@exodus/fetch'
+import fetchival from '@exodus/fetch/experimental/fetchival'
 
 const ETHERSCAN_API_URL = 'https://api.etherscan.io/api'
 const DEFAULT_ETHERSCAN_API_KEY = 'XM3VGRSNW1TMSIR14I9MVFP15X74GNHTRI'
@@ -13,8 +13,12 @@ export function setEtherscanApiKey(apiKey) {
 
 export default makeConcurrent(
   async function(isValidResponseCheck, module, action, params = {}) {
-    const queryParams = { ...params, module, action, apiKey: etherscanApiKey }
-    const data = await fetchival(ETHERSCAN_API_URL, { timeout: ms('15s') }).get(queryParams)
+    const data = await fetchival(new URL(ETHERSCAN_API_URL), { timeout: ms('15s') }).get({
+      ...params,
+      module,
+      action,
+      apiKey: etherscanApiKey,
+    })
     if (!isValidResponseCheck(data)) throw new Error(`Invalid response: ${JSON.stringify(data)}`)
     return data.result
   },

package/src/exodus-eth-server/api.js

@@ -23,7 +23,10 @@ export function create(defaultURL, ensAssetName) {
 
   async function request(module, params = {}, { version = 'v1', method = 'get' } = {}) {
     try {
-      return await fetchival(baseUrl(version), { timeout: ms('15s') })(module)[method](params)
+      return await fetchival(baseUrl(version), { timeout: ms('15s') })(module).method(
+        method,
+        params
+      )
     } catch (err) {
       let nerr = err
       if (err.response && err.response.status === 500) {

package/src/staking/staking-provider-client.js

@@ -1,5 +1,5 @@
 import assert from 'minimalistic-assert'
-import { fetchival } from '@exodus/fetch'
+import fetchival from '@exodus/fetch/experimental/fetchival'
 import ms from 'ms'
 
 const DEFAULT_STAKING_URL = 'https://staking.a.exodus.io'
@@ -8,20 +8,20 @@ const HTTP_POST_TIMEOUT = ms('30s')
 export const stakingProviderClientFactory = (defaultStakingUrl = DEFAULT_STAKING_URL) => {
   assert(defaultStakingUrl, '"defaultStakingUrl" must be provided')
 
-  let stakingUrl = defaultStakingUrl
+  let stakingUrl = new URL(defaultStakingUrl) // always should be an URL instance
 
   const assetValidators = {
     polygon: '0x3f4ce357b9d61d3b904492b8b5abc69c6c693720',
   }
 
   const setStakingUrl = (newStakingUrl) => {
-    stakingUrl = newStakingUrl || defaultStakingUrl
+    stakingUrl = new URL(newStakingUrl || defaultStakingUrl)
   }
 
   const stakingRequest = ({ asset, data }) => {
-    return fetchival(`${stakingUrl}/${asset}/stake`, {
+    return fetchival(stakingUrl, {
       timeout: HTTP_POST_TIMEOUT,
-    }).post(data)
+    })(asset)('stake').post(data)
   }
 
   const notifyActionFactory = ({ type }) => {