Stagenet

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8 AS build
+FROM node:15 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-stagenet",
     "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.18",
+        "@waves/ride-js": "2.2.0-beta.5",
         "@waves/signature-generator": "^5.0.0",
         "amplitude-js": "^4.6.0-beta.2",
         "axios": "0.19.0",
@@ -27,19 +29,19 @@
         "dexie": "^2.0.4",
         "formik": "^1.5.8",
         "json-bigint": "^0.3.0",
-        "lodash": "4.17.15",
+        "lodash": "^4.17.20",
         "prop-types": "15.6.2",
-        "react": "16.6.1",
-        "react-copy-to-clipboard": "5.0.1",
-        "react-dom": "16.6.1",
-        "react-ga": "^2.5.7",
-        "react-google-recaptcha": "^1.0.5",
-        "react-hot-loader": "4.3.12",
-        "react-infinite-scroller": "^1.2.4",
-        "react-modal": "^3.7.1",
-        "react-router": "4.3.1",
-        "react-router-dom": "4.3.1",
-        "react-scroll-up": "^1.3.3",
+        "react": "16.14.0",
+        "react-copy-to-clipboard": "5.0.4",
+        "react-dom": "16.14.0",
+        "react-ga": "2.7.0",
+        "react-google-recaptcha": "^1.1.0",
+        "react-hot-loader": "4.13.0",
+        "react-infinite-scroller": "1.2.4",
+        "react-modal": "3.14.3",
+        "react-router": "5.2.1",
+        "react-router-dom": "5.3.0",
+        "react-scroll-up": "^1.3.7",
         "react-tooltip": "^3.11.1",
         "retry-axios": "^0.3.2",
         "semver": "^6.3.0",
@@ -66,15 +68,15 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^24.9.0",
         "lodash-webpack-plugin": "^0.11.5",
-        "node-sass": "^4.13.1",
+        "node-sass": "^6.0.1",
         "react-test-renderer": "^16.8.4",
         "sass-loader": "7.0.3",
         "sass-resources-loader": "1.3.3",
         "style-loader": "0.21.0",
-        "webpack": "4.26.0",
+        "webpack": "^4.26.0",
         "webpack-bundle-analyzer": "3.3.2",
         "webpack-cli": "3.1.2",
-        "webpack-dev-server": "3.1.14"
+        "webpack-dev-server": "^3.11.0"
     },
     "resolutions": {
         "fstream": "1.0.12",

src/js/App.js

@@ -18,11 +18,13 @@ 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';
 import FaucetPage from './pages/FaucetPage'
 import UnsupportedPage from './pages/UnsupportedPage';
+import ConvertEthPage from './pages/ConvertEthPage';
 
 const routeParams = routeParamsBuilder(ServiceFactory.global().configurationService().all());
 const routes = routeBuilder(routeParams.networkId);
@@ -87,13 +89,15 @@ 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} />
                             <Route exact path={routes.assets.one(routeParams.assetId)} component={SingleAssetPage} />
                             <Route path={routes.nodes.list} component={NodesPage} />
                             <Route path={routes.peers.list} component={PeersPage} />
                             <Route exact path={routes.faucet} component={FaucetPage} />
+                            <Route exact path={routes.converters} component={ConvertEthPage} />
                             <Route path={routes.root} component={MainPage} />
                         </Switch>
                     </div>

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/NavMenu.js

@@ -39,6 +39,11 @@ const buildItems = () => {
         route: networkId => routeBuilder(networkId).faucet,
         visible: visibleIfConfigured,
         icon: 'icon-faucet'
+    }, {
+        title: 'Converters',
+        route: networkId => routeBuilder(networkId).converters,
+        visible: alwaysVisible,
+        icon: 'icon-converters'
     }];
 };
 

src/js/Search.js

@@ -30,6 +30,7 @@ class Search extends React.PureComponent {
             });
 
             const {networkId} = this.props.match.params;
+
             const searchService = ServiceFactory.forNetwork(networkId).searchService();
 
             return searchService.search(this.state.searchText).then(route => {
@@ -102,7 +103,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>
         );