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.

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

Merge release branch back into develop branch #2789

Merged
merged 155 commits into from
Oct 5, 2023
Merged
Changes from 1 commit
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
61d85de
Progress #1604: Basic implementation
nathanielhourt Feb 21, 2019
f6bbe4b
Progress #1604: Tests and Fixes
nathanielhourt Feb 22, 2019
5484c9f
Ref #1604: Add matching logic
nathanielhourt Feb 22, 2019
3d24f7c
Progress #1604: Add dust check
nathanielhourt Feb 26, 2019
073ecbe
Progress #1604: Add hardfork guards
nathanielhourt Feb 26, 2019
a34c855
Ref #1604: Another test case
nathanielhourt Feb 26, 2019
fba5bac
Progress #1604: Do not allow sooner expiration
nathanielhourt Feb 27, 2019
8a82d92
Add fee_schedule::exists<op_type>()
nathanielhourt Feb 27, 2019
6180946
Ref #1604: Add missing hardfork guard
nathanielhourt Feb 27, 2019
55dc688
Eliminate variable fee
nathanielhourt Oct 7, 2019
f7b2547
Update SonarScanner config for hardfork branch
abitmore Dec 17, 2021
5550b40
Merge pull request #2563 from bitshares/develop-to-hardfork
abitmore Dec 17, 2021
4b2de74
Merge pull request #2701 from bitshares/develop
abitmore Dec 4, 2022
d018955
Merge branch 'hardfork' into update-sonar-hf
abitmore Jan 11, 2023
55028ac
Merge pull request #2715 from bitshares/update-sonar-hf
abitmore Jan 11, 2023
996bb3d
Merge pull request #2713 from bitshares/develop
abitmore Jan 11, 2023
ff39fb5
Allow settling more than indvd fund when no feed
abitmore Jan 22, 2023
e4878a3
Merge pull request #2716 from bitshares/pr-2587-settle-without-feed
abitmore Jan 23, 2023
715b212
Add liquidity_pool_update_operation
abitmore Jan 24, 2023
cd10dc5
Add tests for liquidity_pool_update_operation
abitmore Jan 27, 2023
6c31d61
Merge pull request #2719 from bitshares/develop
abitmore Jan 27, 2023
865ae5d
Update default fee of lp_update_op
abitmore Jan 28, 2023
011b523
Update an assertion message
abitmore Jan 28, 2023
2d93201
Merge pull request #2720 from bitshares/pr-2604-liquidity-pool-update
abitmore Jan 29, 2023
9e6325f
Pay force-settlement from settlement funds at MCOP
abitmore Jan 29, 2023
6572b08
Add tests for price paid by indvd settlement fund
abitmore Jan 30, 2023
763a140
Merge pull request #2723 from bitshares/develop
abitmore Feb 1, 2023
1ea6578
Add tests for price paid by global settlement fund
abitmore Feb 3, 2023
a3e34dd
Merge pull request #2725 from bitshares/develop
abitmore Feb 6, 2023
247bb8f
Refactor limit_order_obj for indvd_settle_to_order
abitmore Feb 22, 2023
dd7bbe3
Update settled-debt order when median feed updated
abitmore Feb 23, 2023
b1b7167
Pay fee when settled-debt order is filled as maker
abitmore Feb 23, 2023
5183773
Check price when individually settling to order
abitmore Feb 23, 2023
bd1b2fa
Process settled-debt order in check_call_orders()
abitmore Feb 24, 2023
dfc71de
Extend individual_settlement_test for core-2591 hf
abitmore Feb 24, 2023
5fc7ee1
Update tests taking settled-debt order for hf 2591
abitmore Feb 24, 2023
404c1ce
Update try-catch in a test case
abitmore Feb 24, 2023
c390977
Fix a number in comments in test cases
abitmore Feb 25, 2023
2b2ca4b
Add tests that settled-debt order matches as taker
abitmore Feb 25, 2023
a6dcc1a
Merge pull request #2721 from bitshares/pr-2591-force-settle-price
abitmore Mar 5, 2023
8afc448
Skip prediction markets when paying collateral fee
abitmore Mar 10, 2023
eb45cc1
Fix global settlement when have settled-debt order
abitmore Mar 10, 2023
08a55e6
Update manual_gs_test for core-2591 hard fork
abitmore Mar 12, 2023
338de92
Add tests for PM instant-settlement price
abitmore Mar 12, 2023
0b2dd8e
Merge pull request #2727 from bitshares/pr-2591-fix-gs
abitmore Mar 13, 2023
3176f6d
Merge branch 'hardfork' into develop-to-hardfork
abitmore Mar 20, 2023
1496be5
Merge pull request #2733 from bitshares/develop-to-hardfork
abitmore Mar 20, 2023
bba9b4a
Implement credit deal auto-repayment
abitmore Mar 19, 2023
cb4bc4a
Add tests for credit deal auto-repayment
abitmore Mar 22, 2023
5704816
Optimize processing of virutal operations
abitmore Mar 22, 2023
68efc09
Fix _current_virtual_op in push_proposal
abitmore Mar 22, 2023
e8fac66
Add tests for credit deal auto-repayment history
abitmore Mar 22, 2023
8a64036
Update params in credit deal auto-repayment tests
abitmore Mar 22, 2023
52d676a
Try to fix MinGW build with -Wa,-mbig-obj
abitmore Mar 22, 2023
bf5934f
Set VERBOSE=1 when making with MinGW in CI
abitmore Mar 22, 2023
d069614
Rename fee_parameters_type to fee_params_t
abitmore Mar 23, 2023
b7a5d68
Update a comment
abitmore Mar 23, 2023
2ca1d99
Update a comment
abitmore Mar 23, 2023
a89307c
Wrap long lines
abitmore Mar 24, 2023
beb5022
Merge branch 'develop'
abitmore Mar 30, 2023
d1da353
Remove mostly useless try/catch wrappers
abitmore Mar 31, 2023
38ff734
Merge 'develop' branch
abitmore Apr 1, 2023
3fc4de4
Add fee_change_test
abitmore Apr 19, 2023
d441b3e
Merge pull request #2735 from bitshares/pr-2595-credit-auto-repay
abitmore Apr 19, 2023
a71cfe4
Merge hardfork branch, fix build and tests
abitmore Apr 29, 2023
a03b4ce
Fix issues about limit_order_update_evaluator
abitmore May 8, 2023
44e6de4
Do not allow inappropriate price manipulation
abitmore May 9, 2023
2387df3
Remove redundant checks for order matching
abitmore May 9, 2023
2b3bcd3
Remove redundant checks for account balance
abitmore May 9, 2023
e8e9d0d
Simplify try-catch wrappers in tests
abitmore May 9, 2023
136007e
Update tests to adapt code changes
abitmore May 10, 2023
cf2fca6
Remove mostly useless try/catch wrappers
abitmore May 10, 2023
9160a7e
Add tests for limit_order_update_operation
abitmore May 10, 2023
c58db0b
Fix potential dereferencing issues in tests
abitmore May 10, 2023
85bef43
Add asset authorization tests for order_update op
abitmore May 10, 2023
afcff0d
Update a comment and an assertion message
abitmore May 10, 2023
dfce7c6
Update default order update fee
abitmore May 11, 2023
8898b5a
Process operation fees
abitmore May 11, 2023
269a16d
Reduce log level of exceptions in order_update_op
abitmore May 11, 2023
032f125
Update a comment
abitmore May 12, 2023
663ecd9
Move deferred fee processing code into a function
abitmore May 12, 2023
d381110
Add tests for order_update fee if paid in CORE
abitmore May 12, 2023
1195df5
Add tests for order_update fee if not paid in CORE
abitmore May 12, 2023
2a34e1b
Update variable names to fix variable shadowing
abitmore May 15, 2023
126987e
Update a comment
abitmore May 15, 2023
1f66802
Merge pull request #2743 from bitshares/issue-1604
abitmore May 15, 2023
6636959
Fix code smells
abitmore May 16, 2023
b26d877
Add tests for virtual operation fees
abitmore May 16, 2023
2906a69
Add GCOVR_EXCL_LINE for FC_CAPTURE_AND_RETHROW
abitmore May 16, 2023
a4dfd53
Merge pull request #2745 from bitshares/fix-coverage
abitmore May 17, 2023
113418e
Add GCOVR_EXCL_LINE for FC_CAPTURE_AND_RETHROW
abitmore May 20, 2023
ecc0da4
Add tests for object_id and object_id_type
abitmore May 20, 2023
1401ea6
Merge pull request #2747 from bitshares/fix-code-smells
abitmore May 21, 2023
4b87ba8
Rename functions has_settlement() and has_indiv...
abitmore May 27, 2023
92041b8
Refactor code about individual settlement order
abitmore May 27, 2023
37c5853
Update some assertion messages
abitmore May 27, 2023
f8d5e8d
Add GCOVR exclusion markers around defensive code
abitmore May 27, 2023
061594f
Update comments
abitmore May 28, 2023
38dbc61
Merge pull request #2748 from bitshares/settlement-code-refactory
abitmore May 29, 2023
240a84a
Implement Order-Sends-Take-Profit-Order feature
abitmore May 29, 2023
78816b7
Add tests for take profit order feature
abitmore Jun 13, 2023
de8339d
Remove unused code
abitmore Jun 14, 2023
1afd436
Adapt on_fill field (for limit orders) for ES
abitmore Jun 17, 2023
ad0a5b5
Catch more exceptions when processing on_fill
abitmore Jun 17, 2023
ec47739
Add tests for failure to send take profit order
abitmore Jun 17, 2023
9a36b7c
Merge pull request #2749 from bitshares/pr-2535-oso
abitmore Jun 19, 2023
e49788d
Merge pull request #2750 from bitshares/develop
abitmore Jun 20, 2023
dff65c3
Merge pull request #2753 from bitshares/develop
abitmore Jun 22, 2023
b99d62f
Fix a comment in a test case
abitmore Jun 24, 2023
16c7798
Fix a test case
abitmore Jun 24, 2023
7548e6b
Merge pull request #2754 from bitshares/update-comment
abitmore Jun 24, 2023
c6c7767
Merge pull request #2755 from bitshares/fix-tests
abitmore Jun 25, 2023
2105165
Fix a comment in a test case
abitmore Jul 1, 2023
29553e3
Fix a test case about updating limit orders
abitmore Jul 1, 2023
4d6e7cc
Merge pull request #2757 from bitshares/update-comment
abitmore Jul 1, 2023
3d64cf0
Merge pull request #2758 from bitshares/update-tests
abitmore Jul 1, 2023
c7c5ac5
Update sonar.branch.target for release branch
abitmore Jun 21, 2023
8b51608
Merge pull request #2751 from bitshares/hardfork-to-release
abitmore Jul 1, 2023
8ac9d20
Add missing reflection for limit_order_update_op
abitmore Jul 1, 2023
7b956a0
Merge pull request #2759 from bitshares/fix-reflection
abitmore Jul 2, 2023
34134ab
Fix fee_change_test
abitmore Jul 2, 2023
035008b
Merge pull request #2760 from bitshares/fix-fee-change-test
abitmore Jul 2, 2023
12cd517
Add OSO tests for ES
abitmore Jul 2, 2023
998bbac
Merge pull request #2762 from bitshares/update-es-tests
abitmore Jul 2, 2023
962be19
Merge pull request #2761 from bitshares/hardfork
abitmore Jul 2, 2023
849a094
Fix a test case
abitmore Jul 3, 2023
10468b2
Merge pull request #2764 from bitshares/fix-2587-test
abitmore Jul 3, 2023
e82f080
Merge pull request #2765 from bitshares/hardfork
abitmore Jul 3, 2023
678c2ea
Update project brief and version in Doxyfile
abitmore Jul 3, 2023
edf65bf
Merge pull request #2767 from bitshares/update-doxyfile
abitmore Jul 3, 2023
cc9841a
Fix Doxygen warnings
abitmore Jul 3, 2023
ede3cb0
Merge pull request #2768 from bitshares/fix-doxygen-warnings
abitmore Jul 4, 2023
311c6a2
Fix gethelp command in CLI wallet
abitmore Jul 12, 2023
bbf3933
Merge pull request #2771 from bitshares/fix-cli-gethelp
abitmore Jul 14, 2023
fa73a23
Bump FC to improve node networking stability
abitmore Sep 5, 2023
7c28426
Update dependency versions used in Github Actions
abitmore Sep 5, 2023
0ca0616
Fix Github Actions Ubuntu debug build
abitmore Sep 5, 2023
29258ec
Merge pull request #2775 from bitshares/bump-fc
abitmore Sep 6, 2023
d1ae7e6
Record filled amount in limit orders
abitmore Sep 6, 2023
692608b
Fix typo in a comment to fix code coverage report
abitmore Sep 6, 2023
0d290e9
Merge pull request #2776 from bitshares/limit-order-filled-amount
abitmore Sep 6, 2023
c4b3108
Update dependency versions used in Github Actions
abitmore Sep 25, 2023
b9cabb9
Merge pull request #2779 from bitshares/update-versions-in-ci
abitmore Sep 25, 2023
1c68b64
Fix Doxygen warnings
abitmore Sep 25, 2023
4311a1f
Merge pull request #2780 from bitshares/fix-doxygen
abitmore Sep 25, 2023
dec5c10
Update docs submodule
abitmore Sep 25, 2023
f9a50ca
Update CONTRIBUTORS.txt
abitmore Sep 25, 2023
36b2694
Set Mainnet 7.0 HF time to 2023-11-16 14:00:00 UTC
abitmore Sep 25, 2023
5799660
Merge pull request #2781 from bitshares/update-7
abitmore Sep 26, 2023
9a5cf5c
Update Doxygen links in README.md
abitmore Oct 1, 2023
26a4350
Fix typos
abitmore Oct 1, 2023
8019ed9
Fix typos
abitmore Oct 1, 2023
24e733b
Fix a typo
abitmore Oct 1, 2023
2d44e48
Merge pull request #2786 from bitshares/update-doxygen-links
abitmore Oct 1, 2023
77ef234
Update sonar-project.properties for develop branch
abitmore Oct 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Doxygen warnings
abitmore committed Sep 25, 2023
commit 1c68b640587bbebaae224367e6cd1c2a2b9dbc55
16 changes: 8 additions & 8 deletions libraries/app/application.cpp
Original file line number Diff line number Diff line change
@@ -634,7 +634,7 @@ bool application_impl::is_plugin_enabled(const string& name) const
return !(_active_plugins.find(name) == _active_plugins.end());
}

