Settlement adjustments for the management of previously settled amounts #431
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
jijordre
added a commit
that referenced
this pull request
Aug 13, 2019
* Constrain start of DSC to trade whose wallet nonce has not been settled (#411) * Add new files to requireEnumerate * Constrain start of DSC to trade whose wallet nonce has not been settled * Update matching of require statements * Support standard parameter in trade settlement (#412) * Add standard parameter to settle functions Adjust require comments * Update matching of require statements with message * Add DriipSettlementByTrade to requireEnumerate * Revert to initial require statement pattern matching * Support unsynchronized balance in trade at start of DSC (#413) * Add support for unsynchronized balances in trade at start of DSC * Rename property and add function * Revert sign on stored cumulative relative transfer amount * Add and update events (#414) * Cancel dependent NSC when cancelling DSC in DriipSettlementChallengeByTrade (#416) * Clean up * Terminate NSC proposal when terminating DSC proposal * Terminate dependent null settlement challenge proposal upon successful driip dispute (#417) * Terminate DSC proposals at successful settlement of trade (#421) * Revision of DSC and NSC start and challenge by order and trade (#422) * Revise start of DSC from trade and challenge of DSC by trade and order Factorize out order specific features from DSC contract dealing with trade. This to decrease size of contracts. * Revise start of NSC and challenge of NSC by trade and order Factorize out order specific features from NSC contract dealing with trade. This to decrease size of contracts. * Update migration with new and updated contracts * Enable unit tests for new and updated contracts * Add new files to requireEnumerate * Remove comments * Update require messages * Bump minor version * Add pre-release label * Let settlement of payment fully take changes to deposited and staged balances into consideration (#423) * Let update of settled balance use correct block number * Update pre-release * Correct current balance by active balance * Correct current balance by staged balance * Adjust balance value calculation and store settled amount Correct current balance by active and settled balance amounts. Store updated settled balance amount in driip settlement state. Enable SET_SETTLED_AMOUNT_ACTION in DriipSettlementState as part of migration. * Update correction of cumulative relative transfer at start of challenge (#429) * Update correction of cumulative relative transfer at start of challenge * Update unit tests * Store settled amount by block numbered records (#430) * Store settled amount by block number records * Adjust update of and payment balance correction by settled amount * Constrain fee transfer to scenarios of only strictly positive fee amount * Settlement adjustments for the management of previously settled amounts (#431) * Update management of previously settled amounts * Update unit tests * Remove property done from driip settlement type (#433) * Upgrade of state after deployment (#434) * Downgrade ganache-cli * Renable unit test * Update function and variable names * Add scripts to export and calculate replacement state * Remove old state files * Add new state files * Add upgrade features * Update management of settled balance amount * Add Upgradable to requireEnumerate * Update unit tests * Update require messages * Revert sign of cumulative transfer amount from payments * Revert sign of cumulative transfer amount * Remove state files * Add scripts for state export from Ropsten/dev env * Rename function and constant * Add more scripts for Ropsten and null settlement challenge state * Dete state file * Add script to export from null settlement challenge state contract * Update proposal schema and remove settlement party done property * Update output dir and remove settlement party done property * Update payment query * Update settled amount with payment's block number * Add function to upgrade settled amount * Adjust output and filters * Correct property typo in exportProposal() * Add script to upgrade contracts state * Rename action SET_FEE_TOTAL_ACTION to SET_TOTAL_FEE_ACTION * Add modifier * Add unit test for upgradeSettledAmount() * Rename fields * Use dev query * Add script for state upgrade * Upgrade require messages * Update scripts * Rename scripts * Increase default ether balance * Use safe math functions * Prepare for pre-release v1.4.0-ropsten.3 (#435) * Update deployment of libraries to Ropsten * Add missing address * Scripts for state upgrade (#436) * Add truffle script to transfer ETH * Comment out service enable/disable facility * Add script to promote and demote service to interact with several contracts * Add wiring of BalanceTracker to DriipSettlementByPayment * Add proposal bignumberification and remove service access features * Debug script * Clean up * Update query for Ropsten * Harmonize scripts * Remove obsolete script * Add script for delta balance calculation * Move freezing of upgrades to separate script * Add mainnet payment query * Remove commented out code * Update migration scripts for mainnet * Release of v1.4.0 (#437) * Skip event sampling from ClientFund and WalletLocker * Remove pre-release tag
jijordre
added a commit
that referenced
this pull request
Aug 17, 2019
* Release of v1.4.0 (#438) * Constrain start of DSC to trade whose wallet nonce has not been settled (#411) * Add new files to requireEnumerate * Constrain start of DSC to trade whose wallet nonce has not been settled * Update matching of require statements * Support standard parameter in trade settlement (#412) * Add standard parameter to settle functions Adjust require comments * Update matching of require statements with message * Add DriipSettlementByTrade to requireEnumerate * Revert to initial require statement pattern matching * Support unsynchronized balance in trade at start of DSC (#413) * Add support for unsynchronized balances in trade at start of DSC * Rename property and add function * Revert sign on stored cumulative relative transfer amount * Add and update events (#414) * Cancel dependent NSC when cancelling DSC in DriipSettlementChallengeByTrade (#416) * Clean up * Terminate NSC proposal when terminating DSC proposal * Terminate dependent null settlement challenge proposal upon successful driip dispute (#417) * Terminate DSC proposals at successful settlement of trade (#421) * Revision of DSC and NSC start and challenge by order and trade (#422) * Revise start of DSC from trade and challenge of DSC by trade and order Factorize out order specific features from DSC contract dealing with trade. This to decrease size of contracts. * Revise start of NSC and challenge of NSC by trade and order Factorize out order specific features from NSC contract dealing with trade. This to decrease size of contracts. * Update migration with new and updated contracts * Enable unit tests for new and updated contracts * Add new files to requireEnumerate * Remove comments * Update require messages * Bump minor version * Add pre-release label * Let settlement of payment fully take changes to deposited and staged balances into consideration (#423) * Let update of settled balance use correct block number * Update pre-release * Correct current balance by active balance * Correct current balance by staged balance * Adjust balance value calculation and store settled amount Correct current balance by active and settled balance amounts. Store updated settled balance amount in driip settlement state. Enable SET_SETTLED_AMOUNT_ACTION in DriipSettlementState as part of migration. * Update correction of cumulative relative transfer at start of challenge (#429) * Update correction of cumulative relative transfer at start of challenge * Update unit tests * Store settled amount by block numbered records (#430) * Store settled amount by block number records * Adjust update of and payment balance correction by settled amount * Constrain fee transfer to scenarios of only strictly positive fee amount * Settlement adjustments for the management of previously settled amounts (#431) * Update management of previously settled amounts * Update unit tests * Remove property done from driip settlement type (#433) * Upgrade of state after deployment (#434) * Downgrade ganache-cli * Renable unit test * Update function and variable names * Add scripts to export and calculate replacement state * Remove old state files * Add new state files * Add upgrade features * Update management of settled balance amount * Add Upgradable to requireEnumerate * Update unit tests * Update require messages * Revert sign of cumulative transfer amount from payments * Revert sign of cumulative transfer amount * Remove state files * Add scripts for state export from Ropsten/dev env * Rename function and constant * Add more scripts for Ropsten and null settlement challenge state * Dete state file * Add script to export from null settlement challenge state contract * Update proposal schema and remove settlement party done property * Update output dir and remove settlement party done property * Update payment query * Update settled amount with payment's block number * Add function to upgrade settled amount * Adjust output and filters * Correct property typo in exportProposal() * Add script to upgrade contracts state * Rename action SET_FEE_TOTAL_ACTION to SET_TOTAL_FEE_ACTION * Add modifier * Add unit test for upgradeSettledAmount() * Rename fields * Use dev query * Add script for state upgrade * Upgrade require messages * Update scripts * Rename scripts * Increase default ether balance * Use safe math functions * Prepare for pre-release v1.4.0-ropsten.3 (#435) * Update deployment of libraries to Ropsten * Add missing address * Scripts for state upgrade (#436) * Add truffle script to transfer ETH * Comment out service enable/disable facility * Add script to promote and demote service to interact with several contracts * Add wiring of BalanceTracker to DriipSettlementByPayment * Add proposal bignumberification and remove service access features * Debug script * Clean up * Update query for Ropsten * Harmonize scripts * Remove obsolete script * Add script for delta balance calculation * Move freezing of upgrades to separate script * Add mainnet payment query * Remove commented out code * Update migration scripts for mainnet * Release of v1.4.0 (#437) * Skip event sampling from ClientFund and WalletLocker * Remove pre-release tag * Comment out TradeTypesLib * Uncomment TradeTypesLib but enable only for test network * Add function to return the number of settled block numbers * Add upgrade of empty settled block number and await tx confirmation * Bump patch
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.
Partial solution to #424.