From 56a67e70aa26be98567d3605e5660a86ed16573f Mon Sep 17 00:00:00 2001 From: shanejonas Date: Fri, 6 Nov 2020 19:36:15 -0800 Subject: [PATCH] fix: update service runner client + eth client + core-geth --- package-lock.json | 161 +++++++++++++++--- package.json | 4 +- src/App.tsx | 8 +- .../AddressTransactions.tsx | 4 +- src/components/BlockCard/BlockCard.tsx | 2 +- src/components/TxRaw/TxRaw.tsx | 8 +- src/containers/Address.tsx | 14 +- src/containers/Block.tsx | 2 +- src/containers/BlockCardList.tsx | 2 +- src/containers/BlockList.tsx | 2 +- src/containers/BlockRawContainer.tsx | 2 +- src/containers/Dashboard.tsx | 2 +- src/containers/MinerStatsPage.tsx | 2 +- src/containers/Transaction.tsx | 4 +- src/containers/TransactionRawContainer.tsx | 4 +- src/helpers/availableServiceToNetwork.ts | 2 +- src/hooks/useServiceRunner.ts | 2 +- src/stores/useCoreGethStore.ts | 2 +- 18 files changed, 175 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2456043d..4bf0630f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1268,14 +1268,53 @@ "integrity": "sha512-1WvtMXF5WyFRKbYjSYEtP54IH47X8P3NQYHY8cOOy2NhpBWrnmhm7NckW2pMccTHXUiYk/7UyfznEwNufMAwKA==" }, "@etclabscore/ethereum-json-rpc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@etclabscore/ethereum-json-rpc/-/ethereum-json-rpc-1.2.2.tgz", - "integrity": "sha512-5Ct57xHtFKpFmuO+gen84WG4Ggv2ec2gr7fgmBeGBPkwXhBo5Jgl2EWEjllE3uPy1uLB/G/U2L1aj3L3sbkb8g==", - "requires": { - "@open-rpc/client-js": "^1.2.3", - "@open-rpc/meta-schema": "^1.5.3", - "@open-rpc/schema-utils-js": "^1.11.5", + "version": "1.3.13", + "resolved": "https://registry.npmjs.org/@etclabscore/ethereum-json-rpc/-/ethereum-json-rpc-1.3.13.tgz", + "integrity": "sha512-BnT/JNa8b8i4ReY4GlaPSI/f19nEf9XhSuNingz7t1bsnDkZ0cCixyChXoLzLBjlRadxQLLiw59bUNDI/t2RIg==", + "requires": { + "@open-rpc/client-js": "1.5.1", + "@open-rpc/meta-schema": "^1.6.0", + "@open-rpc/schema-utils-js": "^1.12.0", + "@types/json-schema": "7.0.3", + "@types/lodash": "^4.14.149", + "@types/ws": "^6.0.1", "lodash": "^4.17.15" + }, + "dependencies": { + "@open-rpc/client-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@open-rpc/client-js/-/client-js-1.5.1.tgz", + "integrity": "sha512-0rqJS13StmAyz93s6b+lJV4VsVeL6xWjmcnKt2UcER+wLsiM450LaGKinzm85F/MWQLhrip1r5eGU39vGZWnZw==", + "requires": { + "isomorphic-fetch": "^2.2.1", + "isomorphic-ws": "^4.0.1", + "strict-event-emitter-types": "^2.0.0", + "ws": "^7.0.0" + } + }, + "@types/json-schema": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz", + "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } } }, "@etclabscore/ethereum-json-rpc-specification": { @@ -1368,14 +1407,53 @@ } }, "@etclabscore/jade-service-runner-client": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@etclabscore/jade-service-runner-client/-/jade-service-runner-client-1.9.0.tgz", - "integrity": "sha512-v+996lHdQ8xMX13ORqOAbwY+ekJ8NvEzUyqza92E18UUjD8Dcecg9UDVxj5wJUB+r/gfiDEYJe2L9SPiTRoqHg==", - "requires": { - "@open-rpc/client-js": "^1.2.3", - "@open-rpc/meta-schema": "^1.5.3", - "@open-rpc/schema-utils-js": "^1.11.5", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/@etclabscore/jade-service-runner-client/-/jade-service-runner-client-1.10.5.tgz", + "integrity": "sha512-bouRNmD43TWWwf47g19+l2OY2ietH8Esmoh2vwn+u+yVtA0CPGNOjzOgvssbecIEgZRPuvtrwx9Q2DX9BAD7gQ==", + "requires": { + "@open-rpc/client-js": "1.5.1", + "@open-rpc/meta-schema": "^1.6.0", + "@open-rpc/schema-utils-js": "^1.12.0", + "@types/json-schema": "7.0.3", + "@types/lodash": "^4.14.149", + "@types/ws": "^6.0.1", "lodash": "^4.17.15" + }, + "dependencies": { + "@open-rpc/client-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@open-rpc/client-js/-/client-js-1.5.1.tgz", + "integrity": "sha512-0rqJS13StmAyz93s6b+lJV4VsVeL6xWjmcnKt2UcER+wLsiM450LaGKinzm85F/MWQLhrip1r5eGU39vGZWnZw==", + "requires": { + "isomorphic-fetch": "^2.2.1", + "isomorphic-ws": "^4.0.1", + "strict-event-emitter-types": "^2.0.0", + "ws": "^7.0.0" + } + }, + "@types/json-schema": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz", + "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } } }, "@etclabscore/json-schema-to-types": { @@ -2217,6 +2295,7 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/@open-rpc/client-js/-/client-js-1.5.2.tgz", "integrity": "sha512-MyjPLPK3kc3fUCz0rAOYKbPtRV2c7ZTKw2TqRFXQ9UWn8upjdNiG12jC+9vXnc2GAIznuDyug8QNX/P6uSUzxg==", + "dev": true, "requires": { "isomorphic-fetch": "^3.0.0", "isomorphic-ws": "^4.0.1", @@ -3046,8 +3125,7 @@ "@types/lodash": { "version": "4.14.162", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz", - "integrity": "sha512-alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==", - "dev": true + "integrity": "sha512-alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==" }, "@types/minimatch": { "version": "3.0.3", @@ -3180,6 +3258,14 @@ "@types/react": "*" } }, + "@types/ws": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz", + "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==", + "requires": { + "@types/node": "*" + } + }, "@types/yargs": { "version": "13.0.11", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz", @@ -4606,6 +4692,16 @@ "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", @@ -8281,6 +8377,13 @@ "schema-utils": "^2.5.0" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "filename-reserved-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz", @@ -10193,6 +10296,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz", "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==", + "dev": true, "requires": { "node-fetch": "^2.6.1", "whatwg-fetch": "^3.4.1" @@ -10916,7 +11020,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "is-number": { "version": "3.0.0", @@ -12705,6 +12813,13 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -22704,7 +22819,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", @@ -23277,7 +23396,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "glob-parent": { "version": "3.1.0", diff --git a/package.json b/package.json index 2be54639..1a24ba75 100644 --- a/package.json +++ b/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", diff --git a/src/App.tsx b/src/App.tsx index a4acb6e2..e2b3798d 100644 --- a/src/App.tsx +++ b/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}`); } diff --git a/src/components/AddressTransactions/AddressTransactions.tsx b/src/components/AddressTransactions/AddressTransactions.tsx index 05bc99ab..160bab74 100644 --- a/src/components/AddressTransactions/AddressTransactions.tsx +++ b/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 = (props) => { {(!props.transactions || props.transactions.length === 0) && - + {t("No Transactions for this block range.")} } diff --git a/src/components/BlockCard/BlockCard.tsx b/src/components/BlockCard/BlockCard.tsx index 07ec3f00..65e49575 100644 --- a/src/components/BlockCard/BlockCard.tsx +++ b/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 { diff --git a/src/components/TxRaw/TxRaw.tsx b/src/components/TxRaw/TxRaw.tsx index 4ac601fd..48b95318 100644 --- a/src/components/TxRaw/TxRaw.tsx +++ b/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 = (props) => { style={{ position: "absolute", right: "10px", top: "75px", zIndex: 1 }} >View Transaction
- Transaction + Transaction
= (props) => { value={JSON.stringify(tx, null, 4)} />
- Receipt + Receipt
= ({ 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); }); } }); diff --git a/src/containers/Block.tsx b/src/containers/Block.tsx index b5250177..799fb84f 100644 --- a/src/containers/Block.tsx +++ b/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; diff --git a/src/containers/BlockCardList.tsx b/src/containers/BlockCardList.tsx index 24a7dc50..93ae6f1f 100644 --- a/src/containers/BlockCardList.tsx +++ b/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; diff --git a/src/containers/BlockList.tsx b/src/containers/BlockList.tsx index 96c864ab..ea0a6c11 100644 --- a/src/containers/BlockList.tsx +++ b/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; diff --git a/src/containers/BlockRawContainer.tsx b/src/containers/BlockRawContainer.tsx index 7a432628..ed72eab0 100644 --- a/src/containers/BlockRawContainer.tsx +++ b/src/containers/BlockRawContainer.tsx @@ -2,7 +2,7 @@ import { CircularProgress } from "@material-ui/core"; import useCoreGethStore from "../stores/useCoreGethStore"; import * as React from "react"; import BlockRaw from "../components/BlockRaw"; -import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock } from "@etclabscore/ethereum-json-rpc"; +import EthereumJSONRPC, { Block as IBlock } from "@etclabscore/ethereum-json-rpc"; export default function BlockRawContainer(props: any) { const { match: { params: { hash } } } = props; diff --git a/src/containers/Dashboard.tsx b/src/containers/Dashboard.tsx index b056f5f8..c8b2549c 100644 --- a/src/containers/Dashboard.tsx +++ b/src/containers/Dashboard.tsx @@ -13,7 +13,7 @@ import { hexToNumber } from "@etclabscore/eserialize"; import { useTranslation } from "react-i18next"; import { ArrowForwardIos } from "@material-ui/icons"; import StatCharts from "../components/StatCharts"; -import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock, OneOf5ZIsDKft as ISyncing } from "@etclabscore/ethereum-json-rpc"; +import EthereumJSONRPC, { Block as IBlock, IsSyncingResult as ISyncing} from "@etclabscore/ethereum-json-rpc"; const useState = React.useState; diff --git a/src/containers/MinerStatsPage.tsx b/src/containers/MinerStatsPage.tsx index 6803fdb1..12046a1a 100644 --- a/src/containers/MinerStatsPage.tsx +++ b/src/containers/MinerStatsPage.tsx @@ -9,7 +9,7 @@ import getTheme from "../themes/victoryTheme"; import BlockPagination from "../components/BlockPagination"; import { History } from "history"; import _ from "lodash"; -import EthereumJSONRPC, { ObjectW9HVodO0 as IBlock } from "@etclabscore/ethereum-json-rpc"; +import EthereumJSONRPC, { Block as IBlock } from "@etclabscore/ethereum-json-rpc"; const useState = React.useState; diff --git a/src/containers/Transaction.tsx b/src/containers/Transaction.tsx index a3c34507..e7623085 100644 --- a/src/containers/Transaction.tsx +++ b/src/containers/Transaction.tsx @@ -3,8 +3,8 @@ import * as React from "react"; import TxView from "../components/TxView"; import useCoreGethStore from "../stores/useCoreGethStore"; import EthereumJSONRPC, { - ObjectUAh7GW7V as ITransaction, - ObjectInnf1Jcf as ITransactionReceipt + Transaction as ITransaction, + TransactionReceiptOrNull as ITransactionReceipt, } from "@etclabscore/ethereum-json-rpc"; export default function TransactionContainer(props: any) { diff --git a/src/containers/TransactionRawContainer.tsx b/src/containers/TransactionRawContainer.tsx index 4dfac2b4..324c1f2c 100644 --- a/src/containers/TransactionRawContainer.tsx +++ b/src/containers/TransactionRawContainer.tsx @@ -3,8 +3,8 @@ import * as React from "react"; import useCoreGethStore from "../stores/useCoreGethStore"; import TxRaw from "../components/TxRaw/TxRaw"; import EthereumJSONRPC, { - ObjectUAh7GW7V as ITransaction, - ObjectInnf1Jcf as ITransactionReceipt + Transaction as ITransaction, + TransactionReceiptOrNull as ITransactionReceipt, } from "@etclabscore/ethereum-json-rpc"; export default function TransactionRawContainer(props: any) { diff --git a/src/helpers/availableServiceToNetwork.ts b/src/helpers/availableServiceToNetwork.ts index 116ff703..7d944364 100644 --- a/src/helpers/availableServiceToNetwork.ts +++ b/src/helpers/availableServiceToNetwork.ts @@ -1,4 +1,4 @@ -import { ObjectT84Ta8SE as IAvailableServices, ObjectDBzoJtf4 as IEnvironment } from "@etclabscore/jade-service-runner-client"; +import { ObjectOfStringDoaGddGAStringVp8AIgHFStringDoaGddGAUnorderedSetOfObjectOfStringDoaGddGAStringDoaGddGAKieCSt44UIuKSje3YY1BLmC3 as IAvailableServices, ObjectOfStringDoaGddGAStringDoaGddGAKieCSt44 as IEnvironment } from "@etclabscore/jade-service-runner-client"; //tslint:disable-line interface INetwork { name: string; diff --git a/src/hooks/useServiceRunner.ts b/src/hooks/useServiceRunner.ts index d0d0b0f6..02a094b9 100644 --- a/src/hooks/useServiceRunner.ts +++ b/src/hooks/useServiceRunner.ts @@ -1,4 +1,4 @@ -import JadeServiceRunner, { ObjectT84Ta8SE as IAvailableServices, ServiceRunner } from "@etclabscore/jade-service-runner-client"; +import JadeServiceRunner, { ObjectOfStringDoaGddGAStringVp8AIgHFStringDoaGddGAUnorderedSetOfObjectOfStringDoaGddGAStringDoaGddGAKieCSt44UIuKSje3YY1BLmC3 as IAvailableServices, ServiceRunner } from "@etclabscore/jade-service-runner-client"; //tslint:disable-line import React, { Dispatch, useEffect } from "react"; import { useQueryParam, StringParam } from "use-query-params"; diff --git a/src/stores/useCoreGethStore.ts b/src/stores/useCoreGethStore.ts index f989b859..27d27c71 100644 --- a/src/stores/useCoreGethStore.ts +++ b/src/stores/useCoreGethStore.ts @@ -7,5 +7,5 @@ export default createStore(() => { const [serviceRunner, serviceRunnerUrl] = useServiceRunnerStore(); const [networkQuery] = useQueryParam("network", StringParam); const [rpcUrlQuery] = useQueryParam("rpcUrl", StringParam); - return useCoreGeth(serviceRunner, serviceRunnerUrl, "1.11.16", networkQuery || "mainnet", rpcUrlQuery); + return useCoreGeth(serviceRunner, serviceRunnerUrl, "1.11.17", networkQuery || "mainnet", rpcUrlQuery); });