Merge branch 'develop' into 'master'

Develop See merge request ecentrics/concordia!29
3 years ago · 3831d94706
15 changed files with 3428 additions and 3039 deletions
--- a/docker/concordia-app/Dockerfile
+++ b/docker/concordia-app/Dockerfile
@ -1,7 +1,7 @@
 # --------------------------------------------------
 # Stage 1 (Init application build base)
 # --------------------------------------------------
-FROM node:14-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as base
+FROM node:16-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as base
 LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
 LABEL maintainers.2="Panagiotis Nikolaidis <ezerous@gmail.com>"
 LABEL gr.thmmy.ecentrics.concordia-image.name="app"
--- a/docker/concordia-contracts-provider/Dockerfile
+++ b/docker/concordia-contracts-provider/Dockerfile
@ -1,7 +1,7 @@
 # --------------------------------------------------
 # Stage 1 (Runtime)
 # --------------------------------------------------
-FROM node:14-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as runtime
+FROM node:16-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as runtime
 LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
 LABEL maintainers.2="Panagiotis Nikolaidis <ezerous@gmail.com>"
 LABEL gr.thmmy.ecentrics.concordia-image.name="contracts-provider"
--- a/docker/concordia-contracts/Dockerfile
+++ b/docker/concordia-contracts/Dockerfile
@ -1,7 +1,7 @@
 # --------------------------------------------------
 # Stage 1 (Init contracts build base)
 # --------------------------------------------------
-FROM node:14-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as base
+FROM node:16-alpine@sha256:51e341881c2b77e52778921c685e711a186a71b8c6f62ff2edfc6b6950225a2f as base
 LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
 LABEL maintainers.2="Panagiotis Nikolaidis <ezerous@gmail.com>"
 LABEL gr.thmmy.ecentrics.concordia-image.name="contracts"
--- a/docker/concordia-pinner/Dockerfile
+++ b/docker/concordia-pinner/Dockerfile
@ -1,7 +1,7 @@
 # --------------------------------------------------
 # Stage 1 (Runtime)
 # --------------------------------------------------
-FROM node:14-buster@sha256:32362e2ea89c62d77c86c8f26ad936dbbdc170cd6c06c4d7ff7a809012bb0c32 as runtime
+FROM node:16-buster@sha256:32362e2ea89c62d77c86c8f26ad936dbbdc170cd6c06c4d7ff7a809012bb0c32 as runtime
 LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
 LABEL maintainers.2="Panagiotis Nikolaidis <ezerous@gmail.com>"
 LABEL gr.thmmy.ecentrics.concordia-image.name="pinner"
--- a/packages/concordia-app/package.json
+++ b/packages/concordia-app/package.json
@ -30,8 +30,8 @@
    "@reduxjs/toolkit": "~1.4.0",
    "@welldone-software/why-did-you-render": "~6.0.5",
    "apexcharts": "^3.26.0",
-    "concordia-contracts": "~0.1.0",
-    "concordia-shared": "~0.1.0",
+    "concordia-contracts": "~0.1.1",
+    "concordia-shared": "~0.1.1",
    "crypto-js": "~4.0.0",
    "i18next": "^19.8.3",
    "i18next-browser-languagedetector": "^6.0.1",
@ -45,18 +45,19 @@
    "react-dom": "~16.13.1",
    "react-i18next": "^11.7.3",
    "react-markdown": "^5.0.3",
-    "react-particles-js": "^3.4.0",
    "react-redux": "~7.2.1",
    "react-router": "^5.2.0",
    "react-router-dom": "^5.2.0",
    "react-scripts": "~3.4.3",
    "react-timeago": "~5.2.0",
+    "react-tsparticles": "^1.39.2",
    "redux-saga": "~1.1.3",
    "semantic-ui-css": "~2.4.1",
    "semantic-ui-react": "~2.0.3",
    "web3": "~1.3.3"
  },
  "devDependencies": {
+    "@babel/core": "~7.7.7",
    "cross-env": "^7.0.3",
    "eslint": "^6.8.0",
    "eslint-config-airbnb": "^18.1.0",
--- a/packages/concordia-app/patches/web3-eth+1.3.6.patch
+++ b/packages/concordia-app/patches/web3-eth+1.3.6.patch
--- a/packages/concordia-app/src/layouts/MainLayout/index.jsx
+++ b/packages/concordia-app/src/layouts/MainLayout/index.jsx
@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Grid } from 'semantic-ui-react';
-import Particles from 'react-particles-js';
+import Particles from 'react-tsparticles';
 import particlesOptions from '../../assets/particles';
 import MainLayoutMenu from './MainLayoutMenu';
 import MainLayoutConcordiaStatus from './MainLayoutConcordiaStatus';
