Merge pull request #295 from TrueBlocks/develop

Develop

package.json

@@ -93,7 +93,7 @@
     "react-syntax-highlighter": "^15.4.3",
     "react-test-renderer": "^17.0.2",
     "recharts": "^2.0.9",
-    "trueblocks-sdk": "../trueblocks-sdk",
+    "trueblocks-sdk": "^0.50.0",
     "ts-morph": "^13.0.2"
   }
 }

src/ui/App.tsx

@@ -18,7 +18,7 @@ import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import {
   Chain,
-  getConfig, getVersion, Status, SuccessResponse,
+  Config, getConfig, getVersion, SuccessResponse,
 } from 'trueblocks-sdk';
 
 import { ChainSelect } from '@components/ChainSelect';
@@ -32,8 +32,8 @@ import { useDatastore } from '@hooks/useDatastore';
 import {
   isFailedCall, isSuccessfulCall, wrapResponse,
 } from '@modules/api/call_status';
+import { createEmptyStatus } from '@modules/types/Config';
 import { createEmptyMeta } from '@modules/types/Meta';
-import { createEmptyStatus } from '@modules/types/Status';
 
 import {
   ExplorerLocation, NamesLocation, RootLocation, Routes, SettingsLocation, SupportLocation,
@@ -60,7 +60,7 @@ export const App = () => {
   dayjs.extend(relativeTime);
 
   const { location, action } = useHistory();
-  const [status, setStatus] = useState<Pick<SuccessResponse<Status>, 'data' | 'meta'>>({
+  const [status, setStatus] = useState<Pick<SuccessResponse<Config>, 'data' | 'meta'>>({
     data: createEmptyStatus(),
     meta: createEmptyMeta(),
   });
@@ -103,7 +103,7 @@ export const App = () => {
 
       if (isSuccessfulCall(statusResponse)) {
         setStatus({
-          data: statusResponse.data[0] as Status,
+          data: statusResponse.data[0] as Config,
           meta: statusResponse.meta,
         });
 

src/ui/components/ChainSelect/index.tsx

@@ -3,9 +3,9 @@ import { useHistory } from 'react-router-dom';
 
 import { useGlobalState } from '@state';
 import { Select } from 'antd';
-import { Status } from 'trueblocks-sdk';
+import { Config } from 'trueblocks-sdk';
 
-export function ChainSelect({ status }: { status: Status }) {
+export function ChainSelect({ status }: { status: Config }) {
   const history = useHistory();
   const { chain, setChain } = useGlobalState();
 

src/ui/components/SidePanels/StatusPanel.tsx

@@ -6,7 +6,7 @@ import {
 } from '@ant-design/icons';
 import { Badge } from 'antd';
 import filesize from 'filesize';
-import { Chain, Status, SuccessResponse } from 'trueblocks-sdk';
+import { Chain, Config, SuccessResponse } from 'trueblocks-sdk';
 
 import { Loading } from '@components/Loading';
 import { createEmptyMeta } from '@modules/types/Meta';
@@ -16,7 +16,7 @@ import { useGlobalState2 } from '../../State';
 interface StatusPanelProps {
   // status is always a { data: ..., meta: ... } because of the way we fetch it in App.ts
   chain: string;
-  status: Pick<SuccessResponse<Status>, 'data' | 'meta'>;
+  status: Pick<SuccessResponse<Config>, 'data' | 'meta'>;
   error: boolean;
   loading: boolean;
 }

src/ui/datastore/messages.ts

@@ -1,5 +1,5 @@
 import {
-  address, getNames, ListStats, Name,
+  address, AppearanceCount, getNames, Name,
 } from 'trueblocks-sdk';
 
 import { TransactionFilters } from '@modules/filters/transaction';
@@ -41,7 +41,7 @@ export type GetTransactionsTotal = {
   addresses: address[],
 }
 
-export type GetTransactionsTotalResult = ListStats[];
+export type GetTransactionsTotalResult = AppearanceCount[];
 
 export type GetPage = {
   chain: string,

src/ui/datastore/worker/transactions.ts

@@ -1,5 +1,5 @@
 import {
-  address as Address, AnyResponse, getExport, getList, ListStats, Name, Transaction,
+  address as Address, AnyResponse, AppearanceCount, getExport, getList, Name, Transaction,
 } from 'trueblocks-sdk';
 
 import { isFailedCall, wrapResponse } from '@modules/api/call_status';
@@ -37,14 +37,13 @@ async function fetchTransactions(chain: string, addresses: Address[], loaded: nu
   return transactions;
 }
 
-type GetTransactionsTotal = (chain: string, addresses: Address[]) => Promise<ListStats[]>;
+type GetTransactionsTotal = (chain: string, addresses: Address[]) => Promise<AppearanceCount[]>;
 export const getTransactionsTotal: GetTransactionsTotal = async (chain, addresses) => {
   const listCall = wrapResponse((await getList({
     chain,
     count: true,
-    appearances: true,
     addrs: addresses,
-  }) as AnyResponse<ListStats[]>));
+  }) as AnyResponse<AppearanceCount[]>));
 
   if (isFailedCall(listCall)) {
     throw new Error(listCall.errors.join());

src/ui/modules/types/Status.ts → src/ui/modules/types/Config.ts

@@ -1,6 +1,6 @@
-import { Status } from 'trueblocks-sdk';
+import { Config } from 'trueblocks-sdk';
 
-export function createEmptyStatus(): Status {
+export function createEmptyStatus(): Config {
   return {
     clientVersion: '',
     clientIds: '',
@@ -26,6 +26,7 @@ export function createEmptyStatus(): Status {
         nFiles: 0,
         nFolders: 0,
         sizeInBytes: 0,
+        isValid: false,
       },
       {
         items: [],
@@ -34,6 +35,7 @@ export function createEmptyStatus(): Status {
         nFiles: 0,
         nFolders: 0,
         sizeInBytes: 0,
+        isValid: false,
       },
       {
         items: [],
@@ -42,6 +44,7 @@ export function createEmptyStatus(): Status {
         nFiles: 0,
         nFolders: 0,
         sizeInBytes: 0,
+        isValid: false,
       },
       {
         items: [],
@@ -50,6 +53,7 @@ export function createEmptyStatus(): Status {
         nFiles: 0,
         nFolders: 0,
         sizeInBytes: 0,
+        isValid: false,
       },
     ],
     chains: [],

src/ui/views/Dashboard/Tabs/Details/SubTabs/HistoryRecons.tsx

@@ -101,13 +101,14 @@ const statementHeader = (statement: Reconciliation, details: boolean, setShowDet
 
 //-----------------------------------------------------------------
 const statementBody = (statement: Reconciliation, details: boolean, styles: any) => {
+  const preAppBlkStr = statement.prevAppBlk === undefined ? '0' : statement.prevAppBlk.toString();
   const rowStyle = styles.tableRow;
   const detailView = !details ? <></> : (
     <>
       {DividerRow(rowStyle)}
       {DetailRow(rowStyle, 'assetSymbol', statement.assetSymbol)}
       {DetailRow(rowStyle, 'decimals', statement.decimals)}
-      {DetailRow(rowStyle, 'prevAppBlk', statement.prevAppBlk.toString())}
+      {DetailRow(rowStyle, 'prevAppBlk', preAppBlkStr)}
       {DetailRow(rowStyle, 'blockNumber', statement.blockNumber.toString())}
       {DetailRow(rowStyle, 'transactionIndex', statement.transactionIndex.toString())}
       {DetailRow(rowStyle, 'timestamp', statement.timestamp.toString())}
@@ -125,30 +126,38 @@ const statementBody = (statement: Reconciliation, details: boolean, styles: any)
     </>
   );
 
-  const toNumberArguments = (...strings: string[]): number[] => strings.map((someString) => (
-    someString === '' ? 0.0 : parseFloat(someString)));
+  const toNumberArguments2 = (v1: string|undefined, v2: string|undefined): number[] => {
+    const s1 = v1 === undefined ? '0.0' : v1;
+    const s2 = v2 === undefined ? '0.0' : v2;
+    return [parseFloat(s1), parseFloat(s2)];
+  };
+
+  const toNumberArguments1 = (v1: string|undefined): number[] => {
+    const s1 = v1 === undefined ? '0.0' : v1;
+    return [parseFloat(s1)];
+  };
 
   return (
     <table style={{ width: '100%', tableLayout: 'fixed' }}>
       <tbody>
         <HeaderRow />
-        {BodyRow(rowStyle, 'begBal', details, 0, 0, ...toNumberArguments(statement.begBal, statement.begBalDiff))}
-        {BodyRow(rowStyle, 'amount', details, ...toNumberArguments(statement.amountIn, statement.amountOut))}
-        {BodyRow(rowStyle, 'internal', details, ...toNumberArguments(statement.internalIn, statement.internalOut))}
+        {BodyRow(rowStyle, 'begBal', details, 0, 0, ...toNumberArguments2(statement.begBal, statement.begBalDiff))}
+        {BodyRow(rowStyle, 'amount', details, ...toNumberArguments2(statement.amountIn, statement.amountOut))}
+        {BodyRow(rowStyle, 'internal', details, ...toNumberArguments2(statement.internalIn, statement.internalOut))}
         {BodyRow(
           rowStyle,
           'selfDestruct',
           details,
-          ...toNumberArguments(statement.selfDestructIn, statement.selfDestructOut),
+          ...toNumberArguments2(statement.selfDestructIn, statement.selfDestructOut),
         )}
-        {BodyRow(rowStyle, 'baseReward', details, ...toNumberArguments(statement.minerBaseRewardIn), 0)}
-        {BodyRow(rowStyle, 'txFee', details, ...toNumberArguments(statement.minerTxFeeIn), 0)}
-        {BodyRow(rowStyle, 'nephewReward', details, ...toNumberArguments(statement.minerNephewRewardIn), 0)}
-        {BodyRow(rowStyle, 'uncleReward', details, ...toNumberArguments(statement.minerUncleRewardIn), 0)}
-        {BodyRow(rowStyle, 'prefund', details, ...toNumberArguments(statement.prefundIn), 0)}
-        {BodyRow(rowStyle, 'gasCost', details, 0, ...toNumberArguments(statement.gasOut))}
-        {BodyRow(rowStyle, 'totalNet', details, 0, 0, ...toNumberArguments(statement.amountNet))}
-        {BodyRow(rowStyle, 'endBal', details, 0, 0, ...toNumberArguments(statement.endBal, statement.endBalDiff))}
+        {BodyRow(rowStyle, 'baseReward', details, ...toNumberArguments1(statement.minerBaseRewardIn), 0)}
+        {BodyRow(rowStyle, 'txFee', details, ...toNumberArguments1(statement.minerTxFeeIn), 0)}
+        {BodyRow(rowStyle, 'nephewReward', details, ...toNumberArguments1(statement.minerNephewRewardIn), 0)}
+        {BodyRow(rowStyle, 'uncleReward', details, ...toNumberArguments1(statement.minerUncleRewardIn), 0)}
+        {BodyRow(rowStyle, 'prefund', details, ...toNumberArguments1(statement.prefundIn), 0)}
+        {BodyRow(rowStyle, 'gasCost', details, 0, ...toNumberArguments1(statement.gasOut))}
+        {BodyRow(rowStyle, 'totalNet', details, 0, 0, ...toNumberArguments1(statement.amountNet))}
+        {BodyRow(rowStyle, 'endBal', details, 0, 0, ...toNumberArguments2(statement.endBal, statement.endBalDiff))}
         {detailView}
       </tbody>
     </table>
@@ -211,12 +220,12 @@ const BodyRow = (
 };
 
 //-----------------------------------------------------------------
-const DetailRow = (style: string, name: string, value: double | string) => {
+const DetailRow = (style: string, name: string, value: double | string | undefined) => {
   const isErr: boolean = name?.includes('Diff') && value !== 0;
   const valueToDisplay = (() => {
     if (typeof value === 'number') return clip2(value);
 
-    const parsed = parseFloat(value);
+    const parsed = value ? parseFloat(value) : 0;
 
     if (Number.isNaN(parsed)) return value;
 

src/ui/views/Dashboard/Tabs/Details/components/Statement.tsx

@@ -24,6 +24,7 @@ export const Statement = ({ statement }: { statement: Reconciliation }) => {
   }, [denom, statement.assetSymbol, statement.priceSource]);
 
   const pricedRecon = priceReconciliation(statement, denom);
+  const gasOutStr = pricedRecon.gasOut ? pricedRecon.gasOut.toString() : '0.00';
   return (
     <tr className={style.row} key={`${k}-row`}>
       <td key={`${k}-1`} className={style.col} style={{ width: '12%' }}>
@@ -39,7 +40,7 @@ export const Statement = ({ statement }: { statement: Reconciliation }) => {
         {showValue(pricedRecon.totalOutLessGas.toString())}
       </td>
       <td key={`${k}-5`} className={style.col} style={{ width: '17%' }}>
-        {showValue(pricedRecon.gasOut.toString(), false, true)}
+        {showValue(gasOutStr, false, true)}
       </td>
       <td key={`${k}-6`} className={style.col} style={{ width: '17%' }}>
         {showValue(pricedRecon.endBal.toString(), true)}

src/ui/views/Dashboard/Tabs/Monitors.tsx

@@ -8,7 +8,8 @@ import {
 } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
 import {
-  Chain, getConfig, Monitor, Status,
+  Chain, Config,
+  getConfig, Monitor,
 } from 'trueblocks-sdk';
 
 import { ClickableAddress } from '@components/ClickableAddress';
@@ -44,7 +45,7 @@ export const Monitors = () => {
     modes: ['show'],
     module: ['monitors'],
     details: true,
-  }), undefined, []) as CallStatus<Status[]>;
+  }), undefined, []) as CallStatus<Config[]>;
   if (isFailedCall(monitorsCall)) {
     createErrorNotification({
       description: 'Could not fetch monitors',

src/ui/views/Settings/Tabs/Indexes.tsx

@@ -8,7 +8,7 @@ import { addColumn, addNumColumn } from '@components/Table';
 import { useSdk } from '@hooks/useSdk';
 import { isFailedCall, isSuccessfulCall } from '@modules/api/call_status';
 import { createErrorNotification } from '@modules/error_notification';
-import { createEmptyStatus } from '@modules/types/Status';
+import { createEmptyStatus } from '@modules/types/Config';
 
 import {
   SettingsIndexesChartsLocation,

yarn.lock

@@ -13005,7 +13005,7 @@ resolve@^2.0.0-next.3:
     react-test-renderer: ^17.0.2
     recharts: ^2.0.9
     style-loader: ^2.0.0
-    trueblocks-sdk: ../trueblocks-sdk
+    trueblocks-sdk: ^0.50.0
     ts-jest: ^26.5.3
     ts-loader: ^8.0.18
     ts-morph: ^13.0.2
@@ -13016,12 +13016,12 @@ resolve@^2.0.0-next.3:
   languageName: unknown
   linkType: soft
 
-"trueblocks-sdk@file:../trueblocks-sdk::locator=trueblocks-explorer%40workspace%3A.":
-  version: 0.45.0
-  resolution: "trueblocks-sdk@file:../trueblocks-sdk#../trueblocks-sdk::hash=5a1126&locator=trueblocks-explorer%40workspace%3A."
+"trueblocks-sdk@npm:^0.50.0":
+  version: 0.50.0
+  resolution: "trueblocks-sdk@npm:0.50.0"
   dependencies:
     typescript: ^4.9.4
-  checksum: 1633f02b5eb858ccc685add8675c39f50f9e735b1c831151e432c7e224727a0dad0f1348cf6d11648c3ab72e618a768aeaf2eba4257de8319c270ac6c8b21618
+  checksum: e8adf0c915eb65e76567dc9cd13b45dc4cd810b90f0cc954d20e52af7ac03d408e995834b1df12e1df4e2a343675ac8f03960c9560ab454c13238250578d98db
   languageName: node
   linkType: hard