Commit Graph

293 Commits

Author SHA1 Message Date
Alexander Kolotov
afb601b7f5
Merge the develop branch to the master branch, preparation to v1.2.0-rc0 1.2.0-rc0 2019-12-19 19:30:30 +03:00
Alexander Kolotov
1736fd615d
Update the contract's submodule to the release 3.3.0-rc0 (#247) 2019-12-19 18:53:00 +03:00
Gerardo Nardelli
ef0a734650 Support two tokens deposits in monitor (#245)
* Support two tokens deposits in monitor
* update chrome version
2019-12-19 12:39:41 +03:00
Alexander Kolotov
6e2238fc9b Merge branch 'master' into develop 2019-12-05 23:46:13 +03:00
Alexander Kolotov
0f3bea5a41
Merge pull request #244 from poanetwork/support-two-tokens-oracle
Support two tokens deposit requests in Oracle
2019-12-05 23:42:30 +03:00
Gerardo Nardelli
0829c95561 Move tokenState file to utils 2019-12-05 13:50:55 -03:00
Gerardo Nardelli
5bb99a7e95 Update token used in erc-native monitor-e2e 2019-12-05 09:48:55 -03:00
Gerardo Nardelli
3cd53f7bda Update watcher to be able to skip events 2019-12-04 17:18:14 -03:00
Gerardo Nardelli
0eeae74ffa
Update log
Co-Authored-By: Alexander Kolotov <alexandr.kolotov@gmail.com>
2019-12-04 09:59:34 -03:00
Gerardo Nardelli
8fa715089b Add watcher idle option 2019-12-04 09:58:27 -03:00
Gerardo Nardelli
ab2c0ea120 Log block timestamp 2019-12-03 17:17:27 -03:00
Gerardo Nardelli
5583ea8b6b Catch zero balance error in swap tokens worker 2019-12-03 17:17:24 -03:00
Gerardo Nardelli
a4eb446f7b Rename syslog logging cofig file 2019-12-03 17:17:16 -03:00
Gerardo Nardelli
2d526a1454
Fix wording
Co-Authored-By: Alexander Kolotov <alexandr.kolotov@gmail.com>
2019-12-03 11:38:37 -03:00
Gerardo Nardelli
9811c13a04 Typo fix 2019-12-03 10:16:23 -03:00
Gerardo Nardelli
406ede9352 Add e2e tests two tokens support 2019-12-02 17:20:53 -03:00
Gerardo Nardelli
1360c79e69 Fix half duplex transfer watcher 2019-12-02 17:19:28 -03:00
Gerardo Nardelli
12229e5e0b Use pre-deployed token for erc to native e2e tests 2019-11-29 15:32:53 -03:00
Gerardo Nardelli
588b289bb9 remove comment attribute in chain spec 2019-11-29 13:16:31 -03:00
Gerardo Nardelli
b3419ccca6 Add parity hardcoded addresses for erc to native 2019-11-29 11:57:45 -03:00
Gerardo Nardelli
ecd20890c8 Add sai contract bytecode in foreign parity chain config 2019-11-29 09:56:48 -03:00
Gerardo Nardelli
b6588ff3c5 Add erc to native docker config in deployment playbooks 2019-11-29 09:28:50 -03:00
Gerardo Nardelli
ed2de112a2 fixes 2019-11-28 16:56:18 -03:00
Gerardo Nardelli
c19f48ef3f Add swap-tokens worker 2019-11-28 16:31:27 -03:00
Gerardo Nardelli
eb8de323ee Add half duplex transfer watcher 2019-11-26 17:00:56 -03:00
Gerardo Nardelli
c42b2f03b7 Update submodule to phase 2 contracts 2019-11-26 16:59:46 -03:00
Alexander Kolotov
303b02f3ca
Merge the develop branch to the master branch, preparation to v1.1.1 (#241) 1.1.1 2019-11-19 19:03:06 +03:00
Alexander Kolotov
98e0f8e998
Merge branch 'master' into develop 2019-11-19 16:49:27 +03:00
Alexander Kolotov
ecf613954a
Changes in initialization of array to iterate getting signatures (#240) 2019-11-19 16:47:02 +03:00
Alexander Kolotov
f2a6a64637
Merge the develop branch to the master branch, preparation to v1.1.0 (#238) 1.1.0 2019-11-15 22:13:03 +01:00
Gerardo Nardelli
8d4eb86a19 Fix logs and start block parameters in oracle deployment (#235)
* Update start block env vars in oracle deployment
* Set logger to remote server for docker-compose-transfer.yml
* avoid calculating start block parameter if provided in oracle deployment config
* set home and foreign start block in erc20-native e2e
* set home and foreign start block in erc20-native ultimate test
2019-11-15 21:31:13 +01:00
phahulin
cc6afb3736 Fix monitor path in crontab example (#236)
This is a minor PR which fixes path in crontab example for monorepo
2019-11-15 06:16:21 +01:00
phahulin
84ecfc30d9 Optional ability to point ORACLE_LOG_LEVEL in the deployment configuration (#234) 2019-11-13 20:18:46 +01:00
Gerardo Nardelli
5d770e8607 Add AMB monitor e2e tests (#231)
* Add amb monitor e2e tests
* Fix eventsStats endpoint monitor
2019-11-13 07:51:10 +01:00
Alexander Kolotov
db89d1c12e
Merge the develop branch to the master branch, preparation to v1.0.0 #230
* Support alternative receiver in Oracle (#221)
* Support alternative receiver feature in Monitor (#223)
* Support token migration (#224)
* Fix suggested gas price in transaction for ui production build (#222)
* Updated links to new repo with tokenbridge contracts (#226)
* Update the contract's submodule to the release 3.2.0 (#228)
1.0.0
2019-11-12 06:37:23 +01:00
Gerardo Nardelli
4fd4ac3d73 Merge branch 'master' into develop
# Conflicts:
#	commons/constants.js
#	e2e-commons/up.sh
#	monitor/alerts.js
#	monitor/eventsStats.js
#	monitor/utils/events.js
#	monitor/utils/message.js
2019-11-08 09:53:06 -03:00
Alexander Kolotov
cbd9d607ce
Update the contract's submodule to the release 3.2.0 (#228) 2019-11-07 22:50:37 +01:00
Gerardo Nardelli
346fa1e732 Support token migration (#224)
* Filter transfer event in token swap in Oracle
* Support token swap in monitor
2019-11-06 22:49:01 +03:00
Alexander Kolotov
f6fa83d7ea
Updated links to new repo with tokenbridge contracts (#226) 2019-11-05 15:53:47 +03:00
Gerardo Nardelli
1564ccc580 Support alternative receiver feature in Monitor (#223)
* Update monitor to support changes from alternative receiver
* Add monitor event processing unit tests
* update chrome version used en e2e tests
* update chromedriver version
2019-10-29 22:22:02 +03:00
Gerardo Nardelli
7a54e584d5 Support alternative receiver in Oracle (#221)
* Add transfer watcher
* Filter userRequestForAffirmation events in Transfer events
* Add extended oracle composer file
2019-10-29 17:55:47 +03:00
Gerardo Nardelli
1d79cf82f3 Fix suggested gas price in trasaction for ui production build (#222)
* use string version of bignumber when converting gasPrice to hex
* update chromedriver version
2019-10-25 15:38:30 +03:00
Alexander Kolotov
9884b4b424
Add support for AMB contracts (#199) 1.0.0-rc2 2019-10-21 15:57:28 +03:00
Gerardo Nardelli
d577a71096 Add support for AMB contracts (#199) 2019-09-18 22:45:13 +03:00
Alexander Kolotov
803f0074e6
Update the contract's submodule to a commit-predecessor of 3.1.0 (#214) 1.0.0-rc1 2019-09-17 10:56:29 +03:00
Przemyslaw Rzad
e288df39dc
Remove rsync dependency (#213) 2019-09-16 18:34:42 +02:00
Przemyslaw Rzad
8d0e70359f
Remove ERC20_TOKEN_ADDRESS from env variables (#211)
* Remove ERC20_TOKEN_ADDRESS from env variables

* Do not check erc20 token address for native-to-erc

* Rename ERC20_TOKEN_ADDRESS to bridgeableTokenAddress
2019-09-14 08:04:07 +02:00
Przemyslaw Rzad
ab8270ee7c
Remove obsolete preapre.yml file (#212) 2019-09-13 16:19:34 +02:00
Przemyslaw Rzad
6b55c54497
Function naming (#208)
* Function naming

* More renames from oracle to gas supplier
2019-09-13 14:54:51 +02:00
Vedhavyas Singareddi
114f62da7b Update CONFIGURATION.md (#210)
remove `"` so that markdown can parse table properly
2019-09-13 14:25:44 +02:00