Use DocType instead of Block, Parcel, Transaction in sdk

CodeChain-io · Jul 18, 2018 · 499b277 · 499b277
1 parent 37958dc
commit 499b277
Show file tree

Hide file tree

Showing 42 changed files with 1,610 additions and 341 deletions.
diff --git a/client/components/asset/AssetDetails/AssetDetails.tsx b/client/components/asset/AssetDetails/AssetDetails.tsx
@@ -1,11 +1,11 @@
 import * as React from "react";
-import { AssetScheme } from "codechain-sdk/lib/core/classes";
 
 import "./AssetDetails.scss"
 import AssetHeaderTable from "../AssetHeaderTable/AssetHeaderTable";
+import { AssetSchemeDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    assetScheme: AssetScheme;
+    assetScheme: AssetSchemeDoc;
 }
 
 const AssetDetails = (prop: OwnProps) => {

diff --git a/client/components/asset/AssetHeaderTable/AssetHeaderTable.tsx b/client/components/asset/AssetHeaderTable/AssetHeaderTable.tsx
@@ -1,11 +1,11 @@
 import * as React from "react";
 
 import "./AssetHeaderTable.scss"
-import { AssetScheme } from "codechain-sdk/lib/core/classes";
 import HexString from "../../util/HexString/HexString";
+import { AssetSchemeDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    assetScheme: AssetScheme;
+    assetScheme: AssetSchemeDoc;
 }
 
 interface MetadataFormat {
@@ -41,7 +41,7 @@ const AssetHeaderTable = (prop: OwnProps) => {
             </tr>
             <tr>
                 <td>Registrar</td>
-                <td>{prop.assetScheme.registrar ? (prop.assetScheme.registrar.value ? <HexString link={`/addr-platform/0x${prop.assetScheme.registrar.value}`} text={(prop.assetScheme.registrar.value as string)} /> : "Not existed") : "Not existed"}</td>
+                <td>{prop.assetScheme.registrar ? <HexString link={`/addr-platform/0x${prop.assetScheme.registrar}`} text={prop.assetScheme.registrar} /> : "Not existed"}</td>
             </tr>
             <tr>
                 <td>Description</td>

diff --git a/client/components/asset/AssetList/AssetList.tsx b/client/components/asset/AssetList/AssetList.tsx
@@ -1,17 +1,12 @@
 import * as React from "react";
 import * as _ from "lodash";
-import { Asset, AssetScheme } from "codechain-sdk/lib/core/classes";
 
 import "./AssetList.scss";
 import HexString from "../../util/HexString/HexString";
-
-interface AssetBundle {
-    asset: Asset,
-    assetScheme: AssetScheme
-}
+import { AssetBundleDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    assetBundles: AssetBundle[]
+    assetBundles: AssetBundleDoc[]
 }
 
 interface MetadataFormat {
@@ -41,7 +36,7 @@ const AssetList = (prop: OwnProps) => {
                                 Asset
                             </td>
                             <td>
-                                <HexString text={assetBundle.asset.assetType.value} />
+                                <HexString text={assetBundle.asset.assetType} />
                             </td>
                         </tr>
                         <tr>

diff --git a/client/components/assetTransferAddress/UTXOList/UTXOList.tsx b/client/components/assetTransferAddress/UTXOList/UTXOList.tsx
@@ -1,15 +1,12 @@
 import * as React from "react";
 import * as _ from "lodash";
-import { Asset, AssetScheme } from "codechain-sdk/lib/core/classes";
 
 import "./UTXOList.scss";
 import HexString from "../../util/HexString/HexString";
+import { AssetBundleDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    utxo: Array<{
-        asset: Asset,
-        assetScheme: AssetScheme
-    }>;
+    utxo: AssetBundleDoc[];
 }
 
 interface MetadataFormat {
@@ -43,7 +40,7 @@ const UTXOList = (prop: OwnProps) => {
                                     <tbody>
                                         <tr>
                                             <td>AssetType</td>
-                                            <td><HexString link={`/asset/0x${utxo.asset.assetType.value}`} text={utxo.asset.assetType.value} /></td>
+                                            <td><HexString link={`/asset/0x${utxo.asset.assetType}`} text={utxo.asset.assetType} /></td>
                                         </tr>
                                         <tr>
                                             <td>Amount</td>

diff --git a/client/components/block/BlockDetails/BlockDetails.tsx b/client/components/block/BlockDetails/BlockDetails.tsx
@@ -1,13 +1,13 @@
 import * as React from "react";
 
-import { Block } from "codechain-sdk/lib/core/classes";
 import { Col, Row } from 'reactstrap';
 
 import "./BlockDetails.scss"
 import HexString from "../../util/HexString/HexString";
+import { BlockDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    block: Block;
+    block: BlockDoc;
 }
 
 class BlockDetails extends React.Component<OwnProps> {
@@ -20,39 +20,39 @@ class BlockDetails extends React.Component<OwnProps> {
                         Hash
                     </Col>
                     <Col md="10">
-                        <HexString text={block.hash.value} />
+                        <HexString text={block.hash} />
                     </Col>
                 </Row>
                 <Row>
                     <Col md="2">
                         Parent Block Hash
                     </Col>
                     <Col md="10">
-                        <HexString link={`/block/0x${block.parentHash.value}`} text={block.parentHash.value} />
+                        <HexString link={`/block/0x${block.parentHash}`} text={block.parentHash} />
                     </Col>
                 </Row>
                 <Row>
                     <Col md="2">
                         Parcels Root
                     </Col>
                     <Col md="10">
-                        <HexString text={block.parcelsRoot.value} />
+                        <HexString text={block.parcelsRoot} />
                     </Col>
                 </Row>
                 <Row>
                     <Col md="2">
                         Invoices Root
                     </Col>
                     <Col md="10">
-                        <HexString text={block.invoicesRoot.value} />
+                        <HexString text={block.invoicesRoot} />
                     </Col>
                 </Row>
                 <Row>
                     <Col md="2">
                         State Root
                     </Col>
                     <Col md="10">
-                        <HexString text={block.stateRoot.value} />
+                        <HexString text={block.stateRoot} />
                     </Col>
                 </Row>
                 <Row>
@@ -68,7 +68,7 @@ class BlockDetails extends React.Component<OwnProps> {
                         Author
                     </Col>
                     <Col md="10">
-                        <HexString link={`/addr-platform/0x${block.author.value}`} text={block.author.value} />
+                        <HexString link={`/addr-platform/0x${block.author}`} text={block.author} />
                     </Col>
                 </Row>
                 <Row>
@@ -84,7 +84,7 @@ class BlockDetails extends React.Component<OwnProps> {
                         Score
                     </Col>
                     <Col md="10">
-                        {block.score.value.toString()}
+                        {block.score}
                     </Col>
                 </Row>
                 <Row>

diff --git a/client/components/block/BlockList/BlockList.tsx b/client/components/block/BlockList/BlockList.tsx
@@ -1,12 +1,12 @@
 import * as React from "react";
 import * as _ from "lodash";
-import { Block, ChangeShardState } from "codechain-sdk/lib/core/classes";
 
 import "./BlockList.scss";
 import HexString from "../../util/HexString/HexString";
+import { BlockDoc, Type, ChangeShardStateDoc } from "../../../db/DocType";
 
 interface OwnProps {
-    blocks: Block[]
+    blocks: BlockDoc[]
 }
 
 const BlockList = (prop: OwnProps) => {
@@ -20,7 +20,7 @@ const BlockList = (prop: OwnProps) => {
                                 Block #{block.number}
                             </td>
                             <td>
-                                <HexString text={block.hash.value} />
+                                <HexString text={block.hash} />
                             </td>
                         </tr>
                         <tr>
@@ -33,7 +33,7 @@ const BlockList = (prop: OwnProps) => {
                                         </tr>
                                         <tr>
                                             <td>Count of transactions</td>
-                                            <td>{_.sumBy(block.parcels, (parcel) => (parcel.unsigned.action instanceof ChangeShardState ? parcel.unsigned.action.transactions.length : 0))}</td>
+                                            <td>{_.sumBy(block.parcels, (parcel) => (Type.isChangeShardStateDoc(parcel.action) ? (parcel.action as ChangeShardStateDoc).transactions.length : 0))}</td>
                                         </tr>
                                         <tr>
                                             <td>Timestamp</td>

diff --git a/client/components/block/BlockParcelList/BlockParcelList.tsx b/client/components/block/BlockParcelList/BlockParcelList.tsx
@@ -1,25 +1,24 @@
 import * as React from "react";
 
-import { SignedParcel, ChangeShardState, Payment, SetRegularKey } from "codechain-sdk/lib/core/classes";
-
 import "./BlockParcelList.scss"
 import HexString from "../../util/HexString/HexString";
 import { Row, Col } from "reactstrap";
 import * as arrow from "./img/arrow.png";
+import { ParcelDoc, Type, PaymentDoc, ChangeShardStateDoc, SetRegularKeyDoc } from "../../../db/DocType";
 
 interface Props {
-    parcels: SignedParcel[];
+    parcels: ParcelDoc[];
 }
 
-const ParcelObjectByType = (parcel: SignedParcel) => {
-    if (parcel.unsigned.action instanceof Payment) {
+const ParcelObjectByType = (parcel: ParcelDoc) => {
+    if (Type.isPaymentDoc(parcel.action)) {
         return ([
             <Row key="payment-amount">
                 <Col md="2">
                     Amount
             </Col>
                 <Col md="10">
-                    {parcel.unsigned.action.amount.value.toString()}
+                    {(parcel.action as PaymentDoc).amount}
                 </Col>
             </Row>,
             <Row key="payment-sender-receiver">
@@ -32,7 +31,7 @@ const ParcelObjectByType = (parcel: SignedParcel) => {
                                         Sender
                                     </Col>
                                     <Col md="7">
-                                        <HexString link={`/addr-platform/0x${parcel.getSender().value}`} text={parcel.getSender().value} length={15} />
+                                        <HexString link={`/addr-platform/0x${parcel.sender}`} text={parcel.sender} length={15} />
                                     </Col>
                                 </Row>
                             </Col>
@@ -45,15 +44,15 @@ const ParcelObjectByType = (parcel: SignedParcel) => {
                                         Receiver
                                     </Col>
                                     <Col md="7">
-                                        <HexString link={`/addr-platform/0x${parcel.unsigned.action.receiver.value}`} text={parcel.unsigned.action.receiver.value} length={15} />
+                                        <HexString link={`/addr-platform/0x${(parcel.action as PaymentDoc).receiver}`} text={(parcel.action as PaymentDoc).receiver} length={15} />
                                     </Col>
                                 </Row>
                             </Col>
                         </Row>
                     </div>
                 </Col>
             </Row>])
-    } else if (parcel.unsigned.action instanceof ChangeShardState) {
+    } else if (Type.isChangeShardStateDoc(parcel.action)) {
         return <Row>
             <Col>
                 <div className="background-highlight">
@@ -62,19 +61,19 @@ const ParcelObjectByType = (parcel: SignedParcel) => {
                             Count of Txs
                         </Col>
                         <Col md="10">
-                            {parcel.unsigned.action.transactions.length}
+                            {(parcel.action as ChangeShardStateDoc).transactions.length}
                         </Col>
                     </Row>
                 </div>
             </Col>
         </Row>
-    } else if (parcel.unsigned.action instanceof SetRegularKey) {
+    } else if (Type.isSetRegularKeyDoc(parcel.action)) {
         return <Row>
             <Col md="2">
                 Key
             </Col>
             <Col md="10">
-                <HexString text={parcel.unsigned.action.key.value} />
+                <HexString text={(parcel.action as SetRegularKeyDoc).key} />
             </Col>
         </Row>
     }
@@ -95,10 +94,10 @@ const getClassNameByType = (type: string) => {
 const BlockParcelList = (props: Props) => {
     const { parcels } = props;
     return <div className="block-parcel-list">{parcels.map((parcel, i: number) => {
-        const hash = parcel.hash().value;
+        const hash = parcel.hash;
         return <div key={`block-parcel-${hash}`} className="parcel-item">
-            <div className={`type ${getClassNameByType(parcel.unsigned.action.toJSON().action)}`}>
-                {parcel.unsigned.action.toJSON().action}
+            <div className={`type ${getClassNameByType(parcel.action.action)}`}>
+                {parcel.action.action}
             </div>
             <Row>
                 <Col md="2">
@@ -113,15 +112,15 @@ const BlockParcelList = (props: Props) => {
                     Signer
                 </Col>
                 <Col md="10">
-                    <HexString link={`/address/0x${parcel.getSender().value}`} text={parcel.getSender().value} />
+                    <HexString link={`/address/0x${parcel.sender}`} text={parcel.sender} />
                 </Col>
             </Row>
             <Row>
                 <Col md="2">
                     Fee
                 </Col>
                 <Col md="10">
-                    {parcel.unsigned.fee.value.toString()}
+                    {parcel.fee}
                 </Col>
             </Row>
             {ParcelObjectByType(parcel)}

diff --git a/client/components/home/LatestBlocks/LatestBlocks.tsx b/client/components/home/LatestBlocks/LatestBlocks.tsx
@@ -4,14 +4,13 @@ import * as moment from "moment";
 import { Table } from 'reactstrap';
 import { Link } from "react-router-dom";
 
-import { Block } from "codechain-sdk/lib/core/classes";
-
 import './LatestBlocks.scss';
 import HexString from "../../util/HexString/HexString";
+import { BlockDoc } from "../../../db/DocType";
 
 interface Props {
     blocksByNumber: {
-        [n: number]: Block;
+        [n: number]: BlockDoc;
     }
 }
 
@@ -34,11 +33,11 @@ const LatestBlocks = (props: Props) => {
                     {
                         _.map(_.reverse(_.values(blocksByNumber)), block => {
                             return (
-                                <tr key={`home-block-num-${block.hash.value}`}>
+                                <tr key={`home-block-num-${block.hash}`}>
                                     <td scope="row"><Link to={`/block/${block.number}`}>{block.number}</Link></td>
                                     <td>{block.parcels.length}</td>
                                     <td>Block Reward</td>
-                                    <td><HexString link={`/addr-platform/0x${block.author.value}`} text={block.author.value} length={10} /></td>
+                                    <td><HexString link={`/addr-platform/0x${block.author}`} text={block.author} length={10} /></td>
                                     <td>{moment.unix(block.timestamp).fromNow()}</td>
                                 </tr>
                             );

diff --git a/client/components/home/LatestParcels/LatestParcels.tsx b/client/components/home/LatestParcels/LatestParcels.tsx
@@ -3,14 +3,13 @@ import * as _ from "lodash";
 import * as moment from "moment";
 import { Table } from 'reactstrap';
 
-import { Block } from "codechain-sdk/lib/core/classes";
-
 import './LatestParcels.scss';
 import HexString from "../../util/HexString/HexString";
+import { BlockDoc } from "../../../db/DocType";
 
 interface Props {
     blocksByNumber: {
-        [n: number]: Block;
+        [n: number]: BlockDoc;
     }
 }
 
@@ -33,13 +32,13 @@ const LatestParcels = (props: Props) => {
                     {
                         _.map(_.reverse(_.values(blocksByNumber)), block => {
                             return _.map(block.parcels, (parcel) => {
-                                const actionString = parcel.unsigned.action.toJSON().action;
+                                const actionString = parcel.action.action;
                                 return (
-                                    <tr key={`home-parcel-${parcel.hash().value}`}>
+                                    <tr key={`home-parcel-${parcel.hash}`}>
                                         <td><div className={`parcel-type text-center ${actionString === "changeShardState" ? "change-shard-state-type" : (actionString === "payment" ? "payment-type" : "set-regular-key-type")}`}>{actionString}</div></td>
-                                        <td scope="row"><HexString link={`/parcel/0x${parcel.hash().value}`} text={parcel.hash().value} length={10} /></td>
-                                        <td><HexString link={`/addr-platform/0x${parcel.getSender().value}`} text={parcel.getSender().value} length={10} /></td>
-                                        <td>{parcel.unsigned.fee.value.toString(10)}</td>
+                                        <td scope="row"><HexString link={`/parcel/0x${parcel.hash}`} text={parcel.hash} length={10} /></td>
+                                        <td><HexString link={`/addr-platform/0x${parcel.sender}`} text={parcel.sender} length={10} /></td>
+                                        <td>{parcel.fee}</td>
                                         <td>{moment.unix(block.timestamp).fromNow()}</td>
                                     </tr>
                                 );