/**
/*
* If delegate has the item, the network has no need to fetch it.
*/
bool application_impl::has_item(const net::item_id& id)
@@ -649,7 +649,7 @@ bool application_impl::has_item(const net::item_id& id)
FC_CAPTURE_AND_RETHROW( (id) ) // GCOVR_EXCL_LINE
}

/**
/*
* @brief allows the application to validate an item prior to broadcasting to peers.
*
* @param sync_mode true if the message was fetched through the sync process, false during normal operation
@@ -759,7 +759,7 @@ bool application_impl::is_included_block(const block_id_type& block_id)
return block_id == block_id_in_preferred_chain;
}

/**
/*
* Assuming all data elements are ordered in some way, this method should
* return up to limit ids that occur *after* the last ID in synopsis that
* we recognize.
@@ -816,7 +816,7 @@ std::vector<item_hash_t> application_impl::get_block_ids(const std::vector<item_
return result;
} FC_CAPTURE_AND_RETHROW( (blockchain_synopsis)(remaining_item_count)(limit) ) } // GCOVR_EXCL_LINE

/**
/*
* Given the hash of the requested data, fetch the body.
*/
message application_impl::get_item(const item_id& id)
@@ -840,7 +840,7 @@ chain_id_type application_impl::get_chain_id() const
return _chain_db->get_chain_id();
}

