Implement #583 percentage based transfer fee and #603 coin-days based free transaction #605
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: libraries/chain/protocol/fee_schedule.cpp Adapt upstream changes in commit 146c0c4
Conflicts: libraries/chain/account_object.cpp libraries/chain/include/graphene/chain/evaluator.hpp libraries/chain/transfer_evaluator.cpp Fixed by adapting upstream changes.
Conflicts: libraries/chain/transfer_evaluator.cpp
Conflicts: libraries/chain/include/graphene/chain/evaluator.hpp libraries/chain/include/graphene/chain/protocol/operations.hpp
…ions, since it won't be extended in the future; remove redundant code.
…f fee parameter names. Conflicts: libraries/chain/include/graphene/chain/hardfork.hpp libraries/chain/transfer_evaluator.cpp
… in global fee schedule yet, use default values for calculation
Conflicts: libraries/chain/protocol/fee_schedule.cpp
…ase all fee goes to network
- remove accidently added-back functions from account_object.cpp - remove unused variable from transfer_evaluator.cpp
Conflicts: libraries/chain/include/graphene/chain/evaluator.hpp
Conflicts: libraries/chain/include/graphene/chain/evaluator.hpp
…ion by default, remove most of special operation checks.
…n this case CER of asset_to_update won't change
Conflicts: libraries/chain/include/graphene/chain/protocol/operations.hpp
Conflicts: libraries/chain/account_object.cpp libraries/chain/include/graphene/chain/evaluator.hpp libraries/chain/include/graphene/chain/hardfork.hpp libraries/chain/transfer_evaluator.cpp
Conflicts: libraries/chain/evaluator.cpp libraries/chain/include/graphene/chain/evaluator.hpp libraries/chain/transfer_evaluator.cpp
Conflicts: libraries/chain/include/graphene/chain/evaluator.hpp libraries/chain/transfer_evaluator.cpp
…and another minor adjustment
|
Closing this pull request for now. Will create another pull request when ready. |
This was referenced Jan 18, 2017
pmconrad
pushed a commit
to pmconrad/graphene
that referenced
this pull request
Apr 12, 2018
Merge Develop branch to Hardfork branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request is to make the review work of #583 and #603 easier.
The code hasn't been fully tested yet, I'll leave a message here when it's ready.