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 1.5 #451

Merged
merged 134 commits into from
Dec 22, 2023
Merged

Merge Preprod for release 1.5 #451

merged 134 commits into from
Dec 22, 2023

Conversation

loleg
Copy link
Contributor

@loleg loleg commented Dec 19, 2023

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
loleg and others added 25 commits October 20, 2023 22:21
@loleg @tafonina
Installation guide (#396)
b382555 
* Docker build local

* Preprod merge to main (#353)

* Update README.md

* Alternative chains support (#281)

* add new smart contract addresses on goerli and mumbai networks, update settings
* fix dependencies
* update circle checks go version

* update readme with chains list

* test negative scenario

* return goerli cobfig

* remove console metamask error (#286)

should fix #285

* Update README.md

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

* Test autodeploy flow (#290)

* Update README.md

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

* Update dependabot.yml

* Revised Handbook, added Formulas

* Added SECURITY doc

* Updated notice as per docs

* Handbook on first login #311

* Update dependabot.yml (#378)

* Update dependabot.yml

* Update dependabot.yml

* Installation docs

---------

Co-authored-by: Oleg Lavrovsky <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
@dependabot
Bump @vue/eslint-config-standard from 4.0.0 to 5.1.2 in /ui (#400)
51dbfe8 
Bumps [@vue/eslint-config-standard](https://github.com/vuejs/eslint-config-standard/tree/HEAD/packages/eslint-config-standard) from 4.0.0 to 5.1.2.
- [Release notes](https://github.com/vuejs/eslint-config-standard/releases)
- [Changelog](https://github.com/vuejs/eslint-config-standard/blob/main/packages/eslint-config-standard/CHANGELOG.md)
- [Commits](https://github.com/vuejs/eslint-config-standard/commits/v5.1.2/packages/eslint-config-standard)

---
updated-dependencies:
- dependency-name: "@vue/eslint-config-standard"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump tippy.js from 2.6.0 to 6.3.7 in /ui (#399)
571c94a 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 2.6.0 to 6.3.7.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](atomiks/tippyjs@v2.6.0...v6.3.7)

---
updated-dependencies:
- dependency-name: tippy.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump ethereumjs-util from 5.2.1 to 7.1.5 in /ui (#398)
7e3d3e8 
Bumps [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-monorepo) from 5.2.1 to 7.1.5.
- [Release notes](https://github.com/ethereumjs/ethereumjs-monorepo/releases)
- [Commits](https://github.com/ethereumjs/ethereumjs-monorepo/compare/@ethereumjs/[email protected]@7.1.5)

---
updated-dependencies:
- dependency-name: ethereumjs-util
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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.17.0 to 9.18.1 in /ui (#408)
3b472cf 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.17.0 to 9.18.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](vuejs/eslint-plugin-vue@v9.17.0...v9.18.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>
@dependabot
Bump sass from 1.69.4 to 1.69.5 in /ui (#407)
abcf6f3 
Bumps [sass](https://github.com/sass/dart-sass) from 1.69.4 to 1.69.5.
- [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.4...1.69.5)

---
updated-dependencies:
- dependency-name: sass
  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>
@tafonina @slavas490
Server-side Verification of documents (#412)
9a5c09e 
* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* remove outdated methods of old smart contract

* add public urls in case user doesnt have metamask

* fix js frontend typos

* use public url only if user doesnt have metamask installed

* use public url only if user doesnt have metamask installed

* add wrong metamask network selected issue handler

* fix user validation network screen

* remove unnecessary html code from VerificationFileEntry component

---------

Co-authored-by: slavas490 <[email protected]>
@tafonina
fix invalid character, updates in BN lib (#413)
b8295ab 
* fix invalid character, updates in BN lib
@dependabot
Bump @cypress/webpack-preprocessor from 3.0.1 to 4.1.5 in /ui (#417)
c9556f0 
Bumps [@cypress/webpack-preprocessor](https://github.com/cypress-io/cypress) from 3.0.1 to 4.1.5.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/commits)

---
updated-dependencies:
- dependency-name: "@cypress/webpack-preprocessor"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg
Go library updates (#427)
0dafa99
@loleg
Merge branch 'main' into preprod
662ab77
@dependabot
Bump async from 3.2.4 to 3.2.5 in /ui (#415)
53a2efa 
Bumps [async](https://github.com/caolan/async) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](caolan/async@v3.2.4...v3.2.5)

---
updated-dependencies:
- dependency-name: async
  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 vue-cropperjs from 3.0.0 to 4.2.0 in /ui (#416)
bc3d14a 
Bumps [vue-cropperjs](https://github.com/Agontuk/vue-cropperjs) from 3.0.0 to 4.2.0.
- [Changelog](https://github.com/Agontuk/vue-cropperjs/blob/master/CHANGELOG.md)
- [Commits](Agontuk/vue-cropperjs@v3.0.0...v4.2.0)

---
updated-dependencies:
- dependency-name: vue-cropperjs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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.32.2 to 3.33.3 in /ui (#431)
0661fcb 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.2 to 3.33.3.
- [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.33.3/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 vue-tour from 1.6.0 to 2.0.0 in /ui (#430)
642c68b 
Bumps [vue-tour](https://github.com/pulsardev/vue-tour) from 1.6.0 to 2.0.0.
- [Release notes](https://github.com/pulsardev/vue-tour/releases)
- [Changelog](https://github.com/pulsardev/vue-tour/blob/master/CHANGELOG.md)
- [Commits](pulsardev/vue-tour@v1.6.0...v2.0.0)

---
updated-dependencies:
- dependency-name: vue-tour
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@tafonina @slavas490
Droplet support updates (#434)
db0587e 
* fix web3.fromAscii to web3.utils.asciiToHex method in document floe

* replace web3 to this.wallet.proxeusFS.web3 as metamask no longer injects web3

* remove outdated methods of old smart contract

* add public urls in case user doesnt have metamask

* fix js frontend typos

* use public url only if user doesnt have metamask installed

* use public url only if user doesnt have metamask installed

* add wrong metamask network selected issue handler

* fix user validation network screen

* remove unnecessary html code from VerificationFileEntry component

* fix invalid character, updates in BN lib

* fix invalid character, updates in BN lib

* fix invalid character, updates in BN lib, revert to string and numbers format

* remove delete buttons for form inputs

* remove skipValidateFor date entry

* fix frontend error message for file not found

* update digitalocean deployment script

---------

Co-authored-by: slavas490 <[email protected]>
@dependabot
Bump eslint-plugin-import from 2.28.1 to 2.29.0 in /ui (#437)
28e4d24 
Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0.
- [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.28.1...v2.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  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 golang.org/x/net from 0.18.0 to 0.19.0 (#442)
90b4edc 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.19.0.
- [Commits](golang/net@v0.18.0...v0.19.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 go.mongodb.org/mongo-driver from 1.13.0 to 1.13.1 (#444)
7056d33 
Bumps [go.mongodb.org/mongo-driver](https://github.com/mongodb/mongo-go-driver) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/mongodb/mongo-go-driver/releases)
- [Commits](mongodb/mongo-go-driver@v1.13.0...v1.13.1)

---
updated-dependencies:
- dependency-name: go.mongodb.org/mongo-driver
  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 interactjs from 1.2.9 to 1.10.26 in /ui (#445)
3dfcbab 
Bumps [interactjs](https://github.com/taye/interact.js) from 1.2.9 to 1.10.26.
- [Changelog](https://github.com/taye/interact.js/blob/main/CHANGELOG.md)
- [Commits](taye/interact.js@v1.2.9...v1.10.26)

---
updated-dependencies:
- dependency-name: interactjs
  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 vue-multiselect from 2.1.7 to 2.1.8 in /ui (#448)
b0c8c44 
Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.7 to 2.1.8.
- [Release notes](https://github.com/shentao/vue-multiselect/releases)
- [Commits](shentao/vue-multiselect@v2.1.7...v2.1.8)

---
updated-dependencies:
- dependency-name: vue-multiselect
  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 core-js from 3.33.3 to 3.34.0 in /ui (#446)
b07619c 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.33.3 to 3.34.0.
- [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.34.0/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 axios from 0.21.4 to 1.6.2 in /ui (#449)
33b9a3c 
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v0.21.4...v1.6.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump js-sha3 from 0.7.0 to 0.9.3 in /ui (#447)
dbff8b0 
Bumps [js-sha3](https://github.com/emn178/js-sha3) from 0.7.0 to 0.9.3.
- [Changelog](https://github.com/emn178/js-sha3/blob/master/CHANGELOG.md)
- [Commits](emn178/js-sha3@v0.7.0...v0.9.3)

---
updated-dependencies:
- dependency-name: js-sha3
  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
b92df69
@loleg loleg requested a review from slavas490 December 21, 2023 10:36
@loleg
Copy link
Contributor Author

loleg commented Dec 21, 2023

@slavas490 I'm being blocked up by this:

sys/file/file.go:18:2: missing go.sum entry for module providing package go.mongodb.org/mongo-driver/bson (imported by github.com/ProxeusApp/proxeus-core/sys/file); to add:
        go get github.com/ProxeusApp/proxeus-core/sys/file

@loleg loleg merged commit 8d31278 into main Dec 22, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavas490 slavas490 slavas490 approved these changes

Assignees
No one assigned
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 @slavas490 @sprotest @tafonina @epadalkin @Ibrahim-Halil-Kuray