chore(api): use neoscan for all api calls (#228)

* chore(api): use neoscan for all api calls

* chore(claim): exctract gas claim into shared function

* chore(balance): use relative path for shared pod file

src/browser/actions/makeClaimActions.js

@@ -1,28 +1,11 @@
 import { createActions } from 'spunky';
-import { api } from '@cityofzion/neon-js';
+
+import claimGas from 'shared/util/claimGas';
 
 import generateDAppActionId from './generateDAppActionId';
 
 export const ID = 'claim';
 
-const claimGas = async ({ net, address, wif }) => {
-  const config = {
-    net,
-    address,
-    privateKey: wif
-  };
-
-  api.setApiSwitch(1);
-  const { response: { result, txid } } = await api.claimGas(config);
-  api.setApiSwitch(0); // only temporarily use neonDB for gasClaims
-
-  if (!result) {
-    throw new Error('Claim failed.');
-  }
-
-  return txid;
-};
-
 export default function makeClaimActions(sessionId, requestId) {
   const id = generateDAppActionId(sessionId, `${ID}-${requestId}`);
 

src/browser/actions/makeStorageActions.js

@@ -14,7 +14,7 @@ const getStorage = async ({ net, scriptHash, key, encodeInput, decodeOutput }) =
     throw new Error(`Invalid key: "${key}"`);
   }
 
-  const endpoint = await api.loadBalance(api.getRPCEndpointFrom, { net });
+  const endpoint = await api.getRPCEndpointFrom({ net }, api.neoscan);
   const { result } =
     await rpc.Query.getStorage(scriptHash, encodeInput
       ? u.str2hexstring(key)

src/browser/actions/makeTestInvokeActions.js

@@ -20,7 +20,7 @@ const testInvoke = async ({ net, scriptHash, operation, args, encodeArgs }) => {
     throw new Error(`Invalid arguments: "${args}"`);
   }
 
-  const endpoint = await api.loadBalance(api.getRPCEndpointFrom, { net });
+  const endpoint = await api.getRPCEndpointFrom({ net }, api.neoscan);
   const script = createScript(scriptHash, operation, args, encodeArgs);
   const { result } = await rpc.Query.invokeScript(script).execute(endpoint);
 

src/shared/actions/balancesActions.js

@@ -1,6 +1,6 @@
 import { createActions } from 'spunky';
 
-import getBalances from 'shared/util/getBalances';
+import getBalances from '../util/getBalances';
 
 export const ID = 'balances';
 

src/shared/actions/claimActions.js

@@ -1,25 +1,8 @@
 import { createActions } from 'spunky';
-import { api } from '@cityofzion/neon-js';
 
-export const ID = 'claim';
-
-const claimGas = async ({ net, address, wif }) => {
-  const config = {
-    net,
-    address,
-    privateKey: wif
-  };
-
-  api.setApiSwitch(1);
-  const { response: { result, txid } } = await api.claimGas(config);
-  api.setApiSwitch(0); // only temporarily use neonDB for gasClaims
+import claimGas from '../util/claimGas';
 
-  if (!result) {
-    throw new Error('Claim failed.');
-  }
-
-  return txid;
-};
+export const ID = 'claim';
 
 export default createActions(ID, ({ net, address, wif }) => () => {
   return claimGas({ net, address, wif });

src/shared/util/claimGas.js

@@ -0,0 +1,17 @@
+import { api } from '@cityofzion/neon-js';
+
+export default async function claimGas({ net, address, wif }) {
+  const config = {
+    net,
+    address,
+    privateKey: wif
+  };
+
+  const { response: { result, txid } } = await api.claimGas(config, api.neoscan);
+
+  if (!result) {
+    throw new Error('Claim failed.');
+  }
+
+  return txid;
+}

src/shared/util/getBalances.js

@@ -29,10 +29,7 @@ export default async function getBalances({ net, address, tokens }) {
 
   // asset balances
   promises.push((async () => {
-    const assetBalances = await api.loadBalance(api.getBalanceFrom, {
-      net,
-      address
-    });
+    const assetBalances = await api.getBalanceFrom({ net, address }, api.neoscan);
 
     const { assets } = assetBalances.balance;
 

src/shared/util/sendAsset.js

@@ -26,7 +26,7 @@ export default async function sendAsset({ net, asset, amount, receiver, address,
     intents
   };
 
-  const { response: { result, txid } } = await api.sendAsset(config);
+  const { response: { result, txid } } = await api.sendAsset(config, api.neoscan);
 
   if (!result) {
     throw new Error('Invocation failed.');