ProxeusApp · loleg · Dec 22, 2023 · Dec 16, 2022 · Dec 16, 2022 · Dec 16, 2022
diff --git a/Makefile b/Makefile
@@ -1,20 +1,25 @@
 SHELL:= /bin/bash
 DEBUG_FLAG?=false
-GO_VERSION=1.20
+GO_VERSION=1.21
 
 ifeq ($(DEBUG), "true")
 	BINDATA_OPTS="-debug"
 endif
 
 ifdef BUILD_ID
-    GO_OPTS=-ldflags="-X main.ServerVersion=build-$(BUILD_ID)"
+	GO_OPTS=-ldflags="-X main.ServerVersion=build-$(BUILD_ID)"
 endif
 
 # Load dotenv configuration
 ifneq (,$(wildcard ./.env))
 	include .env
 	export
 endif
+ifndef $(PROXEUS_SPARKPOST_API_KEY)
+	PROXEUS_SPARKPOST_API_KEY=0
+	PROXEUS_INFURA_API_KEY=0
+	PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x
+endif
 
 # Default proxeus environment
 export PROXEUS_TEST_MODE?=false

diff --git a/deploy/digitalocean/README.md b/deploy/digitalocean/README.md
@@ -9,15 +9,28 @@ This script is maintained for the community by Proxeus Association
 
 ## Instructions
 
