Skip to content

Commit

Permalink
Upgrade backend to echo v4 (#388)
Browse files Browse the repository at this point in the history
* Docker build local

* Update dependabot.yml

* Revised Handbook, added Formulas

* Added SECURITY doc

* Updated notice as per docs

* Handbook on first login #311

* Updates echo to v4

* Installation docs

* Update to Node 18 in CI, minimum Node 16

* Updated Yarn

* Replace Vue CLI with Vite

* Migrated to Vite

* Merged, web3 v4

* Yarn upgrade

* Yarn merged

* Updated to Axios 1.6.0

* Updated Vue/Vite imports

* Use ReconnectingWebsocket lib

* CircleCI Node 18.19 tag

* CircleCI Node 18.19 tag

* Major semver dev deps

* Fix echo-contrib Middleware

* Make fmt in session.go

* Mod tidy

* Added missing js dependency: reconnecting-websocket

* Revert yarn lock

* Reverted ui to preprod branch

* Go 1.21, Node 16, VERSION file

---------

Co-authored-by: Oleg Lavrovsky <[email protected]>
  • Loading branch information
loleg and loleg authored Jan 12, 2024
1 parent 37553fb commit fec36c0
Show file tree
Hide file tree
Showing 33 changed files with 74 additions and 86 deletions.
19 changes: 15 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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 -
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
--------------
Expand Down
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5
22 changes: 0 additions & 22 deletions docker-compose-cnode.override.yml

This file was deleted.

28 changes: 9 additions & 19 deletions docs/build_all.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
```

Expand All @@ -44,6 +42,7 @@ PATH=$PATH:$(go env GOPATH)/bin
```

### Clone repository

The project uses go modules.

Clone the repository outside your GOPATH:
Expand All @@ -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=<Your Infura project ID>
export PROXEUS_SPARKPOST_API_KEY=<Your SparkPost API Key>
export PROXEUS_ENCRYPTION_SECRET_KEY=<A 32-character random string>
export PROXEUS_BLOCKCHAIN_CONTRACT_ADDRESS=0x1d3e5c81bf4bc60d41a8fbbb3d1bae6f03a75f71
export PROXEUS_ALLOW_HTTP=true
export PROXEUS_PLATFORM_DOMAIN=localhost
export [email protected]
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:
```
Expand Down
1 change: 0 additions & 1 deletion docs/build_docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 4 additions & 2 deletions docs/frontend.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Frontend Development

### Prerequisites

+ yarn (1.12+)
+ node (14+)
+ vue-cli
+ node (16+)

> **Important**
>
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion docs/test.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Tests


The following command runs all the tests without test coverage:

```
Expand Down
2 changes: 1 addition & 1 deletion externalnode/external_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
)
24 changes: 15 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand All @@ -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=
Expand All @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/api/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion main/handlers/formbuilder/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion main/handlers/formbuilder/test_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"strconv"

"github.com/labstack/echo"
"github.com/labstack/echo/v4"

"io/ioutil"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/helpers/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/i18n/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion main/handlers/payment/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/payment/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/template_ide/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion main/handlers/workflow/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading

0 comments on commit fec36c0

Please sign in to comment.