Skip to content

Commit d216436

Browse files
author
Gilyoung Kim
committed
Update codechain-sdk, codechain-es
1 parent a863c03 commit d216436

File tree

24 files changed

+125
-107
lines changed

24 files changed

+125
-107
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"buffer": "^5.1.0",
2727
"case-sensitive-paths-webpack-plugin": "2.1.1",
2828
"chalk": "1.1.3",
29-
"codechain-es-temporary": "^0.1.0-rc1",
30-
"codechain-sdk": "^0.1.1-rc2",
29+
"codechain-es-temporary": "^0.1.0-rc7",
30+
"codechain-sdk": "^0.1.1-alpha.2",
3131
"concurrently": "^3.6.0",
3232
"cors": "^2.8.4",
3333
"css-loader": "0.28.7",

‎scripts/serve.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dotenv.config();
77
const port = process.env.SERVE_PORT || "5000";
88

99
app.use(express.static(path.join(__dirname, "../", "build")));
10-
app.use(express.static(path.join(__dirname, "../", "download")));
1110

1211
app.get("/*", function(req, res) {
1312
res.sendFile(path.join(__dirname, "../", "build", "index.html"));

‎src/client/_globals.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
color: $payment-action-primary-color;
99
}
1010

11-
.change-shard-state-action-back-color {
12-
background-color: $change-shard-state-action-primary-color;
11+
.asset-transaction-group-action-back-color {
12+
background-color: $asset-transaction-group-action-primary-color;
1313
}
1414

15-
.change-shard-state-action-text-color {
16-
color: $change-shard-state-action-primary-color;
15+
.asset-transaction-group-action-text-color {
16+
color: $asset-transaction-group-action-primary-color;
1717
}
1818

1919
.set-regular-key-action-back-color {

‎src/client/_variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $line-color: #bdbdbd;
99
$primary-color: #3a3fab;
1010
// action
1111
$payment-action-primary-color: #f2b04c;
12-
$change-shard-state-action-primary-color: #6ad400;
12+
$asset-transaction-group-action-primary-color: #6ad400;
1313
$set-regular-key-action-primary-color: #ff866c;
1414
// transaction
1515
$asset-transfer-transaction-primary-color: #9e6cf1;

‎src/client/components/block/BlockDetails/BlockDetails.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as React from "react";
44
import { Col, Row } from "reactstrap";
55
import DataSet from "../../util/DataSet/DataSet";
66

7-
import { BlockDoc, ChangeShardStateDoc } from "codechain-es-temporary/lib/types";
7+
import { AssetTransactionGroupDoc, BlockDoc } from "codechain-es-temporary/lib/types";
88
import { Type } from "codechain-es-temporary/lib/utils";
99
import { Link } from "react-router-dom";
1010
import { CommaNumberString } from "../../util/CommaNumberString/CommaNumberString";
@@ -98,9 +98,10 @@ class BlockDetails extends React.Component<OwnProps> {
9898
{_.reduce(
9999
block.parcels,
100100
(memo, parcel) => {
101-
if (Type.isChangeShardStateDoc(parcel.action)) {
101+
if (Type.isAssetTransactionGroupDoc(parcel.action)) {
102102
return (
103-
(parcel.action as ChangeShardStateDoc).transactions.length + memo
103+
(parcel.action as AssetTransactionGroupDoc).transactions.length +
104+
memo
104105
);
105106
} else {
106107
return memo;

‎src/client/components/home/LatestParcels/LatestParcels.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const LatestParcels = (props: Props) => {
4242
<HexString link={`/parcel/0x${parcel.hash}`} text={parcel.hash} />
4343
</td>
4444
<td>
45-
<Link to={`/addr-platform/${parcel.sender}`}>{parcel.sender}</Link>
45+
<Link to={`/addr-platform/${parcel.signer}`}>{parcel.signer}</Link>
4646
</td>
4747
<td>
4848
<CommaNumberString text={changeQuarkStringToCCC(parcel.fee)} />

‎src/client/components/parcel/ParcelDetails/ParcelDetails.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as React from "react";
33
import { Col, Row } from "reactstrap";
44

55
import {
6-
ChangeShardStateDoc,
6+
AssetTransactionGroupDoc,
77
CreateShardDoc,
88
ParcelDoc,
99
PaymentDoc,
@@ -35,7 +35,7 @@ const getElementByType = (parcel: ParcelDoc) => {
3535
<Row key="parcel-header-table-payment-sender">
3636
<Col md="3">Sender</Col>
3737
<Col md="9">
38-
<Link to={`/addr-platform/${parcel.sender}`}>{parcel.sender}</Link>
38+
<Link to={`/addr-platform/${parcel.signer}`}>{parcel.signer}</Link>
3939
</Col>
4040
</Row>,
4141
<hr key="line1" />,
@@ -69,11 +69,11 @@ const getElementByType = (parcel: ParcelDoc) => {
6969
</Row>,
7070
<hr key="line" />
7171
];
72-
} else if (Type.isChangeShardStateDoc(parcel.action)) {
72+
} else if (Type.isAssetTransactionGroupDoc(parcel.action)) {
7373
return [
74-
<Row key="parcel-header-table-change-shard-state-key">
74+
<Row key="parcel-header-table-asset-transaction-group-key">
7575
<Col md="3"># of Transactions</Col>
76-
<Col md="9">{(parcel.action as ChangeShardStateDoc).transactions.length.toLocaleString()}</Col>
76+
<Col md="9">{(parcel.action as AssetTransactionGroupDoc).transactions.length.toLocaleString()}</Col>
7777
</Row>,
7878
<hr key="line" />
7979
];
@@ -149,7 +149,7 @@ const ParcelDetails = (props: Props) => {
149149
<Row>
150150
<Col md="3">Signer</Col>
151151
<Col md="9">
152-
<Link to={`/addr-platform/${parcel.sender}`}>{parcel.sender}</Link>
152+
<Link to={`/addr-platform/${parcel.signer}`}>{parcel.signer}</Link>
153153
</Col>
154154
</Row>
155155
<hr />

‎src/client/components/parcel/ParcelList/ParcelList.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as _ from "lodash";
44
import * as moment from "moment";
55
import * as React from "react";
66

7-
import { ChangeShardStateDoc, ParcelDoc, PaymentDoc, SetRegularKeyDoc } from "codechain-es-temporary/lib/types";
7+
import { AssetTransactionGroupDoc, ParcelDoc, PaymentDoc, SetRegularKeyDoc } from "codechain-es-temporary/lib/types";
88
import { Type } from "codechain-es-temporary/lib/utils";
99
import { Link } from "react-router-dom";
1010
import { Col, Row } from "reactstrap";
@@ -95,10 +95,10 @@ class ParcelList extends React.Component<Props, State> {
9595
<Row>
9696
<Col md="3">Signer</Col>
9797
<Col md="9">
98-
{address && address === parcel.sender ? (
99-
parcel.sender
98+
{address && address === parcel.signer ? (
99+
parcel.signer
100100
) : (
101-
<Link to={`/addr-platform/${parcel.sender}`}>{parcel.sender}</Link>
101+
<Link to={`/addr-platform/${parcel.signer}`}>{parcel.signer}</Link>
102102
)}
103103
</Col>
104104
</Row>
@@ -147,10 +147,10 @@ class ParcelList extends React.Component<Props, State> {
147147
<Row>
148148
<Col md="5">
149149
<div className="sender-receiver-container">
150-
{address && address === parcel.sender ? (
151-
parcel.sender
150+
{address && address === parcel.signer ? (
151+
parcel.signer
152152
) : (
153-
<Link to={`/addr-platform/${parcel.sender}`}>{parcel.sender}</Link>
153+
<Link to={`/addr-platform/${parcel.signer}`}>{parcel.signer}</Link>
154154
)}
155155
</div>
156156
</Col>
@@ -177,22 +177,22 @@ class ParcelList extends React.Component<Props, State> {
177177
</Col>
178178
</Row>
179179
];
180-
} else if (Type.isChangeShardStateDoc(parcel.action)) {
180+
} else if (Type.isAssetTransactionGroupDoc(parcel.action)) {
181181
return (
182182
<Row>
183183
<Col md="3"># of Txs</Col>
184184
<Col md="9">
185-
{(parcel.action as ChangeShardStateDoc).transactions.length.toLocaleString()}
185+
{(parcel.action as AssetTransactionGroupDoc).transactions.length.toLocaleString()}
186186
<div className="small-text">
187187
<FontAwesomeIcon icon={faSquare} className="asset-transfer-transaction-text-color" />{" "}
188188
Transfer:{" "}
189-
{_.filter((parcel.action as ChangeShardStateDoc).transactions, tx =>
189+
{_.filter((parcel.action as AssetTransactionGroupDoc).transactions, tx =>
190190
Type.isAssetTransferTransactionDoc(tx)
191191
).length.toLocaleString()}
192192
</div>
193193
<div className="small-text">
194194
<FontAwesomeIcon icon={faSquare} className="asset-mint-transaction-text-color" /> Mint:{" "}
195-
{_.filter((parcel.action as ChangeShardStateDoc).transactions, tx =>
195+
{_.filter((parcel.action as AssetTransactionGroupDoc).transactions, tx =>
196196
Type.isAssetMintTransactionDoc(tx)
197197
).length.toLocaleString()}
198198
</div>

‎src/client/components/util/ActionBadge/ActionBadge.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ interface Props {
1010
}
1111
const getBadgeClassNameByAction = (action: string) => {
1212
switch (action) {
13-
case "changeShardState":
14-
return "change-shard-state-action-text-color";
13+
case "assetTransactionGroup":
14+
return "asset-transaction-group-action-text-color";
1515
case "payment":
1616
return "payment-action-text-color";
1717
case "setRegularKey":
@@ -22,8 +22,8 @@ const getBadgeClassNameByAction = (action: string) => {
2222

2323
const getActionString = (action: string) => {
2424
switch (action) {
25-
case "changeShardState":
26-
return "ChangeShardState";
25+
case "assetTransactionGroup":
26+
return "AssetTransactionGroup";
2727
case "payment":
2828
return "Payment";
2929
case "setRegularKey":

‎src/client/components/util/ImageLoader/ImageLoader.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ interface State {
1313
}
1414

1515
export class ImageLoader extends React.Component<Props, State> {
16+
private host = process.env.REACT_APP_SERVER_HOST ? process.env.REACT_APP_SERVER_HOST : "http://localhost:8081";
1617
constructor(prop: Props) {
1718
super(prop);
1819
let requestUrl;
1920
if (prop.isAssetImage) {
20-
requestUrl = `${process.env.PUBLIC_URL}/assetImage/${prop.data}.png`;
21+
requestUrl = `${this.host}/api/asset/image/${prop.data}`;
2122
} else {
2223
requestUrl = this.getDefaultImage();
2324
}

0 commit comments

Comments
 (0)