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 the develop branch to the master branch, preparation to v2.1.0 #219

Merged
merged 44 commits into from
May 23, 2019
Merged

Merge the develop branch to the master branch, preparation to v2.1.0 #219

merged 44 commits into from
May 23, 2019

Conversation

akolotov
Copy link
Collaborator

This merge contains the following set of improvements and fixes:

patitonar and others added 30 commits February 8, 2019 09:10
@patitonar
Fix statistics for contracts migrated from v1
e4c2197
@patitonar
Refactor how to get validator list
1b707af
@patitonar
Fix getValidatorEvents
e0f35e2
@patitonar
get events from deployedAtBlock instead of block 0
0f29ac3
@patitonar
Refactor processLargeArrayAsync
50f5e61
@patitonar
Calculate Fee Statistics
b3000b0
@patitonar
Display collected fees on statistics page
b717298
@patitonar
Refactor how to get feeUpdated events
b5832c0
@patitonar
Extract rewardable logic into new util file
cbe4b39
@patitonar
Add unit tests for rewardable.js methods
af88956
@patitonar
Add FeeStatistics unit test
f1be6e1
@patitonar
Fix FeeStatistics title
3231a0c
@patitonar
Fix file line feed
3b509ec
@patitonar
Rename ForeignStore variables
39854b0
@patitonar
Merge branch 'develop' into fix-v1-to-v2-migrated-contracts
306e2eb 
# Conflicts:
#	src/stores/HomeStore.js
#	src/stores/utils/contract.js
@patitonar
Merge fix
b69732f
@patitonar
Get v2 and v1 events from one request
954b59d
@patitonar
Refactor getValidatorList
6616bd7
@patitonar
Add validator events unit tests
f549b59
@patitonar
Move nodemon to devDependency
703c06b
@patitonar
Remove unused abis
cdc29da
@patitonar
Remove css files
4a52bfa
@patitonar
Fix parseValidatorEvent
73c9ae1
@patitonar
Use validatorList contract method
000864c
@andogro
updated UI instruction
ec26b9b
@akolotov
Merge pull request #212 from andogro/ag-update-instruction
14af6bf 
updated UI instruction
@patitonar
Update submodule
b39fc61
@patitonar
Calculate fee statistics using fee distribution events
9aee283
@patitonar
Support FeeDistributedFromAffirmation event on foreign side
a9df93f
@patitonar
Remove unused collected fees logic
271d13f
akolotov and others added 14 commits April 26, 2019 00:51
@akolotov
Merge pull request #211 from poanetwork/210-extend-statistic-fee-coll…
6b517b0 
…ected

Show collected fees on statistic tab
@patitonar
Merge branch 'develop' into fix-v1-to-v2-migrated-contracts
dddba46 
# Conflicts:
#	src/stores/ForeignStore.js
#	src/stores/HomeStore.js
#	src/stores/utils/contract.js
@patitonar
Merge fix
787c17a
@akolotov
Merge pull request #184 from poanetwork/fix-v1-to-v2-migrated-contracts
75aff14 
Fix displayed information for contracts upgraded from v1 to v2
@patitonar
Update contract submodule
dc27f68
@patitonar
Get token ERC type on foreign network
46e3846
@patitonar
Add getTokenType unit test
b7cce16
@patitonar
Add NetworkDetails unit tests
22ec13d
@patitonar
Update parity version on e2e tests
e6f106f
@akolotov
Merge pull request #215 from poanetwork/213-support-erc677-foreign-er…
cfe76f9 
…c-to-erc

Add support erc677 on Foreign network for erc-to-erc mode
@patitonar
Update e2e tests urls
d8dc2fd
@akolotov
Merge pull request #217 from poanetwork/216-fix-e2e-urls
1f0673e 
Update e2e tests urls
@bitcoinwarrior1
update AlphaWallet links to point to website
5d84eb3
@akolotov
Merge pull request #218 from AlphaWallet/develop
46a4862 
update AlphaWallet links to point to website
@akolotov akolotov requested a review from patitonar May 22, 2019 22:50
@netlify
Copy link

netlify bot commented May 22, 2019

Deploy preview for kind-kilby-95344f processing.

Building with commit 46a4862

https://app.netlify.com/sites/kind-kilby-95344f/deploys/5ce5d2367b9e890008b2820e

@coveralls
Copy link

Pull Request Test Coverage Report for Build 487

  • 52 of 134 (38.81%) changed or added relevant lines in 10 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+4.3%) to 9.244%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/components/StatisticsPage.js 0 1 0.0%
src/components/Bridge.js 0 6 0.0%
src/stores/utils/array.js 0 13 0.0%
src/stores/utils/contract.js 31 45 68.89%
src/stores/ForeignStore.js 0 16 0.0%
src/stores/HomeStore.js 0 32 0.0%
Files with Coverage Reduction New Missed Lines %
src/stores/utils/contract.js 1 60.87%
src/stores/HomeStore.js 1 0.0%
Totals Coverage Status
Change from base Build 448: 4.3%
Covered Lines: 122
Relevant Lines: 1436
💛 - Coveralls

@akolotov akolotov merged commit a6e8c72 into master May 23, 2019
@akolotov akolotov deleted the develop branch May 24, 2019 06:07
@akolotov akolotov restored the develop branch May 24, 2019 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@patitonar patitonar patitonar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@akolotov @coveralls @patitonar @andogro @bitcoinwarrior1