Merge DEV into LAC CHAIN (#333)

* Document the wallet configuration proccess and the related hapi
env variables. refs #137

* Document the wallet configuration proccess and the related
hapi env variables. refs #137

* fix typos. refs #137

* fix typos. refs #137

* fix: add missing parameter. refs #137

* reduce final bundle size  (#293)

* chore: avoid load unused icons from ual-reactjs-renderer to reduce the final bundle size

* chore: update eslint config

* feat: add new actions for permissioning committee and entity account (#332)

Co-authored-by: kurono <kurono@riseup.net>
Co-authored-by: adriel <adriexnet@gmail.com>

.env.jungle

@@ -23,7 +23,7 @@ HAPI_EOS_API_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910
 HAPI_EOS_BASE_ACCOUNT=baseaccount
 HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
 HAPI_EOS_MECHANICS_ACCOUNT=eosmechatero
-HAPI_EOS_MECHANICS_PASSWORD=PW5KTjY7p5CE44vrJcdEwGTijo5Dc6bg4YFnKQqzcdAypatudb2cv
+HAPI_EOS_MECHANICS_PASSWORD=PW...
 HAPI_EOS_WALLET_URL=http://wallet:8888
 HAPI_EOS_EXCHANGE_RATE_API=http://api.coinlayer.com/api/live?symbols=EOS&access_key=e7146e1015657fa7bc3495bdf6302052
 HAPI_EOS_BP_JSON_ON_CHAIN=false

.env.lacchain

@@ -24,7 +24,7 @@ HAPI_EOS_API_CHAIN_ID=5821525c6588037e2b066b992fcac34909a5b7f1ea8d5a393f6720fca3
 HAPI_EOS_BASE_ACCOUNT=baseaccount
 HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
 HAPI_EOS_MECHANICS_ACCOUNT=eosmechanics
-HAPI_EOS_MECHANICS_PASSWORD=PW5Kd9uRABQEiaWZ3UZYTfiY8ZgJYKiELRUrRRtTeucGxpHx5obDZ
+HAPI_EOS_MECHANICS_PASSWORD=PW...
 HAPI_EOS_MECHANICS_INCLUDE_TRANSACTION={"account":"writer","name":"run","authorization":[{"actor":"costarica","permission":"writer"}],"data":{}}
 HAPI_EOS_WALLET_URL=http://wallet:8888
 HAPI_EOS_BP_JSON_ON_CHAIN=false

docs/wallet-config.md

@@ -0,0 +1,47 @@
+# Dashboard wallet creation and configuration
+
+The EOSIO dashboard collects information from different networks but also
+allows users to execute specific administrative actions on certain networks,
+by EOSIO accounts and their respective keys. All this requires to use a 
+wallet that acts as an intermediary to sign transactions and interact with
+permissioned actions in the networks.
+
+Here we explain how to create and configure such a wallet for the EOSIO
+dashboard. Inside the wallet pod, please execute the following commands:
+
+```bash
+# Create a default wallet
+cleos --wallet-url http://localhost:8888 wallet create --to-console
+# Create a wallet called eosmechanics
+cleos --wallet-url http://localhost:8888 wallet create -n eosmechanics --to-console
+```
+
+The previews commands will create a default wallet and another wallet called
+eosmechanics. The returned passwords (a string starting with PW...) should be
+used to fulfill the following environment variables:
+
+```bash
+HAPI_EOS_BASE_ACCOUNT=eosmechanics
+HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
+HAPI_EOS_MECHANICS_ACCOUNT=eosmechanics
+HAPI_EOS_MECHANICS_PASSWORD=PW...
+```
+
+Let's make sure that the wallet was created correctly:
+
+```bash
+cleos -u https://jungle.eosio.cr --wallet-url http://localhost:8888 wallet list
+```
+
+If the wallet is present but locked, then execute the following command:
+
+```bash
+cleos -u https://jungle.eosio.cr --wallet-url http://localhost:8888 wallet unlock -n eosmechanics
+```
+
+Finally, we will import an EOSIO key for reading information about statistics of the block
+producers called eosmechanics (Ask the admins about the key):
+
+```bash
+cleos -u https://jungle.eosio.cr --wallet-url http://localhost:8888 wallet import -n eosmechanics
+```

makefile

@@ -82,11 +82,11 @@ start-hasura-cli:
 start-webapp:
 	$(eval -include .env)
 	@until \
-		curl http://localhost:8585/healthz; \
+		curl -s -o /dev/null -w 'hasura status %{http_code}\n' http://localhost:8585/healthz; \
 		do echo "$(BLUE)$(STAGE)-$(APP_NAME)-webapp |$(RESET) waiting for hasura service"; \
 		sleep 5; done;
-	@echo "..."
-	@docker-compose up -d --build webapp
+	@cd webapp && yarn && yarn start:local | cat
+	@echo "done webapp"
 
 start-logs:
 	@docker-compose logs -f hapi webapp

webapp/.eslintrc

@@ -3,9 +3,10 @@
   "extends": [
     "standard",
     "standard-react",
-    "plugin:prettier/recommended",
     "prettier/react",
-    "prettier/standard"
+    "prettier/standard",
+    "plugin:react/recommended",
+    "plugin:prettier/recommended"
   ],
   "env": {
     "jest": true,

webapp/package.json

@@ -8,7 +8,8 @@
     "build": "react-app-rewired build",
     "eject": "react-scripts eject",
     "lint": "lint-staged",
-    "test": "react-app-rewired test --env=jsdom"
+    "test": "react-app-rewired test --env=jsdom",
+    "start:local": "env-cmd -f ../.env react-app-rewired start"
   },
   "husky": {
     "hooks": {
@@ -23,6 +24,7 @@
     "not op_mini all"
   ],
   "dependencies": {
+    "@eoscostarica/ual-reactjs-renderer": "^0.3.1",
     "@apollo/react-hooks": "^4.0.0",
     "@date-io/core": "^2.10.6",
     "@eoscostarica/eoscr-components": "^3.1.0",
@@ -80,7 +82,6 @@
     "ual-ledger": "^0.3.0",
     "ual-lynx": "^0.4.0",
     "ual-meetone": "^0.1.1",
-    "ual-reactjs-renderer": "^0.3.1",
     "ual-scatter": "^0.3.0",
     "ual-token-pocket": "^0.3.0"
   },

webapp/src/components/ContractActionForm.js

@@ -16,6 +16,7 @@ import LacchainAddEntityActionEntityTypeField from './LacchainAddEntityActionEnt
 import LacchainAddValidatorActionEntityField from './LacchainAddValidatorActionEntityField'
 import LacchainAddValidatorActionValidatorAuthorityField from './LacchainAddValidatorActionValidatorAuthorityField'
 import LacchainSetScheduleActionValidatorsField from './LacchainSetScheduleActionValidatorsField'
+import EOSIONewAccountAuthority from './EOSIONewAccountAuthority'
 
 const useStyles = makeStyles((theme) => ({
   formControl: {
@@ -164,6 +165,42 @@ const ContractActionForm = ({ accountName, action, abi, onSubmitAction }) => {
             onChange={handleFieldChange(field.name)}
           />
         )
+      case 'eosio.newaccount.owner':
+        return (
+          <EOSIONewAccountAuthority
+            key={`action-field-${field.name}`}
+            label={field.name}
+            variant="outlined"
+            className={classes.formControl}
+            value={payload[field.name] || ''}
+            onChange={handleFieldChange(field.name)}
+            InputProps={{
+              endAdornment: (
+                <InputAdornment position="end">
+                  <Chip label="public_key" />
+                </InputAdornment>
+              )
+            }}
+          />
+        )
+      case 'eosio.newaccount.active':
+        return (
+          <EOSIONewAccountAuthority
+            key={`action-field-${field.name}`}
+            label={field.name}
+            variant="outlined"
+            className={classes.formControl}
+            value={payload[field.name] || ''}
+            onChange={handleFieldChange(field.name)}
+            InputProps={{
+              endAdornment: (
+                <InputAdornment position="end">
+                  <Chip label="public_key" />
+                </InputAdornment>
+              )
+            }}
+          />
+        )
       default:
         return (
           <TextField

webapp/src/components/EOSIONewAccountAuthority.js

@@ -0,0 +1,56 @@
+/* eslint camelcase: 0 */
+import React, { useEffect, useState } from 'react'
+import PropTypes from 'prop-types'
+import TextField from '@material-ui/core/TextField'
+
+import getAuthoritTemplate from '../utils/get-authority-template'
+
+const LacchainNewAccount = ({
+  value,
+  onChange,
+  label,
+  variant,
+  className,
+  ...props
+}) => {
+  const [internalValue, setInternalValue] = useState()
+
+  const handleOnFieldChange = (event) => {
+    onChange({
+      target: {
+        value: getAuthoritTemplate(event.target.value)
+      }
+    })
+  }
+
+  useEffect(() => {
+    if (!value) {
+      return
+    }
+
+    try {
+      setInternalValue(value?.keys[0]?.key || '')
+    } catch (error) {}
+  }, [value])
+
+  return (
+    <TextField
+      {...props}
+      className={className}
+      value={internalValue || ''}
+      onChange={handleOnFieldChange}
+      label={label}
+      variant={variant}
+    />
+  )
+}
+
+LacchainNewAccount.propTypes = {
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+  label: PropTypes.string,
+  variant: PropTypes.string,
+  className: PropTypes.string
+}
+
+export default LacchainNewAccount

webapp/src/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'
-import { UALProvider, withUAL } from 'ual-reactjs-renderer'
+import { UALProvider, withUAL } from '@eoscostarica/ual-reactjs-renderer'
 import { ApolloProvider } from '@apollo/react-hooks'
 import { ThemeProvider as MuiThemeProvider } from '@material-ui/core/styles'
 import { StylesProvider } from '@material-ui/styles'

webapp/src/language/en.lacchain.json

@@ -58,6 +58,10 @@
     "setentxinfoTitle": "Set extended entity info",
     "setentxinfoTooltip": "Set extended entity info.",
     "setnodexinfoTitle": "Set extended node info",
-    "setnodexinfoTooltip": "Set extended node info."
+    "setnodexinfoTooltip": "Set extended node info.",
+    "rmnodeTitle": "Remove Node",
+    "rmnodeTooltip": "Allow remove a Validator Node from the network.",
+    "rmentityTitle": "Remove Entity",
+    "rmentityTooltip": "Allow remove an entity from the network."
   }
 }

webapp/src/routes/Lacchain/LacchainManagement.js

@@ -120,7 +120,9 @@ const LacchainManagement = ({ ual }) => {
           'netaddgroup',
           'setram',
           'setentxinfo',
-          'setnodexinfo'
+          'setnodexinfo',
+          'rmnode',
+          'rmentity'
         ]
       }
 
@@ -144,7 +146,8 @@ const LacchainManagement = ({ ual }) => {
           'addboot',
           'addobserver',
           'addwriter',
-          'addvalidator'
+          'addvalidator',
+          'rmnode'
         ]
       }
 

webapp/src/utils/get-authority-template.js

@@ -0,0 +1,23 @@
+import { eosConfig } from '../config'
+
+const getAuthoritTemplate = (key) => {
+  if (eosConfig.networkName === 'lacchain') {
+    return {
+      threshold: 2,
+      keys: [{ weight: 1, key: key || '' }],
+      accounts: [
+        { weight: 1, permission: { actor: 'writer', permission: 'access' } }
+      ],
+      waits: []
+    }
+  }
+
+  return {
+    threshold: 1,
+    keys: [{ weight: 1, key: key || '' }],
+    accounts: [],
+    waits: []
+  }
+}
+
+export default getAuthoritTemplate