testnet

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8 AS build
+FROM node:10 AS build
 
 ARG CONF_SWITCH
 ENV CONF_SWITCH ${CONF_SWITCH:-buildOfficialProd}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "waves-blockchain-explorer",
-    "version": "3.0.1",
+    "version": "3.2.4-testnet",
     "private": true,
     "description": "Waves blockchain information tool",
     "repository": {
@@ -13,12 +13,14 @@
         "app:dev": "webpack --mode development --config=webpack.config.js",
         "app:prod": "webpack --mode production --config=webpack.config.js",
         "test": "jest",
-        "build:dev": "yarn test && yarn app:dev",
-        "build:prod": "yarn test && yarn app:prod"
+        "build:dev": "yarn app:dev",
+        "build:prod": "yarn app:prod"
     },
     "dependencies": {
         "@babel/runtime": "^7.3.4",
         "@sentry/browser": "^4.6.4",
+        "@waves/node-api-js": "1.2.5-beta.13",
+        "@waves/ride-js": "2.1.5-beta.3",
         "@waves/signature-generator": "^5.0.0",
         "amplitude-js": "^4.6.0-beta.2",
         "axios": "0.19.0",
@@ -66,7 +68,7 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^24.9.0",
         "lodash-webpack-plugin": "^0.11.5",
-        "node-sass": "^4.13.1",
+        "node-sass": "^5.0.0",
         "react-test-renderer": "^16.8.4",
         "sass-loader": "7.0.3",
         "sass-resources-loader": "1.3.3",

src/js/App.js

@@ -18,6 +18,7 @@ import NodesPage from './pages/NodesPage';
 import BlocksPage from './pages/BlocksPage';
 import SingleBlockPage from './pages/SingleBlockPage';
 import SingleTransactionPage from './pages/SingleTransactionPage';
+import SingleLeasePage from './pages/SingleLeasePage';
 import SingleAddressPage from './pages/SingleAddressPage';
 import SingleAliasPage from './pages/SingleAliasPage';
 import SingleAssetPage from './pages/SingleAssetPage';
@@ -87,6 +88,7 @@ class App extends React.Component {
                             <Route exact path={routes.blocks.one(routeParams.blockHeight)} component={SingleBlockPage} />
                             <Route exact path={routes.blocks.list} component={BlocksPage} />
                             <Route exact path={routes.transactions.one(routeParams.transactionId)} component={SingleTransactionPage} />
+                            <Route exact path={routes.leases.one(routeParams.leaseId)} component={SingleLeasePage} />
                             <Route exact path={routes.addresses.one(routeParams.address)} component={SingleAddressPage} />
                             <Route exact path={routes.addresses.one(routeParams.address, routeParams.tab)} component={SingleAddressPage} />
                             <Route exact path={routes.aliases.one(routeParams.alias)} component={SingleAliasPage} />

src/js/ConfigurationForm.js

@@ -55,7 +55,7 @@ const validate = values => {
                 }
             });
     }).then(versionResponse => {
-        if (!versionResponse.data.version) {
+        if (!versionResponse.version) {
             throw {
                 apiBaseUrl: `Node has failed to report it's version`
             }

src/js/Footer.js

@@ -30,7 +30,7 @@ const Footer = ({version}) => {
                     (<a key={item.id} className={`social ${item.id}`} href={item.url} target="_blank"></a>))}
             </div>
             <div>
-                <a className="fade" href="https://wavesplatform.com" target="_blank">wavesplatform.com</a>
+                <a className="fade" href="https://waves.tech/" target="_blank">waves.tech</a>
             </div>
         </div>
     );

src/js/Search.js

@@ -102,7 +102,7 @@ class Search extends React.PureComponent {
                 <input
                     className="search-input"
                     ref={this.inputRef}
-                    placeholder="Search address, transaction id, block signature, alias"
+                    placeholder="Search address, transaction id, block id, alias, lease id"
                     onKeyUp={this.handleKeyUp}
                     onChange={this.handleChange}
                     value={this.state.searchText}

src/js/components/Dictionary/Dictionary.view.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import Headline, {HeadlineSize} from '../Headline';
 import DictionaryItem from '../DictionaryItem';
@@ -14,15 +13,11 @@ const DictionaryItemSection = ({section, items}) => (
 );
 
 export class Dictionary extends React.Component {
-    static propTypes = {
-        items: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.shape(DictionaryItem.propTypes))).isRequired
-    };
-
     render() {
         return (
             <div className="dictionary">
                 {Object.keys(this.props.items).map((key, index) => {
-                    return <DictionaryItemSection key={index} section={key} items={this.props.items[key]} />
+                    return <DictionaryItemSection key={index} section={key} items={this.props.items[key]}/>
                 })}
             </div>
         );

src/js/components/InvocationInfo/InvocationInfo.view.js

@@ -10,33 +10,47 @@ const ParameterMapper = ({type, value}) => {
     switch (type) {
         case "string":
         case "binary":
-            return <StringParameter value={value} />;
-
+            return <StringParameter value={value}/>;
+        case "list": {
+            return <React.Fragment key={`param${value}`}>
+                [
+                {value.map((x, i) => <React.Fragment key={`param${i}`}>
+                    {ParameterMapper(x)}
+                    {
+                        value.length - 1 !== i
+                            ? ', '
+                            : null
+                    }
+                </React.Fragment>)
+                }
+                ]
+            </React.Fragment>
+        }
         default:
-            return <GenericParameter value={value} />;
+            return <GenericParameter value={value}/>;
     }
 };
 
 export class InvocationInfoView extends React.Component {
-    static propTypes = {
-        function: PropTypes.string.isRequired,
-        args: PropTypes.arrayOf(PropTypes.shape({
-            type: PropTypes.string,
-            value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.bool, PropTypes.instanceOf(BigNumber)])
-        })).isRequired
-    };
+    // static propTypes = {
+    //     function: PropTypes.string.isRequired,
+    //     args: PropTypes.arrayOf(PropTypes.shape({
+    //         type: PropTypes.string,
+    //         value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.bool, PropTypes.instanceOf(BigNumber)])
+    //     })).isRequired
+    // };
 
     render() {
         return (
             <div className="data-container">
-                <pre>{this.props.function}&nbsp;
+                <div style={{display: 'flex', flexWrap: 'wrap'}}>{this.props.function}&nbsp;
                     ({this.props.args.map((item, index) => {
                         return <React.Fragment key={`param${index}`}>
-                                {!!index && ', '}
-                                <ParameterMapper key={index} {...item}/>
-                            </React.Fragment>;
+                            {!!index && ', '}
+                            <ParameterMapper key={index} {...item}/>
+                        </React.Fragment>;
                     })})
-                </pre>
+                </div>
             </div>
         );
     }

src/js/components/LeaseRef/LeaseRef.view.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import {withRouter} from 'react-router';
+import {Link} from 'react-router-dom';
+
+import {routeBuilder} from '../../shared/Routing';
+
+class LeaseRef extends React.PureComponent {
+    render() {
+        const props = this.props;
+        const {networkId} = this.props.match.params;
+        const routes = routeBuilder(networkId);
+
+        return (<Link to={routes.leases.one(props.leaseId)}>{props.leaseId}</Link>);
+    }
+}
+
+export const RoutedLeaseRef = withRouter(LeaseRef);

src/js/components/LeaseRef/index.js

@@ -0,0 +1 @@
+export {RoutedLeaseRef as default} from './LeaseRef.view';

src/js/components/MoneyInfo/MoneyInfo.view.js

@@ -3,9 +3,10 @@ import PropTypes from 'prop-types';
 import MoneyClass from '../../shared/Money';
 import CurrencyRef from '../CurrencyRef';
 
-export const MoneyInfo = ({value}) => (
-    <span>{value.formatAmount(true, true)} <CurrencyRef currency={value.currency}/></span>
-);
+export const MoneyInfo = ({value}) => {
+    return <span>{value.formatAmount(true, true)} <CurrencyRef currency={value.currency}/></span>
+
+};
 
 MoneyInfo.propTypes = {
     value: PropTypes.instanceOf(MoneyClass).isRequired

src/js/components/ScriptInfo/ScriptInfo.container.js

@@ -1,9 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { withRouter } from 'react-router';
+import {withRouter} from 'react-router';
 
-import { BASE64_FORMAT, DECOMPILED_FORMAT, ScriptInfoView } from './ScriptInfo.view';
+import {BASE64_FORMAT, DECOMPILED_FORMAT, ScriptInfoView} from './ScriptInfo.view';
 import ServiceFactory from '../../services/ServiceFactory';
+import {decompile} from "@waves/ride-js";
 
 class ScriptInfoContainer extends React.Component {
     static propTypes = {
@@ -15,9 +16,11 @@ class ScriptInfoContainer extends React.Component {
         this.state = {
             value: ''
         };
-        this.setDecompiledScript();
     }
 
+    componentDidMount() {
+        this.setDecompiledScript();
+    }
 
     componentDidUpdate(prevProps) {
         if (this.props.script !== prevProps.script) {
@@ -34,12 +37,16 @@ class ScriptInfoContainer extends React.Component {
     };
 
     setDecompiledScript = () => {
-        const {networkId} = this.props.match.params;
-        this.props.script && ServiceFactory
-            .forNetwork(networkId)
-            .addressService()
-            .decompileScript(this.props.script, networkId)
-            .then(decompiledScript => this.setState({value: decompiledScript}));
+        if (this.props.script) {
+            try {
+                const decompilationResult = decompile(this.props.script);
+                const decompiledScript = !decompilationResult.error ? decompilationResult.result : decompilationResult.error;
+                this.setState({value: decompiledScript});
+            } catch (e) {
+                console.error('Decompilation error:', e)
+                this.setState({value: 'Decompilation error'});
+            }
+        }
     };
 
     render() {