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

Add ERC677 support on foreign bridge in erc20-to-erc20 bridge mode #177

Merged
merged 9 commits into from
May 2, 2019
Merged

Add ERC677 support on foreign bridge in erc20-to-erc20 bridge mode #177

merged 9 commits into from
May 2, 2019

Conversation

patitonar
Copy link
Contributor

Closes #175

@patitonar patitonar requested a review from akolotov April 29, 2019 19:08
@ghost ghost assigned patitonar Apr 29, 2019
akolotov
akolotov requested changes Apr 29, 2019
View reviewed changes
Copy link
Collaborator

@akolotov akolotov left a comment

Choose a reason for hiding this comment

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

Added my thoughts about another view on the contracts hierarchy.

What do you think is better:

  • make this PR against the 119-Epic-rewards-for-bridge-validators branch?
  • make the PR against develop and merge it later into 119-Epic-rewards-for-bridge-validators since this feature will be needed in POSDAO chain together with other changes related to introduction of the validators reward?

contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol Outdated Show resolved Hide resolved
deploy/src/erc_to_erc/preDeploy.js Show resolved Hide resolved
contracts/upgradeable_contracts/ERC20ExtendedBridge.sol Outdated Show resolved Hide resolved
@patitonar
Copy link
Contributor Author

What do you think is better:
make this PR against the 119-Epic-rewards-for-bridge-validators branch?
make the PR against develop and merge it later into 119-Epic-rewards-for-bridge-validators since this feature will be needed in POSDAO chain together with other changes related to introduction of the validators reward?

My bad, I should have asked about the base branch for this. I used the develop branch as base because there wasn't any needed changes from 119-Epic-rewards-for-bridge-validators for this feature. I think we can merge this into develop and then merge develop into 119-Epic-rewards-for-bridge-validators branch

@akolotov
Copy link
Collaborator

we can merge this into develop and then merge develop into 119-Epic-rewards-for-bridge-validators branch

OK

@ghost ghost removed the in progress label Apr 30, 2019
@ghost ghost added the in progress label Apr 30, 2019
@ghost ghost assigned akolotov May 2, 2019
@ghost ghost removed the in progress label May 2, 2019
@akolotov akolotov merged commit 5d315c9 into develop May 2, 2019
@ghost ghost removed the review label May 2, 2019
@akolotov akolotov deleted the 175-ERC677-support-foreign-erc20-to-erc20 branch May 21, 2019 23:13
@akolotov akolotov mentioned this pull request May 22, 2019
Merged
@akolotov akolotov mentioned this pull request Jun 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akolotov akolotov akolotov approved these changes

Assignees

@patitonar patitonar

@akolotov akolotov

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@patitonar @akolotov