Commit Graph

278 Commits

Author SHA1 Message Date
Alexander Kolotov
e5df7ec37d
Merge branch 'master' into monitor-support-legacy-bridge 2019-06-01 01:34:23 +03:00
Alexander Kolotov
0d047d49ef
Merge pull request #81 from poanetwork/monitor-handle-errors
Fix error handling on monitor workers
2019-06-01 01:25:30 +03:00
Alexander Kolotov
822fa918e2
Merge branch 'master' into monitor-handle-errors 2019-06-01 01:07:24 +03:00
Gerardo Nardelli
baf65b7001 Merge branch 'master' into monitor-support-legacy-bridge
# Conflicts:
#	monitor/checkWorker3.js
#	monitor/stuckTransfers.js
2019-05-31 15:42:36 -03:00
Gerardo Nardelli
94a6a5ad74 Add support v1 legacy contracts on monitor 2019-05-31 15:35:50 -03:00
Przemyslaw Rzad
93347b47a8
Updates after deployment test (#75)
* Force ln to mitigate error when postinstall is repeated

* Update readme

* Using yarn in place of npm run

* Changed env order - home first

* Removed gh-pages UI deploy

* Readme cosmetics

* Removed duplicate bridge overview

* Update readme

* Update repository address

* Update readme

* Changed NPM to Yarn everywhere

* Update readme

* Using tokenbridge monorepo in deployment instead of token-bridge

* Update ui/README.md

Co-Authored-By: Andrew Gross <andogro@gmail.com>

* Revert and/or change as per @akolotov explanation

* Removed checkWorker3 that was used in legacy bridge-rust-v1-native-to-erc

* Update deployment/oracle/README.md

Co-Authored-By: Alexander Kolotov <alexandr.kolotov@gmail.com>

* Apply suggestions from code review

Co-Authored-By: Alexander Kolotov <alexandr.kolotov@gmail.com>

* Update root readme and Update sub-repo readmes to point to root monorepository initialization.

* Removed obsolete GET /stuckTransfers

* Remove stuckTransfers

* Use shell instead of unmaintained docker_service module. Update naming in templates.
1.0.0-rc0
2019-05-31 14:54:32 +02:00
Gerardo Nardelli
5ab299089f Fix error handling on monitor workers 2019-05-30 15:05:36 -03:00
Przemyslaw Rzad
1ab4a0eca8
Configurable port (#76)
* Configurable monitor port

* Remove obsolete comment.

* Configurable port in UI
2019-05-30 13:18:48 +02:00
Przemyslaw Rzad
9f5edcffbf
Update Contracts to 2.3.2 (#74)
* Switch contracts to 2.3.2

* Not removing package-lock.json in contracts/deploy
2019-05-27 13:15:47 +02:00
Przemyslaw Rzad
f5ff33d21f
Oracle & Monitor - Compiled ABI's (#71)
* Oracle abi taken from compilation.
Moved project setup from dockerfile to package.json scripts

* Use compile:contracts script instead of repeated command

* Update imports to root contracts instead of copying

* Rule for importing unpublished. Lint fix

* Remove prepare:contracts and import:contracts

* Disabled ModuleScopePlugin in order to be able to import contracts outside src dir

* Fix for rm removing . and .. on linux
2019-05-27 09:22:08 +02:00
Przemyslaw Rzad
be0b401885
Update dependencies (#72)
* Extracted common eslint devDependencies

* Applied prettier fixes for ui

* Extracted common mocha dependency

* Remove unused eslint plugins

* Prettier fix

* Updated dependency according to yarn audit

* Re-added eslint plugins

* Eslint plugins in one place

* Update dependencies failing on ci
2019-05-25 13:27:52 +02:00
Alexander Kolotov
94e923d965
Merge pull request #67 from poanetwork/oracle-e2e-contracts
E2E tests using root contracts
2019-05-24 14:56:41 +03:00
Alexander Kolotov
fe74faafb4
Merge branch 'master' into oracle-e2e-contracts 2019-05-24 14:36:18 +03:00
Alexander Kolotov
87cbb378a7
Merge pull request #70 from poanetwork/latest-updates-migration
Migration of latest changes from the oracle and UI repos
2019-05-24 14:34:08 +03:00
Alexander Kolotov
7486ef0491 migrate changes from https://github.com/poanetwork/token-bridge/pull/147 2019-05-24 12:49:35 +03:00
Alexander Kolotov
6dcacef3bd migrate changes from https://github.com/poanetwork/token-bridge/pull/143 2019-05-24 12:49:05 +03:00
Alexander Kolotov
b19ec7a191 migrate changes from https://github.com/poanetwork/bridge-ui/pull/218 2019-05-24 12:48:34 +03:00
rzadp
d1067a94bb Removed redundant DEPLOYMENT_GAS_LIMIT env variable 2019-05-24 11:30:51 +02:00
rzadp
e2cc5e17b0 Removed contracts-2.2.0 module 2019-05-24 10:49:20 +02:00
rzadp
27ec83048f Switch ui-e2e contracts to 2.3.1. Update envs and deploy script 2019-05-24 10:47:09 +02:00
rzadp
52684a30fd Lint 2019-05-24 09:54:13 +02:00
rzadp
041d36fc3c Revert "One job."
d4327f8c0a2ccc5e9d80068a0fe187ca215c7ec8
2019-05-24 09:37:03 +02:00
rzadp
875d7972a4 Switched contracts to 2.3.1 2019-05-24 09:28:24 +02:00
rzadp
eb97b4b135 Merge master into oracle-e2e-contracts 2019-05-24 09:26:58 +02:00
Alexander Kolotov
7a1ce41d8a
Merge pull request #66 from poanetwork/docker-package-lock
Change oracle production docker context
2019-05-23 23:00:44 +03:00
rzadp
fb4f7ee85a Revert "Test script"
b085c00616a933e18fe70e8d7757c5d52b5cbaa8
2019-05-23 15:32:05 +02:00
rzadp
d4327f8c0a One job. 2019-05-23 15:27:24 +02:00
rzadp
6175ee19a1 Updated envs. 2019-05-23 15:17:57 +02:00
rzadp
f5516a42fe Update deployment script 2019-05-23 15:11:35 +02:00
rzadp
a1b85a7cc1 Changed order in Dockerfile.e2e to utilize docker build cache 2019-05-23 15:01:24 +02:00
rzadp
b085c00616 Test script 2019-05-23 15:01:17 +02:00
rzadp
84e28f46b8 Changed contracts to main sub-dir 2019-05-23 15:01:13 +02:00
rzadp
a714aec482 Merge master into docker-package-lock 2019-05-23 14:57:06 +02:00
Alexander Kolotov
d98073bb9a
Merge pull request #61 from poanetwork/dotfiles
Merge dotfiles
2019-05-23 15:32:57 +03:00
rzadp
f22e32c138 Ignoring images only in the oracle 2019-05-23 14:30:35 +02:00
rzadp
3ab05cf728 Ignoring images only in the oracle 2019-05-23 14:04:41 +02:00
rzadp
ad9cb26f66 Fix ui-e2e tests not working on CI 2019-05-23 13:53:03 +02:00
rzadp
1595405749 Fix ui-e2e tests not working on CI 2019-05-23 13:52:50 +02:00
rzadp
cbb55318ac Update dockerignore 2019-05-23 11:46:32 +02:00
rzadp
5e698821bb Ignoring .git 2019-05-23 11:45:37 +02:00
rzadp
cc9d475ece Dockerignore 2019-05-23 11:45:18 +02:00
rzadp
082db73402 Updated build paths in e2e 2019-05-23 11:39:51 +02:00
rzadp
2c7c70f608 Common dockerignore. 2019-05-23 11:16:50 +02:00
rzadp
14a298f70c Production installation 2019-05-23 11:13:22 +02:00
rzadp
ef0b9662d2 Use main yarn.lock when building oracle docker 2019-05-23 11:11:00 +02:00
rzadp
2a509990ca Removed submodules 2019-05-23 10:48:18 +02:00
rzadp
ec8493aa44 Duplicating dockerignore for oracle 2019-05-23 10:45:55 +02:00
rzadp
1aae490454 Simplidied dockerignore 2019-05-23 10:42:24 +02:00
rzadp
5085842153 Merge master into dotfiles 2019-05-23 10:25:18 +02:00
Alexander Kolotov
97f80dc95a
Merge pull request #54 from poanetwork/dockerfile-and-contracts
Remove sub-dockerfiles and sub-contracts
2019-05-22 18:46:48 +03:00