--- a/packages/concordia-app/src/layouts/RegisterLayout/index.jsx
+++ b/packages/concordia-app/src/layouts/RegisterLayout/index.jsx
@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Particles from 'react-particles-js';
+import Particles from 'react-tsparticles';
 import particlesOptions from '../../assets/particles';
 import './styles.css';

--- a/packages/concordia-contracts-provider/package.json
+++ b/packages/concordia-contracts-provider/package.json
@ -1,7 +1,7 @@
 {
  "name": "concordia-contracts-provider",
  "description": "A server that provides built contracts for Concordia.",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "private": true,
  "main": "src/index.js",
  "scripts": {
@ -10,7 +10,7 @@
  },
  "license": "MIT",
  "dependencies": {
-    "concordia-shared": "~0.1.0",
+    "concordia-shared": "~0.1.1",
    "cors": "^2.8.5",
    "esm": "~3.2.25",
    "express": "^4.17.1",
--- a/packages/concordia-contracts/package.json
+++ b/packages/concordia-contracts/package.json
@ -1,6 +1,6 @@
 {
  "name": "concordia-contracts",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "private": true,
  "description": "Contracts used to power Concordia",
  "main": "index.js",
@ -20,7 +20,7 @@
  },
  "dependencies": {
    "@openzeppelin/contracts": "~3.3.0",
-    "concordia-shared": "~0.1.0",
+    "concordia-shared": "~0.1.1",
    "truffle": "5.1.65",
    "unirest": "^0.6.0"
  },
--- a/packages/concordia-pinner/package.json
+++ b/packages/concordia-pinner/package.json
@ -1,7 +1,7 @@
 {
  "name": "concordia-pinner",
  "description": "An OrbitDB pinning service for Concordia.",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "private": true,
  "main": "src/index.js",
  "scripts": {
@ -11,9 +11,9 @@
  },
  "license": "MIT",
  "dependencies": {
-    "@ecentrics/eth-identity-provider": "~0.1.2",
-    "concordia-contracts": "~0.1.0",
-    "concordia-shared": "~0.1.0",
+    "@ecentrics/eth-identity-provider": "~0.2.0",
+    "concordia-contracts": "~0.1.1",
+    "concordia-shared": "~0.1.1",
    "esm": "~3.2.25",
    "express": "^4.17.1",
    "ipfs": "~0.54.2",
--- a/packages/concordia-pinner/src/utils/orbitUtils.js
+++ b/packages/concordia-pinner/src/utils/orbitUtils.js
@ -24,6 +24,7 @@ export const createOrbitInstance = async (ipfs, contractAddress) => {

  EthereumContractIdentityProvider.setWeb3(new Web3()); // We need a fully-featured new Web3 for signature verification
  EthereumContractIdentityProvider.setContractAddress(contractAddress);
+  EthereumContractIdentityProvider.setStoreAuthDataLocally(true);

  const ORBIT_DIRECTORY = process.env.ORBIT_DIRECTORY || ORBIT_DIRECTORY_DEFAULT;
  logger.info(`Setting up OrbitDB in directory: ${ORBIT_DIRECTORY}`);
--- a/packages/concordia-rendezvous/package.json
+++ b/packages/concordia-rendezvous/package.json
@ -1,6 +1,6 @@
 {
  "name": "concordia-rendezvous",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "private": true,
  "description": "Rendezvous server for Concordia",
  "scripts": {
--- a/packages/concordia-shared/package.json
+++ b/packages/concordia-shared/package.json
@ -1,6 +1,6 @@
 {
  "name": "concordia-shared",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "private": true,
  "scripts": {
    "lint": "eslint --ext js,jsx . --format table"
--- a/yarn.lock
+++ b/yarn.lock