Merge pull request #438 from etclabscore/fix/update-service-runner

fix: update service runner client + eth client + core-geth

package.json

@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@etclabscore/eserialize": "^1.0.2",
-    "@etclabscore/ethereum-json-rpc": "1.2.2",
+    "@etclabscore/ethereum-json-rpc": "^1.3.13",
     "@etclabscore/ethereum-json-rpc-specification": "git+https://github.com/etclabscore/ethereum-json-rpc-specification.git",
-    "@etclabscore/jade-service-runner-client": "^1.9.0",
+    "@etclabscore/jade-service-runner-client": "^1.10.5",
     "@material-ui/core": "^4.5.2",
     "@material-ui/icons": "^4.5.1",
     "@material-ui/styles": "^4.5.2",

src/App.tsx

@@ -16,7 +16,7 @@ import Brightness3Icon from "@material-ui/icons/Brightness3";
 import NotesIcon from "@material-ui/icons/Notes";
 import WbSunnyIcon from "@material-ui/icons/WbSunny";
 import CodeIcon from "@material-ui/icons/Code";
-import ServiceRunner, { ObjectT84Ta8SE as IAvailableServices } from "@etclabscore/jade-service-runner-client";
+import ServiceRunner, { ObjectOfStringDoaGddGAStringVp8AIgHFStringDoaGddGAUnorderedSetOfObjectOfStringDoaGddGAStringDoaGddGAKieCSt44UIuKSje3YY1BLmC3 as IAvailableServices } from "@etclabscore/jade-service-runner-client"; //tslint:disable-line
 import availableServiceToNetwork from "./helpers/availableServiceToNetwork";
 
 import useInterval from "use-interval";
@@ -137,9 +137,9 @@ function App(props: any) {
     return re.test(q);
   };
 
