Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Preprod for release v1.6 #481

Merged
merged 158 commits into from
Feb 2, 2024
Merged

Merge Preprod for release v1.6 #481

merged 158 commits into from
Feb 2, 2024

Conversation

loleg
Copy link
Contributor

@loleg loleg commented Jan 22, 2024 •
edited
Loading

sprotest and others added 30 commits December 16, 2022 13:40
@sprotest
Update README.md
104119b
@tafonina
Alternative chains support (#281)
1d4d920 
* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version
@tafonina
update readme with chains list
5dccd27
@tafonina
test negative scenario
c82051f
@tafonina
return goerli cobfig
1f20476
@tafonina
remove console metamask error (#286)
3f3d883 
should fix #285
@tafonina
Merge branch 'develop' into preprod
c029847
@sprotest
Merge pull request #1 from ProxeusApp/preprod
eb2d4a0 
Preprod from Main github merge to develop fork
@sprotest
Update README.md
33f810e
add console logs on default accounts setup and on sign request
a890af1
@tafonina
Merge pull request #3 from sprotest/feature/test-autodeploy
42938d9 
PR test autodeploy flow
@tafonina @sprotest
Test autodeploy flow (#290)
3edb833 
* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>
@epadalkin
add more static js to Cache-Control
eb86793
@tafonina
Merge pull request #4 from epadalkin/feature/fix_load_preview
20e0707 
add more static js to Cache-Control
@tafonina
Merge pull request #5 from ProxeusApp/preprod
e84518f 
Test autodeploy flow (#290) reverse commit from preprod main repo
@tafonina @sprotest @epadalkin
Fix preview document bug (#295)
942a06b 
* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
@epadalkin
fix open prevuew
e5ad6bc
@tafonina
Merge pull request #6 from epadalkin/feature/fix_load_preview
1d5722f 
fix open preview
@sprotest
Update docker-compose-cloud.override.yml
8a26ab7
@tafonina
Merge pull request #7 from ProxeusApp/preprod
5fe455a 
Fix preview document bug (#295) reverse sync
@sprotest
Update docker-compose-cloud.override.yml
b4a3e86
@sprotest @tafonina @epadalkin
The Watchtower service will never be used (#296)
cbfc147 
* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
back merge master to preprod
2cd2ee7
@tafonina
Merge pull request #8 from ProxeusApp/preprod
7513ff3 
Preprod
add configuration for polygon and update addresses
17eca00
@tafonina
Merge pull request #9 from sprotest/feature/polygon
448e920 
add configuration for polygon and update addresses
update configs atrribute for polygon
045c662
@tafonina
Merge pull request #10 from sprotest/feature/polygon
82d3a82 
update configs atrribute for polygon
@tafonina @sprotest @epadalkin
Add polygon configs (#301)
5e6e35f 
* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
@loleg
Yarn update
454630d
dependabot bot and others added 18 commits January 11, 2024 13:52
@dependabot
Bump vue and vue-template-compiler in /ui (#461)
908c0c2 
Bumps [vue](https://github.com/vuejs/core) and [vue-template-compiler](https://github.com/vuejs/vue). These dependencies needed to be updated together.

Updates `vue` from 2.7.15 to 2.7.16
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits)

Updates `vue-template-compiler` from 2.7.14 to 2.7.16
- [Release notes](https://github.com/vuejs/vue/releases)
- [Changelog](https://github.com/vuejs/vue/blob/main/CHANGELOG.md)
- [Commits](vuejs/vue@v2.7.14...v2.7.16)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: vue-template-compiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-vue from 9.18.1 to 9.19.2 in /ui (#460)
611717e 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.18.1 to 9.19.2.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](vuejs/eslint-plugin-vue@v9.18.1...v9.19.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-import from 2.29.0 to 2.29.1 in /ui (#456)
64057d2 
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.29.0...v2.29.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sortablejs from 1.15.0 to 1.15.1 in /ui (#457)
e96cd95 
Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/SortableJS/Sortable/releases)
- [Commits](SortableJS/Sortable@1.15.0...1.15.1)

---
updated-dependencies:
- dependency-name: sortablejs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/robertkrimen/otto from 0.2.1 to 0.3.0 (#455)
dbd9aa1 
Bumps [github.com/robertkrimen/otto](https://github.com/robertkrimen/otto) from 0.2.1 to 0.3.0.
- [Release notes](https://github.com/robertkrimen/otto/releases)
- [Changelog](https://github.com/robertkrimen/otto/blob/master/.goreleaser.yaml)
- [Commits](robertkrimen/otto@v0.2.1...v0.3.0)

---
updated-dependencies:
- dependency-name: github.com/robertkrimen/otto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/ethereum/go-ethereum from 1.13.5 to 1.13.8 (#454)
307b844 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.13.5 to 1.13.8.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.13.5...v1.13.8)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/labstack/gommon from 0.4.1 to 0.4.2 (#453)
37553fb 
Bumps [github.com/labstack/gommon](https://github.com/labstack/gommon) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/labstack/gommon/releases)
- [Commits](labstack/gommon@v0.4.1...v0.4.2)

---
updated-dependencies:
- dependency-name: github.com/labstack/gommon
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
222202c
@loleg
Upgrade backend to echo v4 (#388)
fec36c0 
* 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]>
@dependabot
Bump moment from 2.29.4 to 2.30.1 in /ui (#466)
61cdb0a 
Bumps [moment](https://github.com/moment/moment) from 2.29.4 to 2.30.1.
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.4...2.30.1)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/crypto from 0.17.0 to 0.18.0 (#469)
4e99153 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.17.0 to 0.18.0.
- [Commits](golang/crypto@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/ethereum/go-ethereum from 1.13.8 to 1.13.10 (#470)
6760592 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.13.8 to 1.13.10.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.13.8...v1.13.10)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/net from 0.19.0 to 0.20.0 (#471)
e039cbe 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.19.0 to 0.20.0.
- [Commits](golang/net@v0.19.0...v0.20.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump core-js from 3.34.0 to 3.35.1 in /ui (#480)
8f36917 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.34.0 to 3.35.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.35.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/labstack/echo/v4 from 4.11.2 to 4.11.4 (#472)
b280607 
Bumps [github.com/labstack/echo/v4](https://github.com/labstack/echo) from 4.11.2 to 4.11.4.
- [Release notes](https://github.com/labstack/echo/releases)
- [Changelog](https://github.com/labstack/echo/blob/master/CHANGELOG.md)
- [Commits](labstack/echo@v4.11.2...v4.11.4)

---
updated-dependencies:
- dependency-name: github.com/labstack/echo/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sass from 1.69.5 to 1.70.0 in /ui (#478)
8f80657 
Bumps [sass](https://github.com/sass/dart-sass) from 1.69.5 to 1.70.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.69.5...1.70.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/onsi/gomega from 1.30.0 to 1.31.1 (#476)
7234fa3 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.30.0 to 1.31.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.30.0...v1.31.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg
Merged with main
838b54e
@loleg loleg requested a review from slavas490 January 22, 2024 16:56
@loleg loleg self-assigned this Jan 22, 2024
@dependabot
Bump github.com/ethereum/go-ethereum from 1.13.10 to 1.13.11 (#485)
fa1c8a3 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.13.10 to 1.13.11.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.13.10...v1.13.11)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sortablejs from 1.15.1 to 1.15.2 in /ui (#483)
889fae2 
Bumps [sortablejs](https://github.com/SortableJS/Sortable) from 1.15.1 to 1.15.2.
- [Release notes](https://github.com/SortableJS/Sortable/releases)
- [Commits](SortableJS/Sortable@1.15.1...1.15.2)

---
updated-dependencies:
- dependency-name: sortablejs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-vue from 9.19.2 to 9.20.1 in /ui (#482)
d59748d 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.19.2 to 9.20.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](vuejs/eslint-plugin-vue@v9.19.2...v9.20.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg
Copy link
Contributor Author

loleg commented Jan 30, 2024

@slavas490 would appreciate your input.

@loleg loleg requested review from slavas490 and tafonina and removed request for slavas490 January 30, 2024 22:36
tafonina
tafonina approved these changes Jan 31, 2024
View reviewed changes
Copy link
Contributor

@tafonina tafonina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stage environment is stable, workflows work correctly, we can merge these changes to main

@loleg loleg merged commit 60ca436 into main Feb 2, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tafonina tafonina tafonina approved these changes

@slavas490 slavas490 Awaiting requested review from slavas490

Assignees

@loleg loleg

Labels
None yet
Projects
Maintenance - Q1 2024
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@loleg @tafonina @sprotest @epadalkin @Ibrahim-Halil-Kuray @slavas490