-1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration
-2. You will need to have your API keys for Infura and Sparkpost handy - see the root README for further details.
-3. add executive permission for deploy.sh ( chmod +x deploy.sh )
-4. run $PWD/proxeus-core/deploy/digitalocean/deploy.sh
-5. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
-6. A configuration screen will be shown where you can set up an admin account and check settings.
+1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration. [Here](https://docs.digitalocean.com/products/droplets/getting-started/recommended-droplet-setup) you can find some help how to set up a production-ready droplet.
+2. Make sure your API keys for Infura and Sparkpost.
+3. Get the deployment script and make it executable:
+```bash
+wget https://raw.githubusercontent.com/ProxeusApp/proxeus-core/main/deploy/digitalocean/deploy.sh && chmod +x deploy.sh
+```
+4. Enter all the necessary variables, where **FQDN** - domain name for the future server, **INFURA** - your Infura API key, **SPARKPOST** - your SparkPost API key, **ADMINEMAIL** - admin email (in format like admin@proxeus.org). It can be done by editing the script file directly or by shell "export" command:
+```bash
+export FQDN=[value]
+export INFURA=[value]
+export SPARKPOST=[value]
+export ADMINEMAIL=[value]
+```
+5. Run deployment process (go through it carefully, it may ask you any additional confirmation):
+```bash
+./deploy.sh
+```
+7. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
+8. A configuration screen will be shown where you can set up an admin account and check settings.
 
 Once your server is running, visit the [User Handbook](https://doc.proxeus.org/#/handbook) to get started.
 
 To view the logs connect to your droplet using an SSH client program. Then paste this into the console to see the logs being updated in real time:
 
-`cd /srv/proxeus && docker-compose logs -f`
+`cd /srv/proxeus && docker-compose logs -f`
diff --git a/deploy/digitalocean/deploy.sh b/deploy/digitalocean/deploy.sh
@@ -1,12 +1,18 @@
 #!/bin/bash
-#specify values for local variables
 
+# Specify values for local variables
 #FQDN=<value>
 #INFURA=<value>
 #SPARKPOST=<value>
 #ADMINEMAIL=<value>
 
 
+## Performing the installation
+exec 1> >(tee -a "/var/log/stackscript.log") 2>&1
+function log {
+  echo "### $1 -- `date '+%D %T'`"
+}
+
 log "Configuring System Updates"
 apt-get -o Acquire::ForceIPv4=true update -y
 DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" install grub-pc
@@ -109,11 +115,11 @@ cd /srv/proxeus
 # make init server-docker
 
 log "Starting cloud deployment via docker-compose"
-docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d &
+docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d >/dev/null 2>&1
 
 # Open http://$FQDN:1323/init to configure your server
 log "After a minute, open: http://$FQDN:1323/init"
 
 ## ----------------------------------------------
 
-echo "Installation complete!"
+echo "Installation complete!"
diff --git a/go.mod b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	golang.org/x/crypto v0.17.0
-	golang.org/x/net v0.18.0
+	golang.org/x/net v0.19.0
 	gopkg.in/gavv/httpexpect.v2 v2.16.0
 )
 
@@ -59,7 +59,7 @@ require (
 	google.golang.org/protobuf v1.31.0 // indirect
 )
 
-require go.mongodb.org/mongo-driver v1.13.0
+require go.mongodb.org/mongo-driver v1.13.1
 
 require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect

diff --git a/go.sum b/go.sum
@@ -295,8 +295,8 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 go.etcd.io/bbolt v1.3.0/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
 go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-go.mongodb.org/mongo-driver v1.13.0 h1:67DgFFjYOCMWdtTEmKFpV3ffWlFnh+CYZ8ZS/tXWUfY=
-go.mongodb.org/mongo-driver v1.13.0/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
+go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
+go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -324,8 +324,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/ui/core/package.json b/ui/core/package.json
@@ -17,25 +17,25 @@
     "@mdi/font": "^2.6.95",
     "@proxeus/wallet": "1.0.0",
     "ajv": "^6.5.2",
-    "async": "^3.2.4",
-    "axios": "^0.21.1",
+    "async": "^3.2.5",
+    "axios": "^1.6.2",
     "babel-runtime": "^6.26.0",
     "bootstrap": "^4.1.2",
     "bootstrap-vue": "2.0.0-rc.12",
     "brace": "^0.11.1",
     "codemirror": "^5.39.2",
-    "core-js": "^3.19.3",
+    "core-js": "^3.34.0",
     "ethereumjs-util": "^7.1.5",
     "flatpickr": "^4.5.1",
     "font-awesome": "^4.7.0",
     "handlebars": "^4.0.11",
     "he": "^1.2.0",
     "html-svg-connect": "^2.0.0",
     "human-standard-token-abi": "^2.0.0",
-    "interactjs": "1.2.9",
+    "interactjs": "1.10.26",
     "jquery": "^3.5.0",
     "jquery-ui": "^1.13.2",
-    "js-sha3": "^0.7.0",
+    "js-sha3": "^0.9.3",
     "moment": "^2.29.4",
     "popper.js": "^1.14.4",
     "sass": "^1.69.5",
@@ -52,14 +52,14 @@
     "vue-clipboard2": "^0.2.1",
     "vue-codemirror": "^4.0.5",
     "vue-cookie": "^1.1.4",
-    "vue-cropperjs": "^3.0.0",
+    "vue-cropperjs": "^4.2.0",
     "vue-draggable": "^2.0.6",
     "vue-dynamic": "0.2.1",
     "vue-error-page": "^1.1.5",
     "vue-flatpickr-component": "^7.0.2",
     "vue-headful": "^2.0.1",
     "vue-moment": "^4.0.0",
-    "vue-multiselect": "^2.1.0",
+    "vue-multiselect": "^2.1.8",
     "vue-notification": "^1.3.12",
     "vue-password-strength-meter": "^1.3.2",
     "vue-pdf": "^4.3.0",
@@ -68,7 +68,7 @@
     "vue-router": "^3.0.1",
     "vue-scrollto": "^2.11.0",
     "vue-select": "^2.4.0",
-    "vue-tour": "^1.0.1",
+    "vue-tour": "^2.0.0",
     "vuedraggable": "^2.16.0",
     "vuep": "^0.8.1",
     "vuex": "^3.0.1",
@@ -88,7 +88,7 @@
     "babel-eslint": "^10.1.0",
     "check-node-version": "^3.2.0",
     "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^5.0.0",