-  const handleSearch = async (query: string | undefined) => {
-    if (query === undefined) { return; }
-    const q = query.trim();
+  const handleSearch = async (qry: string | undefined) => {
+    if (qry === undefined) { return; }
+    const q = qry.trim();
     if (isAddress(q)) {
       history.push(`/address/${q}`);
     }

src/components/AddressTransactions/AddressTransactions.tsx

@@ -3,7 +3,7 @@ import { Typography, IconButton, Grid } from "@material-ui/core";
 import { useTranslation } from "react-i18next";
 import TxList from "../TxList";
 import { ArrowBackIos, ArrowForwardIos } from "@material-ui/icons";
-import {ObjectUAh7GW7V as Transaction} from "@etclabscore/ethereum-json-rpc";
+import { Transaction } from "@etclabscore/ethereum-json-rpc";
 
 export interface IProps {
   transactions: Transaction[];
@@ -33,7 +33,7 @@ const AddressTransactions: React.FC<IProps> = (props) => {
       </Grid>
       <TxList transactions={props.transactions || []} showBlockNumber={true}></TxList>
       {(!props.transactions || props.transactions.length === 0) &&
-        <Grid container style={{padding: "15px"}}>
+        <Grid container style={{ padding: "15px" }}>
           <Typography>{t("No Transactions for this block range.")}</Typography>
         </Grid>
       }

src/components/BlockCard/BlockCard.tsx

@@ -3,7 +3,7 @@ import Link from "@material-ui/core/Link";
 import { Link as RouterLink } from "react-router-dom";
 import { Card, CardHeader, CardContent, Typography, Chip } from "@material-ui/core";
 import { hexToDate, hexToString, hexToNumber } from "@etclabscore/eserialize";
-import { GetBlockByNumberResult as IBlock } from "@etclabscore/ethereum-json-rpc";
+import { Block as IBlock } from "@etclabscore/ethereum-json-rpc";
 import { useTranslation } from "react-i18next";
 
 interface IProps {

src/components/TxRaw/TxRaw.tsx

@@ -3,10 +3,10 @@ import { useHistory } from "react-router-dom";
 import { Button, Typography } from "@material-ui/core";
 import Editor from "@monaco-editor/react";
 import useDarkMode from "use-dark-mode";
-import { ObjectUAh7GW7V as ITransaction} from "@etclabscore/ethereum-json-rpc";
+import { Transaction } from "@etclabscore/ethereum-json-rpc";
 
 interface IProps {
-  tx: ITransaction;
+  tx: Transaction;
   receipt: any;
 }
 
@@ -24,7 +24,7 @@ const TxRaw: React.FC<IProps> = (props) => {
         style={{ position: "absolute", right: "10px", top: "75px", zIndex: 1 }}
       >View Transaction</Button>
       <br />
-      <Typography variant="h5" gutterBottom style={{marginLeft: "10px"}}>Transaction</Typography>
+      <Typography variant="h5" gutterBottom style={{ marginLeft: "10px" }}>Transaction</Typography>
       <br />
       <Editor
         options={{
@@ -44,7 +44,7 @@ const TxRaw: React.FC<IProps> = (props) => {
         value={JSON.stringify(tx, null, 4)}
       />
       <br />
-      <Typography variant="h6" gutterBottom style={{marginLeft: "10px"}}>Receipt</Typography>
+      <Typography variant="h6" gutterBottom style={{ marginLeft: "10px" }}>Receipt</Typography>
       <br />
       <Editor
         options={{

src/containers/Address.tsx

@@ -8,7 +8,7 @@ import EthereumJSONRPC from "@etclabscore/ethereum-json-rpc";
 import { hexToNumber } from "@etclabscore/eserialize";
 import AddressTransactions from "../components/AddressTransactions";
 import { History } from "history";
-import {ObjectUAh7GW7V as Transaction} from "@etclabscore/ethereum-json-rpc";
+import { Transaction } from "@etclabscore/ethereum-json-rpc";
 
 const unit = require("ethjs-unit"); //tslint:disable-line
 
@@ -58,13 +58,13 @@ const Address: React.FC<IProps> = ({ match, history }) => {
       return txCount;
     }).then((txCountRes: string | undefined) => {
       if (txCountRes) {
-        erpc.eth_getBalance(address, hexBlockNumber).then((balance) => {
-          if (balance === null) { return; }
-          setBalance(balance);
+        erpc.eth_getBalance(address, hexBlockNumber).then((b) => {
+          if (b === null) { return; }
+          setBalance(b);
         });
-        erpc.eth_getCode(address, hexBlockNumber).then((code) => {
-          if (code === null) { return; }
-          setCode(code);
+        erpc.eth_getCode(address, hexBlockNumber).then((c) => {
+          if (c === null) { return; }
+          setCode(c);
         });
       }
     });

src/containers/Block.tsx

@@ -2,7 +2,7 @@ import { CircularProgress } from "@material-ui/core";
 import useCoreGethStore from "../stores/useCoreGethStore";
 import * as React from "react";
 import BlockView from "../components/BlockView";
-import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock } from "@etclabscore/ethereum-json-rpc";
+import EthereumJSONRPC, { Block as IBlock } from "@etclabscore/ethereum-json-rpc";
 
 export default function Block(props: any) {
   const { match: { params: { hash } } } = props;

src/containers/BlockCardList.tsx

@@ -4,7 +4,7 @@ import * as React from "react";
 import getBlocks from "../helpers";
 import BlockCard from "../components/BlockCard";
 import { hexToNumber } from "@etclabscore/eserialize";
-import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock } from "@etclabscore/ethereum-json-rpc";
+import EthereumJSONRPC, { Block as IBlock } from "@etclabscore/ethereum-json-rpc";
 
 interface IProps {
   from: number;

src/containers/BlockList.tsx

@@ -4,7 +4,7 @@ import * as React from "react";
 import BlockList from "../components/BlockList";
 import getBlocks from "../helpers";
 import { ArrowForwardIos, ArrowBackIos } from "@material-ui/icons";
-import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock } from "@etclabscore/ethereum-json-rpc";
+import EthereumJSONRPC, { Block as IBlock } from "@etclabscore/ethereum-json-rpc";
 
 interface IProps {
   from: number;