diff --git a/.circleci/config.yml b/.circleci/config.yml index 123abc1e5..0a3662ade 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,28 @@ --- version: 2.1 +parameters: + golang-tag: + type: string + default: "1.21" + nodejs-ver: + type: integer + default: 16 + nodejs-tag: + type: string + default: "16.20" + executors: docker-image-golang: environment: PROJECT_ROOT_FOLDER: ~/project docker: - - image: cimg/go:1.20 + - image: cimg/go:<< pipeline.parameters.golang-tag >> docker-image-golang-dependencies: environment: PROJECT_ROOT_FOLDER: ~/project docker: - - image: cimg/go:1.20 + - image: cimg/go:<< pipeline.parameters.golang-tag >> - image: proxeus/node-crypto-forex-rates - image: proxeus/document-service - image: proxeus/mongo-dev-cluster @@ -25,7 +36,7 @@ executors: jobs: build-ui: docker: - - image: cimg/node:16.20 + - image: cimg/node:<< pipeline.parameters.nodejs-tag >> steps: - checkout - restore_cache: @@ -153,7 +164,7 @@ jobs: - go-mod-v2-{{ checksum "go.sum" }} - run: name: Node.js - command: curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - + command: curl -fsSL https://deb.nodesource.com/setup_<< pipeline.parameters.nodejs-ver >>.x | sudo -E bash - - run: name: Yarn command: curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - diff --git a/README.md b/README.md index 1cb309318..3fadc0710 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![CircleCI](https://circleci.com/gh/ProxeusApp/proxeus-core.svg?style=shield)](https://circleci.com/gh/ProxeusApp/proxeus-core.svg) +[![CircleCI](https://dl.circleci.com/status-badge/img/gh/ProxeusApp/proxeus-core/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/ProxeusApp/proxeus-core/tree/main) # Proxeus Core -------------- diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..c239c60cb --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.5 diff --git a/docker-compose-cnode.override.yml b/docker-compose-cnode.override.yml deleted file mode 100644 index f142301ab..000000000 --- a/docker-compose-cnode.override.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# With a configuration like this, you can enable nodes in production. -# This file is an override and needs to be used like this: -# -# docker-compose -f docker-compose.yml -f docker-compose-cloud.override.yml -f docker-compose-cnode.override.yml up - -version: '3.7' - -services: - node-crypto-forex-rates: - networks: - - reverse-proxy - labels: - com.centurylinklabs.watchtower.enable: "true" - environment: - # Replace values for reverse-proxy - VIRTUAL_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com} - VIRTUAL_PORT: 8011 - # Replace values for letsencrypt - LETSENCRYPT_HOST: ${NODE_CRYPTO_FOREX_RATES_VIRTUAL_HOST:-proxeus.example.com} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-admin@example.com} - restart: unless-stopped diff --git a/docs/build_all.md b/docs/build_all.md index b4c851b02..9922984e0 100644 --- a/docs/build_all.md +++ b/docs/build_all.md @@ -12,11 +12,10 @@ Here is the list of dependencies: + go (1.10+, 64bit for Windows) + GOBIN added to your PATH (to check your GOBIN: `echo $(go env GOPATH)/bin`) + curl -+ yarn (1.12+) -+ node (14) -+ vue-cli + git -+ docker-compose (18.06.0+) ++ yarn (1.12+) ++ node (16+) ++ docker-compose (18+) + wget (for godoc generation) + (OSX) Brew Package Manager + (OSX) Command Line Tools (Xcode) @@ -29,12 +28,11 @@ sudo apt-get install make golang curl npm git ``` #### OSX + If you currently do not have the OSX `Command Line Tools` installed run -``` -xcode-select --install -``` ``` +xcode-select --install brew install make golang curl npm git ``` @@ -44,6 +42,7 @@ PATH=$PATH:$(go env GOPATH)/bin ``` ### Clone repository + The project uses go modules. Clone the repository outside your GOPATH: @@ -54,21 +53,12 @@ cd proxeus-core ``` ### Build + All the build projects are stated in `./Makefile`. -Before building Proxeus, make sure to set all [required environment variables](../README.md#quick-start-with-docker). -``` -export PROXEUS_DATA_DIR=./data -export PROXEUS_INFURA_API_KEY= -export PROXEUS_SPARKPOST_API_KEY= -export PROXEUS_ENCRYPTION_SECRET_KEY= -export PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x1d3e5c81bf4bc60d41a8fbbb3d1bae6f03a75f71 -export PROXEUS_ALLOW_HTTP=true -export PROXEUS_PLATFORM_DOMAIN=localhost -export PROXEUS_EMAIL_FROM=youremail@example.com +Before building Proxeus, make sure to set all [required environment variables](build_docker.md) (i.e. with an `.env` file). -``` -Make sure that the email domain for `PROXEUS_EMAIL_FROM` is a configured sending domain in sparkpost +Make sure that the email domain for `PROXEUS_EMAIL_FROM` is a configured sending domain in Sparkpost. To initialize dependencies run: ``` diff --git a/docs/build_docker.md b/docs/build_docker.md index 501fde13c..b9c4d9225 100644 --- a/docs/build_docker.md +++ b/docs/build_docker.md @@ -101,7 +101,6 @@ You may also want to include custom nodes. There is a sample configuration which ``` docker-compose -f docker-compose.yml -f docker-compose-example.override.yml up - ``` See `docker-compose-extra.override.yml` for examples with several other nodes. diff --git a/docs/frontend.md b/docs/frontend.md index 8b748672c..f88e897c0 100644 --- a/docs/frontend.md +++ b/docs/frontend.md @@ -1,9 +1,9 @@ # Frontend Development ### Prerequisites + + yarn (1.12+) -+ node (14+) -+ vue-cli ++ node (16+) > **Important** > @@ -14,8 +14,10 @@ > /core/central/ui/node_modules instead of the package subfolders (./core, etc.). #### Typescript + Use typescript wherever you find it appropriate. Use it especially for critical modules and components where static type checking is helpful. + Check https://vuejs.org/v2/guide/typescript.html for more information in regards to TypeScript in a Vue context. #### Frontend Dev Server diff --git a/docs/test.md b/docs/test.md index 069d5071a..047a9670d 100644 --- a/docs/test.md +++ b/docs/test.md @@ -1,6 +1,5 @@ # Tests - The following command runs all the tests without test coverage: ``` diff --git a/externalnode/external_node.go b/externalnode/external_node.go index 96108eddf..f1bf39466 100644 --- a/externalnode/external_node.go +++ b/externalnode/external_node.go @@ -5,7 +5,7 @@ import ( "encoding/json" "errors" "github.com/dgrijalva/jwt-go" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "log" "io/ioutil" diff --git a/go.mod b/go.mod index c636ec1d4..470fef16d 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,6 @@ require ( github.com/gorilla/context v1.1.2 // indirect github.com/gorilla/websocket v1.5.1 // indirect github.com/klauspost/compress v1.17.3 // indirect - github.com/labstack/echo v3.3.10+incompatible github.com/labstack/echo-contrib v0.15.0 github.com/mattn/go-colorable v0.1.13 // indirect github.com/sergi/go-diff v1.3.1 // indirect @@ -58,7 +57,10 @@ require ( google.golang.org/protobuf v1.31.0 // indirect ) -require go.mongodb.org/mongo-driver v1.13.1 +require ( + github.com/labstack/echo/v4 v4.11.2 + go.mongodb.org/mongo-driver v1.13.1 +) require ( github.com/Microsoft/go-winio v0.6.1 // indirect @@ -75,6 +77,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -101,6 +104,7 @@ require ( golang.org/x/sync v0.5.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.15.0 // indirect gopkg.in/sourcemap.v1 v1.0.5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -110,7 +114,6 @@ require ( replace ( github.com/ProxeusApp/proxeus-core => ./ - github.com/labstack/echo-contrib => github.com/labstack/echo-contrib v0.0.0-20180222075343-7d9d9632a4aa // fix https://github.com/ProxeusApp/proxeus-core/issues/216 gopkg.in/gavv/httpexpect.v2 => github.com/gavv/httpexpect/v2 v2.2.0 // fix https://github.com/gavv/httpexpect/issues/60 gopkg.in/urfave/cli.v1 => github.com/urfave/cli v1.22.5 // fix https://github.com/ProxeusApp/proxeus-core/issues/213 ) diff --git a/go.sum b/go.sum index a039f6839..15c81d753 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,8 @@ github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3a github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= @@ -152,6 +154,7 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jhillyerd/enmime v0.8.0/go.mod h1:MBHs3ugk03NGjMM6PuRynlKf+HA5eSillZ+TRCm73AE= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= @@ -169,10 +172,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg= -github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= -github.com/labstack/echo-contrib v0.0.0-20180222075343-7d9d9632a4aa h1:Vvq1WVdHKCWY5VhBRFsyNtaAlqzPIBHYN1nzVhlGUqs= -github.com/labstack/echo-contrib v0.0.0-20180222075343-7d9d9632a4aa/go.mod h1:LxvV1dZxPwuEAtf6bdhS9c/iOzpy+gt9b0gvdElU334= +github.com/labstack/echo-contrib v0.15.0 h1:9K+oRU265y4Mu9zpRDv3X+DGTqUALY6oRHCSZZKCRVU= +github.com/labstack/echo-contrib v0.15.0/go.mod h1:lei+qt5CLB4oa7VHTE0yEfQSEB9XTJI1LUqko9UWvo4= +github.com/labstack/echo/v4 v4.11.2 h1:T+cTLQxWCDfqDEoydYm5kCobjmHwOwcv4OJAPHilmdE= +github.com/labstack/echo/v4 v4.11.2/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= @@ -185,12 +188,14 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= @@ -210,10 +215,10 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/robertkrimen/otto v0.3.0 h1:5RI+8860NSxvXywDY9ddF5HcPw0puRsd8EgbXV0oqRE= github.com/robertkrimen/otto v0.3.0/go.mod h1:uW9yN1CYflmUQYvAMS0m+ZiNo3dMzRUDQJX0jWbzgxw= @@ -365,6 +370,7 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= diff --git a/main/handlers/api/handlers.go b/main/handlers/api/handlers.go index a6f3ea2f0..8489dc683 100644 --- a/main/handlers/api/handlers.go +++ b/main/handlers/api/handlers.go @@ -34,7 +34,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" uuid "github.com/satori/go.uuid" ) diff --git a/main/handlers/formbuilder/handlers.go b/main/handlers/formbuilder/handlers.go index 0e50883e3..1150927ee 100644 --- a/main/handlers/formbuilder/handlers.go +++ b/main/handlers/formbuilder/handlers.go @@ -8,7 +8,7 @@ import ( "github.com/ProxeusApp/proxeus-core/storage/portable" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/main/handlers/api" diff --git a/main/handlers/formbuilder/test_handlers.go b/main/handlers/formbuilder/test_handlers.go index 0806253d6..601f1db98 100644 --- a/main/handlers/formbuilder/test_handlers.go +++ b/main/handlers/formbuilder/test_handlers.go @@ -6,7 +6,7 @@ import ( "net/url" "strconv" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "io/ioutil" "strings" diff --git a/main/handlers/helpers/helpers.go b/main/handlers/helpers/helpers.go index ecceed4ff..ee44237c3 100644 --- a/main/handlers/helpers/helpers.go +++ b/main/handlers/helpers/helpers.go @@ -10,7 +10,7 @@ import ( "github.com/ProxeusApp/proxeus-core/storage" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) // Gets the absolute url of a path (uri) diff --git a/main/handlers/i18n/handlers.go b/main/handlers/i18n/handlers.go index 300b5b090..69b5227f7 100644 --- a/main/handlers/i18n/handlers.go +++ b/main/handlers/i18n/handlers.go @@ -5,7 +5,7 @@ import ( "github.com/ProxeusApp/proxeus-core/storage/portable" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/main/handlers/api" diff --git a/main/handlers/payment/handler.go b/main/handlers/payment/handler.go index 7a6a0684e..459afb3c6 100644 --- a/main/handlers/payment/handler.go +++ b/main/handlers/payment/handler.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) var ( diff --git a/main/handlers/payment/handler_test.go b/main/handlers/payment/handler_test.go index ce1c08774..3f5ca33e0 100644 --- a/main/handlers/payment/handler_test.go +++ b/main/handlers/payment/handler_test.go @@ -15,7 +15,7 @@ import ( "github.com/golang/mock/gomock" "github.com/gorilla/sessions" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" "github.com/ProxeusApp/proxeus-core/main/www" diff --git a/main/handlers/routes.go b/main/handlers/routes.go index ff00873dc..867a69d17 100644 --- a/main/handlers/routes.go +++ b/main/handlers/routes.go @@ -12,7 +12,7 @@ import ( "github.com/ProxeusApp/proxeus-core/main/www" "github.com/ProxeusApp/proxeus-core/sys/model" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) func MainHostedAPI(e *echo.Echo, s *www.Security, version string) { diff --git a/main/handlers/template_ide/handlers.go b/main/handlers/template_ide/handlers.go index b78b28d47..c48d1671b 100644 --- a/main/handlers/template_ide/handlers.go +++ b/main/handlers/template_ide/handlers.go @@ -18,7 +18,7 @@ import ( "github.com/ProxeusApp/proxeus-core/storage/portable" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/main/handlers/api" "github.com/ProxeusApp/proxeus-core/main/handlers/helpers" diff --git a/main/handlers/workflow/handlers.go b/main/handlers/workflow/handlers.go index 59f030f5a..4e15bffb8 100644 --- a/main/handlers/workflow/handlers.go +++ b/main/handlers/workflow/handlers.go @@ -10,7 +10,7 @@ import ( "github.com/ProxeusApp/proxeus-core/storage/portable" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/storage" diff --git a/main/main.go b/main/main.go index 8752b521f..ad3c16f54 100644 --- a/main/main.go +++ b/main/main.go @@ -19,7 +19,7 @@ import ( "github.com/ProxeusApp/proxeus-core/main/handlers/api" "github.com/ProxeusApp/proxeus-core/main/handlers/payment" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "strings" diff --git a/main/www/apikey.go b/main/www/apikey.go index 92f280c41..b1d55f5ca 100644 --- a/main/www/apikey.go +++ b/main/www/apikey.go @@ -5,7 +5,7 @@ import ( "github.com/ProxeusApp/proxeus-core/sys" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) // SessionAuthToken create a request session if a valid API Key is found diff --git a/main/www/context.go b/main/www/context.go index 826e6051d..fe0971652 100644 --- a/main/www/context.go +++ b/main/www/context.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/sys" "github.com/ProxeusApp/proxeus-core/sys/model" diff --git a/main/www/embed.go b/main/www/embed.go index cad0352c2..2c5a34587 100644 --- a/main/www/embed.go +++ b/main/www/embed.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) type Embedded struct { diff --git a/main/www/embed_test.go b/main/www/embed_test.go index f7e8e21c5..59d60c0b9 100644 --- a/main/www/embed_test.go +++ b/main/www/embed_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" _ "github.com/ProxeusApp/proxeus-core/test" diff --git a/main/www/error.go b/main/www/error.go index 5d3d28145..74eb54a69 100644 --- a/main/www/error.go +++ b/main/www/error.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/sys" ) diff --git a/main/www/i18n.go b/main/www/i18n.go index 6e913c95e..eacc73d71 100644 --- a/main/www/i18n.go +++ b/main/www/i18n.go @@ -12,7 +12,7 @@ import ( "sort" "strconv" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" ) var ( diff --git a/main/www/initial.go b/main/www/initial.go index 98910f8c0..ac2b79b74 100644 --- a/main/www/initial.go +++ b/main/www/initial.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/sys" "github.com/ProxeusApp/proxeus-core/sys/model" diff --git a/main/www/security.go b/main/www/security.go index a86f2f0d1..46b10872e 100644 --- a/main/www/security.go +++ b/main/www/security.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/labstack/echo" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/sys/model" ) diff --git a/main/www/server.go b/main/www/server.go index 43a797b80..bc88a6f59 100644 --- a/main/www/server.go +++ b/main/www/server.go @@ -12,8 +12,8 @@ import ( "golang.org/x/crypto/acme/autocert" "github.com/davecgh/go-spew/spew" - "github.com/labstack/echo" - "github.com/labstack/echo/middleware" + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" ) func debug() echo.MiddlewareFunc { diff --git a/main/www/session.go b/main/www/session.go index 76b4a285d..420ca65b2 100644 --- a/main/www/session.go +++ b/main/www/session.go @@ -9,8 +9,8 @@ import ( uuid "github.com/satori/go.uuid" "github.com/gorilla/sessions" - "github.com/labstack/echo" "github.com/labstack/echo-contrib/session" + "github.com/labstack/echo/v4" "github.com/ProxeusApp/proxeus-core/sys" "github.com/ProxeusApp/proxeus-core/sys/model" diff --git a/version.yml b/version.yml deleted file mode 100644 index b1465aaf8..000000000 --- a/version.yml +++ /dev/null @@ -1 +0,0 @@ -version: 0.0.1