/**
/*
* Returns a synopsis of the blockchain used for syncing. This consists of a list of
* block hashes at intervals exponentially increasing towards the genesis block.
* When syncing to a peer, the peer uses this data to determine if we're on the same
@@ -1018,7 +1018,7 @@ std::vector<item_hash_t> application_impl::get_blockchain_synopsis(const item_ha
return synopsis;
} FC_CAPTURE_AND_RETHROW() } // GCOVR_EXCL_LINE

/**
/*
* Call this after the call to handle_message succeeds.
*
* @param item_type the type of the item we're synchronizing, will be the same as item passed to the sync_from() call
@@ -1030,7 +1030,7 @@ void application_impl::sync_status(uint32_t item_type, uint32_t item_count)
// any status reports to GUI go here
}

/**
/*
* Call any time the number of connected peers changes.
*/
void application_impl::connection_count_changed(uint32_t c)
@@ -1043,7 +1043,7 @@ uint32_t application_impl::get_block_number(const item_hash_t& block_id)
return block_header::num_from_id(block_id);
} FC_CAPTURE_AND_RETHROW( (block_id) ) } // GCOVR_EXCL_LINE

/**
/*
* Returns the time a block was produced (if block_id = 0, returns genesis time).
* If we don't know about the block, returns time_point_sec::min()
*/
2 changes: 0 additions & 2 deletions libraries/protocol/include/graphene/protocol/operations.hpp
Original file line number Diff line number Diff line change
@@ -133,8 +133,6 @@ namespace graphene { namespace protocol {
/* 77 */ limit_order_update_operation
>;

/// @} // operations group

/**
* Appends required authorites to the result vector. The authorities appended are not the
* same as those returned by get_required_auth