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 release branch into testnet branch #2777

Merged
merged 7 commits into from
Sep 7, 2023
+24 −20
Merged

Merge release branch into testnet branch #2777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
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
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
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.ubuntu-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.8.1
image: elastic/elasticsearch:8.9.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand All @@ -22,7 +22,7 @@ jobs:
--env cluster.routing.allocation.disk.threshold_enabled=false
--publish 9200:9200
elasticsearch7:
image: elastic/elasticsearch:7.17.10
image: elastic/elasticsearch:7.17.12
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down Expand Up @@ -66,14 +66,14 @@ jobs:
df -h .
free
mkdir -p _build
sudo mkdir -p /_build/libraries /_build/programs /_build/tests /mnt/_build
sudo chmod a+rwx /_build/libraries /_build/programs /_build/tests
sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
ln -s /_build/libraries _build/libraries
ln -s /_build/programs _build/programs
ln -s /_build/tests _build/tests
ln -s /mnt/_build/tests _build/tests
sudo ln -s /_build/libraries /mnt/_build/libraries
sudo ln -s /_build/programs /mnt/_build/programs
sudo ln -s /_build/tests /mnt/_build/tests
sudo ln -s /mnt/_build/tests /_build/tests
ls -al _build
pushd _build
export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.ubuntu-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.8.1
image: elastic/elasticsearch:8.9.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand All @@ -22,7 +22,7 @@ jobs:
--env cluster.routing.allocation.disk.threshold_enabled=false
--publish 9200:9200
elasticsearch7:
image: elastic/elasticsearch:7.17.10
image: elastic/elasticsearch:7.17.12
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ env:
# The following are for windows cross-build only:
BOOST_VERSION: 1_69_0
BOOST_DOTTED_VERSION: 1.69.0
CURL_VERSION: 8.1.2
OPENSSL_VERSION: 1.1.1u
ZLIB_VERSION: 1.2.13
CURL_VERSION: 8.2.1
OPENSSL_VERSION: 1.1.1v
ZLIB_VERSION: 1.3
jobs:
prepare-mingw64-libs:
name: Build required 3rd-party libraries
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch8:
image: elastic/elasticsearch:8.8.1
image: elastic/elasticsearch:8.9.1
options: >-
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
--env discovery.type=single-node
Expand Down
5 changes: 4 additions & 1 deletion libraries/chain/db_market.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,13 +1225,14 @@ database::match_result_type database::match_limit_settled_debt( const limit_orde
wlog( "Unexpected scene: obj.for_sale > bitasset.individual_settlement_fund" );
obj.for_sale = bitasset.individual_settlement_fund;
obj.sell_price = ~bitasset.get_individual_settlement_price();
} // GCOVR_EXEL_STOP
} // GCOVR_EXCL_STOP
}
else
{
obj.for_sale = bitasset.individual_settlement_fund;
obj.sell_price = ~bitasset.get_individual_settlement_price();
}
// Note: filled_amount is not updated, but it should be fine
});
// Note:
// After the price is updated, it is possible that the order can be matched with another order on the order
Expand Down Expand Up @@ -1325,6 +1326,7 @@ database::match_result_type database::match_settled_debt_limit( const limit_orde
obj.for_sale = bitasset.individual_settlement_fund;
obj.sell_price = ~bitasset.get_individual_settlement_price();
} // GCOVR_EXCL_STOP
// Note: filled_amount is not updated, but it should be fine
});
}

Expand Down Expand Up @@ -1889,6 +1891,7 @@ bool database::fill_limit_order( const limit_order_object& order, const asset& p
}
modify( order, [&pays,&new_take_profit_order_id]( limit_order_object& b ) {
b.for_sale -= pays.amount;
b.filled_amount += pays.amount.value;
b.deferred_fee = 0;
b.deferred_paid_fee.amount = 0;
if( new_take_profit_order_id.valid() ) // A new take profit order is created, link it to this order
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/graphene/chain/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#define GRAPHENE_MAX_NESTED_OBJECTS (200)

const std::string GRAPHENE_CURRENT_DB_VERSION = "20230529";
const std::string GRAPHENE_CURRENT_DB_VERSION = "20230906";

#define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT 4
#define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT 3
Expand Down
9 changes: 5 additions & 4 deletions libraries/chain/include/graphene/chain/market_object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ using namespace graphene::db;
class limit_order_object : public abstract_object<limit_order_object, protocol_ids, limit_order_object_type>
{
public:
time_point_sec expiration;
account_id_type seller;
share_type for_sale; ///< asset id is sell_price.base.asset_id
price sell_price;
time_point_sec expiration; ///< When this limit order will expire
account_id_type seller; ///< Who is selling
share_type for_sale; ///< The amount for sale, asset id is sell_price.base.asset_id
price sell_price; ///< The seller's asking price
fc::uint128_t filled_amount = 0; ///< The amount that has been sold, asset id is sell_price.base.asset_id
share_type deferred_fee; ///< fee converted to CORE
asset deferred_paid_fee; ///< originally paid fee
bool is_settled_debt = false; ///< Whether this order is an individual settlement fund
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/market_object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ share_type call_order_object::get_max_debt_to_cover( price match_price,

FC_REFLECT_DERIVED_NO_TYPENAME( graphene::chain::limit_order_object,
(graphene::db::object),
(expiration)(seller)(for_sale)(sell_price)(deferred_fee)(deferred_paid_fee)
(expiration)(seller)(for_sale)(sell_price)(filled_amount)(deferred_fee)(deferred_paid_fee)
(is_settled_debt)(on_fill)(take_profit_order_id)
)

Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 1 files
+12 −4 src/asio.cpp