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 into testnet branch for 6.0 TESTNET release #2519

Merged
merged 292 commits into from
Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
292 commits
Select commit Hold shift + click to select a range
67f2f67
Add tests to reproduce LP deposit stats issue
abitmore Jun 9, 2021
3c5d37d
Fix LP deposit statistics
abitmore Jun 10, 2021
25c5e36
Remove unused lambda capture
abitmore Jun 10, 2021
f5b0bce
Remove unused variables
abitmore Jun 10, 2021
f8912ef
Merge pull request #2471 from bitshares/fix-lp-stats
abitmore Jun 11, 2021
fbc6dd4
Upgrade Docker to Ubuntu Focal Fossa (20.04 LTS)
abitmore Jun 11, 2021
e0f7317
Add tests for SameT Fund update
abitmore Jun 11, 2021
c6b9669
Fix samet fund fee calculation
abitmore Jun 11, 2021
c59d10e
Update assertion messages
abitmore Jun 11, 2021
9a26449
Add tests for SameT Fund borrow and repay
abitmore Jun 11, 2021
daa1a6d
Merge pull request #2473 from bitshares/upgrade-docker
abitmore Jun 11, 2021
5424962
Add database APIs for SameT Funds
abitmore Jun 12, 2021
a72830c
Add tests for database APIs about SameT Funds
abitmore Jun 12, 2021
7c77425
Do cleanups more frequently in sonar-scan workflow
abitmore Jun 12, 2021
8fa5eeb
Merge pull request #2469 from bitshares/pr-2351-samet-fund
abitmore Jun 14, 2021
82c1f5d
Move samet_fund_object reflection into cpp file
abitmore Jun 15, 2021
a729b64
Merge pull request #2474 from bitshares/refactor-reflection
abitmore Jun 15, 2021
0cc3513
Clear operation_results when generating block
abitmore Jun 17, 2021
052d3e1
Return owner account for SameT Fund borrow, repay
abitmore Jun 17, 2021
069d87d
Fix test cases due to operation_results changes
abitmore Jun 17, 2021
6a0b2f5
Merge pull request #2475 from bitshares/no-operation-results-in-block
abitmore Jun 18, 2021
5d15671
Add tests for SameT Fund related account history
abitmore Jun 18, 2021
4118c44
Add comments
abitmore Jun 18, 2021
7d79c23
Merge pull request #2476 from bitshares/samet-fund-impacted-accounts
abitmore Jun 19, 2021
7d441c1
Merge pull request #2477 from bitshares/develop
abitmore Jun 19, 2021
49fafcf
Implement simple collateralized P2P funding
abitmore Jun 22, 2021
23263b0
Fix code smells
abitmore Jun 22, 2021
2527a52
Fix credit offer accept operation
abitmore Jun 25, 2021
a4cc66b
Add tests for credit offers and deals
abitmore Jun 25, 2021
d71638e
Add tests for operation results about credit deals
abitmore Jun 25, 2021
fd4d08b
Try to fix OOM for Github CI Ubuntu debug build
abitmore Jun 25, 2021
490b124
Add database APIs for credit offers and deals
abitmore Jun 26, 2021
a2f8100
Fix code smell in application::set_program_options
abitmore Jun 26, 2021
c75fcc4
Add tests for database APIs about credit offers
abitmore Jun 26, 2021
4ddd620
Refactor simple database query APIs
abitmore Jun 26, 2021
2f1dc73
Simplify code and fix code smells
abitmore Jun 26, 2021
67cc36b
Reduce default SameT Fund and credit offer fees
abitmore Jun 27, 2021
554a16d
Notify all related accounts on account creation
abitmore Jun 27, 2021
553c814
Add tests for database APIs about credit deals
abitmore Jun 27, 2021
1ad4cf3
Change return types of SameT Fund borrow and repay
abitmore Jun 27, 2021
71d16e9
Add tests for account creation notification
abitmore Jun 27, 2021
2e9a09a
Move fee_schedule::set_fee(...) to a new file
abitmore Jun 28, 2021
54e63a1
Merge pull request #2480 from bitshares/pr-265-account-create-notify
abitmore Jun 28, 2021
cd6ffa1
Fix code smells
abitmore Jun 28, 2021
d5f3bfa
Merge pull request #2479 from bitshares/pr-2362-credit-offer
abitmore Jun 28, 2021
a327390
Remove BSIP-40 support for some operations
abitmore Jun 29, 2021
9fbc3c8
Remove BSIP-40 support for more operations
abitmore Jun 29, 2021
6484653
Add tests for BSIP-40 unsupported operation check
abitmore Jun 29, 2021
7db58f8
Replace magic numbers with named constants
abitmore Jun 30, 2021
dd0b761
Fix code smells
abitmore Jun 30, 2021
2ce9037
Merge pull request #2482 from bitshares/limited-cust-auth-support
abitmore Jun 30, 2021
4074611
Check and remove unneeded dir when flushing db
abitmore Jul 5, 2021
e42df9c
Add OS version to cache key in sonar-scan workflow
abitmore Jul 5, 2021
2fc92d0
Merge pull request #2485 from bitshares/fix-object-database-move
abitmore Jul 5, 2021
bc841d9
Add more tests about margin call fee
abitmore Jul 5, 2021
0de58c7
Merge pull request #2486 from bitshares/sonar-cache-key
abitmore Jul 5, 2021
aea36e1
Require OS version in cache key for sonar-scan
abitmore Jul 5, 2021
970da63
Merge pull request #2487 from bitshares/sonar-cache-key
abitmore Jul 6, 2021
f8c8e85
Merge pull request #2488 from bitshares/develop
abitmore Jul 6, 2021
2500b8b
Match force-settlements with margin calls
abitmore Jul 5, 2021
ddd26f8
Add tests for GS after core-2481 hard fork
abitmore Jul 5, 2021
564de55
Fix code smells
abitmore Jul 6, 2021
337fccb
Handle blackswan when matching calls with settles
abitmore Jul 9, 2021
bec187a
Fix potential undercollateralization issue
abitmore Jul 10, 2021
b815386
Wrap long lines
abitmore Jul 10, 2021
a4e81a0
Split clear_expired_orders() into 2 functions
abitmore Jul 10, 2021
66c3382
Add some regression tests for hf core-2481
abitmore Jul 10, 2021
e1f0099
Add tests for matching settlements with calls
abitmore Jul 11, 2021
4ca6476
Fix rounding issue due to TCR on settle/call match
abitmore Jul 11, 2021
b1ff84e
Add tests about GS when matching settlements
abitmore Jul 12, 2021
975dda9
Add more regression tests for hf core-2481
abitmore Jul 12, 2021
54ad498
Update comments and code style
abitmore Jul 12, 2021
e2695bf
Bump DB version
abitmore Jul 12, 2021
4c50aba
Avoid unnecessary database update
abitmore Jul 12, 2021
b9ebbf5
Replace BOOST_MESSAGE with BOOST_TEST_MESSAGE
abitmore Jul 12, 2021
5778252
Fix code smells
abitmore Jul 13, 2021
2045d7c
Add comment and logging
abitmore Jul 13, 2021
cec2378
Add tests for matching call orders at hf 2481
abitmore Jul 16, 2021
498c674
Add tests about reducing CR to trigger margin call
abitmore Jul 16, 2021
68d323a
Add tests about new instantly-called call order
abitmore Jul 16, 2021
efcc147
Fix issues about matching taker calls with settles
abitmore Jul 16, 2021
58b4e49
Add tests about matching smaller settle with call
abitmore Jul 16, 2021
2c998a0
Remove wrong comment and related logging
abitmore Jul 17, 2021
1111348
Update tests about GS when matching settlements
abitmore Jul 17, 2021
a38fed0
Update return type of database::match() to enum
abitmore Jul 17, 2021
1209eb6
Fix rounding issues
abitmore Jul 18, 2021
7a2afc7
Add tests for matching tiny settle order with call
abitmore Jul 19, 2021
27249c1
Improve performance
abitmore Jul 19, 2021
390ca3d
Add tests for matching tiny call order with settle
abitmore Jul 19, 2021
b3de6a7
Allow longer time for node-test
abitmore Jul 19, 2021
3d75929
Add tests for matching small settle with call
abitmore Jul 20, 2021
441f54d
Fix typo in docs
abitmore Jul 21, 2021
d9fa5be
Reset cURL options for different request type
abitmore Jul 25, 2021
5d8bfac
Avoid too low CR for new or updated debt positions
abitmore Jul 27, 2021
c2496e9
Merge pull request #2489 from bitshares/pr-2481-settle-order-margin-c…
abitmore Aug 5, 2021
4020353
Merge pull request #2495 from bitshares/pr-2490-fix-es-crash
abitmore Aug 5, 2021
97a7752
Add alternative bad debt settlement methods
abitmore Aug 6, 2021
b177cbc
Add disable_bdsm_update bit in issuer permission
abitmore Aug 7, 2021
29925a8
Refactor asset_object::update_median_feeds(...)
abitmore Aug 8, 2021
013cea1
Partially implement BDSM::no_settlement
abitmore Aug 8, 2021
c0b3724
Implement BDSM::no_settlement
abitmore Aug 10, 2021
055f7c5
Implement force-settlement against individual pool
abitmore Aug 14, 2021
e83f842
Update tests to adapt settle_op return type change
abitmore Aug 14, 2021
3227652
Implement BDSM::individual_settlement_to_fund
abitmore Aug 15, 2021
57b837a
Implement BDSM::individual_settlement_to_order
abitmore Aug 16, 2021
6d73d00
Fix scenarios that no debt position exists
abitmore Aug 16, 2021
3834127
Implement BDSM update
abitmore Aug 16, 2021
1a77212
Fix code smells
abitmore Aug 17, 2021
ccf9e3f
Fix more code smells
abitmore Aug 17, 2021
6100550
Refactor asset_settle_evaluator::do_apply
abitmore Aug 17, 2021
7aa02cb
Disallow BDSM on PM
abitmore Aug 17, 2021
e998ddd
Refactor asset_settle_evaluator::do_apply
abitmore Aug 17, 2021
67dd8a1
Add database::find_least_collateralized_short()
abitmore Aug 17, 2021
d1b6bda
Update macos-11.0 to macos-11 for Github Actions
abitmore Aug 17, 2021
0684f3f
Fix a code smell, rename variables for readability
abitmore Aug 18, 2021
d9180f0
Refactor database::clear_expired_force_settlements
abitmore Aug 18, 2021
183b80f
Update coding style, fix code smells
abitmore Aug 18, 2021
f5c0fbf
Remove code that was commented out
abitmore Aug 18, 2021
f58a0cb
Add a comment
abitmore Aug 19, 2021
5dd32b2
Add GS price tests
abitmore Aug 19, 2021
b1db7e6
Undo unneeded changes in bsip48_75_tests wrt bdsm
abitmore Aug 22, 2021
5518907
Disallow non-UIA issuer permission bits on UIA
abitmore Aug 22, 2021
7b7eabe
Update logic about bdsm hf time in bsip48_75_tests
abitmore Aug 22, 2021
23b78d3
Disallow disable_bdsm_update permission bit on PM
abitmore Aug 22, 2021
3700800
Add some tests for BDSM
abitmore Aug 22, 2021
7baa8f5
Fix asset_settle when force settlement is disabled
abitmore Aug 22, 2021
23902a6
Add a comment
abitmore Aug 22, 2021
8bbe408
Fix uncapping of settlement price
abitmore Aug 22, 2021
151ba84
Slightly refactor clear_expired_force_settlements
abitmore Aug 22, 2021
8e9f3e4
Fix individual_settlement_to_fund black swan check
abitmore Aug 26, 2021
d035122
Rename BDSM to BSRM
abitmore Aug 26, 2021
fe65758
Fix apply_order and apply_force_settlement
abitmore Aug 27, 2021
3e42d21
Add tests about BSRM no_settlement
abitmore Aug 27, 2021
2d706d0
Fix match_force_settlements
abitmore Aug 27, 2021
4c5ac83
Call check_call_orders() in apply_order()
abitmore Aug 28, 2021
2244a21
Call check_call_orders in apply_force_settlements
abitmore Aug 28, 2021
565c73f
Fix tests about BSRM no_settlement
abitmore Aug 28, 2021
b8f7881
Fix check_call_orders() wrt no_settlement
abitmore Aug 28, 2021
b50b2f8
Fix no_settlement tests about feed update
abitmore Aug 28, 2021
3a7a6c0
Reduce number of params for db::match(limit,call)
abitmore Aug 29, 2021
d6b3d43
Reduce number of params for db::match(settle,call)
abitmore Aug 29, 2021
e7b1245
Simplify code
abitmore Aug 29, 2021
5415c03
Move check_for_blackswan from db_update to market
abitmore Aug 29, 2021
221cd45
Update order of members in database.hpp
abitmore Aug 29, 2021
caa70b0
Add no-settlement taker tests
abitmore Aug 31, 2021
b614a1a
Split bsrm_tests.cpp into multiple files
abitmore Sep 3, 2021
19c39fc
Fix rounding issue when matching limit with call
abitmore Sep 3, 2021
d8a96e0
Add no-settlement tests about small limit taker
abitmore Sep 3, 2021
64cbfd0
Fix rounding issue when matching settle with call
abitmore Sep 3, 2021
a432884
Add no-settlement tests about small settle taker
abitmore Sep 3, 2021
edd7382
Fix tests about matching call with settle
abitmore Sep 3, 2021
0443f54
Add tests about updating BSRM after GS
abitmore Sep 5, 2021
8f71eb2
Add BSRM update tests for indvd-settlement to fund
abitmore Sep 5, 2021
0e20704
Add BSRM update tests for indvd-settle to order
abitmore Sep 5, 2021
cdcc4d6
Add comments
abitmore Sep 5, 2021
d483ebb
Rename a function
abitmore Sep 5, 2021
fa7e7d7
Add tests about updating BSRM from no_settlement
abitmore Sep 5, 2021
7b82a6c
Simplify code
abitmore Sep 6, 2021
e1f5547
Refactor call_order_update_evaluator
abitmore Sep 6, 2021
fb90153
Allow closing debt position even if no price feed
abitmore Sep 6, 2021
ea5ffb8
Add tests about closing debt position when no feed
abitmore Sep 6, 2021
0a843b5
Remove Ubuntu 16 from Github Actions workflows
abitmore Sep 7, 2021
29e36f0
Update cache keys in Github Actions MinGW workflow
abitmore Sep 7, 2021
30c6441
Fix call_order_update issues about no_settlement
abitmore Sep 7, 2021
9866bb0
Fix no_settlement tests wrt call_order_update
abitmore Sep 7, 2021
245d44f
Fix tests about call_order_update partially fill
abitmore Sep 7, 2021
186a4b6
Fix code smells
abitmore Sep 7, 2021
e1a6ac5
Refactor call_order_update_evaluator::do_apply()
abitmore Sep 7, 2021
c699e53
Add call_order_update tests about no_settlement
abitmore Sep 10, 2021
6abdc1e
Add tests about manual GS for different BSRM types
abitmore Sep 10, 2021
cb00696
Update comments
abitmore Sep 10, 2021
1a8f51d
Update manual GS tests for different BSRM types
abitmore Sep 10, 2021
c0c7c57
Slightly refactor asset_global_settle_evaluator
abitmore Sep 10, 2021
a070eeb
Add tests for individual_settlement_to_order
abitmore Sep 12, 2021
5a5c0bc
Add tests about cancelling settle order on no call
abitmore Sep 15, 2021
7729a51
Add more tests about cancelling settle orders
abitmore Sep 15, 2021
3170106
Fix check_call_orders() : check limit orders again
abitmore Sep 16, 2021
2b38112
Add tests wrt matching call with settle then limit
abitmore Sep 16, 2021
9b2bfff
Remove an unused variable
abitmore Sep 17, 2021
c253f40
Check call orders after paid from individual fund
abitmore Sep 17, 2021
d357023
Add tests for individual settlement to order
abitmore Sep 18, 2021
7f9e15b
Fix code smells
abitmore Sep 18, 2021
21c93b4
Fix individual_settlement_to_fund
abitmore Sep 21, 2021
9cecdb5
Add tests for individual settlement to fund
abitmore Sep 21, 2021
9240fa7
Refactor database::check_call_orders()
abitmore Sep 22, 2021
8ec1e03
Add more tests about individual settlements
abitmore Sep 22, 2021
6390945
Add disable_force_settle tests for indvd settle
abitmore Sep 24, 2021
4dbaa30
Add taking tests for individual settlement to fund
abitmore Sep 24, 2021
f9446a7
Add tests about force-settling when no feed
abitmore Sep 24, 2021
270a506
Fix a comment in a test case
abitmore Sep 24, 2021
01bcfa5
Update a comment
abitmore Sep 27, 2021
d3da53f
Update comments
abitmore Sep 27, 2021
c38ad74
Slightly optimize check_for_blackswan() and etc
abitmore Sep 29, 2021
67d6624
Update comments
abitmore Sep 29, 2021
5ba086c
Add a comment
abitmore Sep 29, 2021
83411b4
Merge pull request #2499 from bitshares/pr-2467-partial-gs
abitmore Sep 29, 2021
ad734be
Shorten a variable name
abitmore Sep 30, 2021
0c3cc67
Change type of a variable to avoid precision loss
abitmore Sep 30, 2021
f971130
Fix code smells
abitmore Sep 30, 2021
6db0d53
Fix code smells
abitmore Sep 30, 2021
dc23d97
Fix code smells
abitmore Sep 30, 2021
13e8052
Fix code smells
abitmore Sep 30, 2021
02f2110
Fix code smells
abitmore Sep 30, 2021
a4cc1f2
Update macOS OpenSSL root dir for Github Actions
abitmore Sep 30, 2021
1abf545
Fix code smells
abitmore Oct 1, 2021
622a099
Fix code smells
abitmore Oct 1, 2021
45e687c
Fix code smells
abitmore Oct 1, 2021
aa2832b
Fix code smells
abitmore Oct 1, 2021
8632c78
Fix code smells
abitmore Oct 1, 2021
9b6bf01
Remove unneeded code
abitmore Oct 1, 2021
ce49c4f
Fix code smells
abitmore Oct 1, 2021
00f2d21
Fix code smells
abitmore Oct 1, 2021
7172c12
Merge pull request #2502 from bitshares/fix-code-smells
abitmore Oct 2, 2021
005b427
Allow MPA owner to disable collateral bidding
abitmore Oct 3, 2021
b3d2fe4
Update old tests for disable_collateral_bidding
abitmore Oct 4, 2021
9fc118f
Wrap long lines
abitmore Oct 4, 2021
ac61626
Fix asset issuer permissions check
abitmore Oct 4, 2021
3b57511
Add tests for disable_collateral_bidding
abitmore Oct 4, 2021
b252597
Merge pull request #2504 from bitshares/pr-2281-disable-collateral-bi…
abitmore Oct 5, 2021
9ba5846
Revive GSed bitassets based on ICR rather than MCR
abitmore Oct 6, 2021
58fb1aa
Add tests for ICR-based revival of GSed bitassets
abitmore Oct 6, 2021
94b3c23
Add comments
abitmore Oct 6, 2021
7382efd
Merge pull request #2505 from bitshares/pr-2290-gs-revive-by-icr
abitmore Oct 7, 2021
2c2e0ef
Allow updating bitasset options after GS ...
abitmore Oct 8, 2021
f291bcc
Remove outdated comments
abitmore Oct 8, 2021
042b9ca
Add tests about updating bitasset options after GS
abitmore Oct 8, 2021
1e9bea1
Merge pull request #2506 from bitshares/pr-2282-bitasset-update-after-gs
abitmore Oct 8, 2021
ac8a431
Update comments
abitmore Oct 10, 2021
cec1af2
Merge pull request #2507 from bitshares/update-comments
abitmore Oct 11, 2021
1a98d90
Fix code smells
abitmore Oct 13, 2021
e0ad2b6
Fix code smells
abitmore Oct 13, 2021
e3a09eb
Update variable names for better readability
abitmore Oct 13, 2021
88f0f4a
Fix code smells
abitmore Oct 13, 2021
8cfcd3a
Merge pull request #2510 from bitshares/fix-code-smells
abitmore Oct 14, 2021
5104217
Add conditions when accepting a credit offer
abitmore Oct 14, 2021
1e1ac0e
Add tests for conditions to accept credit offers
abitmore Oct 14, 2021
95aeabc
Add dependabot.yml for GitHub Actions
abitmore Oct 14, 2021
06821f8
Merge pull request #2511 from bitshares/update-credit-offer-accept
abitmore Oct 14, 2021
f613817
Merge pull request #2512 from bitshares/github-actions-dependabot
abitmore Oct 15, 2021
caf0beb
Add Github Action to build and push to Docker Hub
abitmore Oct 16, 2021
8910ffa
Merge pull request #2514 from bitshares/github-actions-docker-push
abitmore Oct 16, 2021
a9ab268
Fix liquidity pool history APIs
abitmore Oct 20, 2021
15cb7a2
Add more tests for liquidity pool history APIs
abitmore Oct 20, 2021
e0b3e97
Merge pull request #2517 from bitshares/fix-liquidity-pool-api
abitmore Oct 20, 2021
2dad82f
Merge pull request #2478 from bitshares/hardfork
abitmore Oct 24, 2021
7f2fbfc
Update sonar.branch.target in release branch
abitmore Oct 24, 2021
2cc0789
Merge pull request #2518 from bitshares/update-sonar-branch-target
abitmore Oct 25, 2021
6c84301
Merge testnet branch with release branch
abitmore Oct 25, 2021
47bb6f7
Update sonar.branch.target for testnet branch
abitmore Oct 25, 2021
41b131a
Set testnet 6.0 HF time to 2021-11-02 14:02:00 UTC
abitmore Oct 25, 2021
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
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "develop"
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build and test in macOS
strategy:
matrix:
os: [macos-10.15, macos-11.0]
os: [macos-10.15, macos-11]
runs-on: ${{ matrix.os }}
steps:
- name: Install dependencies
Expand All @@ -28,7 +28,7 @@ jobs:
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-D BOOST_ROOT=/usr/local/opt/boost@1.69 \
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 \
..
- name: Load Cache
uses: actions/cache@v2
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/build-and-test.ubuntu-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build and test in Debug mode
strategy:
matrix:
os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04 ]
os: [ ubuntu-18.04, ubuntu-20.04 ]
runs-on: ${{ matrix.os }}
services:
elasticsearch:
Expand Down Expand Up @@ -85,6 +85,8 @@ jobs:
df -h
make -j 2 -C _build chain_test
make -j 2 -C _build cli_test
make -j 2 -C _build app_test
make -j 2 -C _build es_test
make -j 2 -C _build cli_wallet
make -j 2 -C _build witness_node
make -j 2 -C _build
Expand All @@ -96,14 +98,19 @@ jobs:
run: |
_build/tests/app_test -l test_suite
df -h
rm -rf /tmp/graphene*
curl -XPUT -H "Content-Type: application/json" http://localhost:9200/_cluster/settings \
-d '{ "transient": { "cluster.routing.allocation.disk.threshold_enabled": false } }'
echo
_build/tests/es_test -l test_suite
df -h
rm -rf /tmp/graphene*
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
df -h
rm -rf /tmp/graphene*
_build/tests/cli_test -l test_suite
df -h
rm -rf /tmp/graphene*
- name: Quick test for program arguments
run: |
_build/programs/witness_node/witness_node --version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.ubuntu-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build and test in Release mode
strategy:
matrix:
os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04 ]
os: [ ubuntu-18.04, ubuntu-20.04 ]
runs-on: ${{ matrix.os }}
services:
elasticsearch:
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/build-and-test.win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ jobs:
name: Build required 3rd-party libraries
runs-on: ubuntu-latest
steps:
# Get OS version to be used in cache key - see https://github.com/actions/cache/issues/543
- run: |
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
- name: Load Cache
id: cache-libs
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: libs
key: mingw64-libs-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
- name: Install dependencies
if: steps.cache-libs.outputs.cache-hit != 'true'
run: |
Expand Down Expand Up @@ -113,11 +116,13 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- run: |
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
- name: Load external libraries
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: libs
key: mingw64-libs-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
- name: Configure
run: |
LIBS="`pwd`/libs"
Expand All @@ -138,13 +143,13 @@ jobs:
-D GRAPHENE_DISABLE_UNITY_BUILD=ON \
..
- name: Load Cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ccache
key: testnet-ccache-mingw64-${{ github.ref }}-${{ github.sha }}
key: testnet-ccache-mingw64-${{ env.OS_VERSION }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
testnet-ccache-mingw64-${{ github.ref }}-
testnet-ccache-mingw64-
testnet-ccache-mingw64-${{ env.OS_VERSION }}-${{ github.ref }}-
testnet-ccache-mingw64-${{ env.OS_VERSION }}-
- name: Build
run: |
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Build and push to DockerHub
on: [ push, pull_request ]
jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Inject slug/short environment variables
uses: rlespinasse/github-slug-action@v3.x
- name: Decide whether to push to DockerHub, and set tag
if: |
github.event_name == 'push' &&
( startsWith( github.ref, 'refs/tags/' ) ||
contains( fromJSON('["master","develop","testnet","hardfork"]'), env.GITHUB_REF_NAME ) )
run: |
if [[ "${GITHUB_REF_NAME}" == "master" ]] ; then
DOCKER_PUSH_TAG=latest
else
DOCKER_PUSH_TAG=${GITHUB_REF_NAME}
fi
echo "DOCKER_PUSH_TAG=${DOCKER_PUSH_TAG}"
echo "DOCKER_PUSH_TAG=${DOCKER_PUSH_TAG}" >> $GITHUB_ENV
- name: Test tag
if: env.DOCKER_PUSH_TAG != ''
run: echo "${DOCKER_PUSH_TAG}"
- name: Checkout
uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build only
uses: docker/build-push-action@v2
with:
context: .
load: true
- name: Login to DockerHub
if: env.DOCKER_PUSH_TAG != ''
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push to DockerHub
if: env.DOCKER_PUSH_TAG != ''
uses: docker/build-push-action@v2
with:
context: .
push: true
tags: bitshares/bitshares-core:${{ env.DOCKER_PUSH_TAG }}
65 changes: 47 additions & 18 deletions .github/workflows/sonar-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,19 @@ jobs:
-D Boost_USE_STATIC_LIBS=OFF \
..
popd
# Get OS version to be used in cache key - see https://github.com/actions/cache/issues/543
- run: |
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
- name: Load Cache
uses: actions/cache@v2
with:
path: |
ccache
sonar_cache
key: testnet-sonar-${{ github.ref }}-${{ github.sha }}
key: testnet-sonar-${{ env.OS_VERSION }}-${{ github.ref }}-${{ github.sha }}
restore-keys: |
testnet-sonar-${{ github.ref }}-
testnet-sonar-
testnet-sonar-${{ env.OS_VERSION }}-${{ github.ref }}-
testnet-sonar-${{ env.OS_VERSION }}-
- name: Build
run: |
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
Expand All @@ -114,21 +117,6 @@ jobs:
du -hs _build/libraries/* _build/programs/* _build/tests/*
du -hs _build/*
du -hs /_build/*
- name: Unit-Tests
run: |
_build/tests/app_test -l test_suite
df -h
curl -XPUT -H "Content-Type: application/json" http://localhost:9200/_cluster/settings \
-d '{ "transient": { "cluster.routing.allocation.disk.threshold_enabled": false } }'
echo
_build/tests/es_test -l test_suite
df -h
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
_build/tests/cli_test -l test_suite
df -h
echo "Cleanup"
rm -rf /tmp/graphene*
df -h
- name: Quick test for program arguments
run: |
_build/programs/witness_node/witness_node --version
Expand Down Expand Up @@ -156,6 +144,38 @@ jobs:
else \
echo "Pass: got expected error."; \
fi
- name: Remove binaries that we no longer need
run: |
df -h
echo "Cleanup"
rm -rf _build/programs/witness_node/witness_node
rm -rf _build/programs/cli_wallet/cli_wallet
rm -rf _build/programs/network_mapper/network_mapper
rm -rf _build/programs/js_operation_serializer/js_operation_serializer
rm -rf _build/programs/genesis_util/get_dev_key
df -h
- name: Unit-Tests
run: |
_build/tests/app_test -l test_suite
df -h
echo "Cleanup"
rm -rf /tmp/graphene*
curl -XPUT -H "Content-Type: application/json" http://localhost:9200/_cluster/settings \
-d '{ "transient": { "cluster.routing.allocation.disk.threshold_enabled": false } }'
echo
_build/tests/es_test -l test_suite
df -h
echo "Cleanup"
rm -rf /tmp/graphene*
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
df -h
echo "Cleanup"
rm -rf /tmp/graphene*
_build/tests/cli_test -l test_suite
df -h
echo "Cleanup"
rm -rf /tmp/graphene*
df -h
- name: Prepare for scanning with SonarScanner
run: |
mkdir -p sonar_cache
Expand Down Expand Up @@ -183,3 +203,12 @@ jobs:
run: |
sonar-scanner \
-Dsonar.login=${{ secrets.SONAR_TOKEN }}
- name: Cleanup
run: |
df -h
echo "Final cleanup"
rm -rf _build/tests/app_test
rm -rf _build/tests/chain_test
rm -rf _build/tests/cli_test
rm -rf _build/tests/es_test
df -h
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/baseimage:0.11
FROM phusion/baseimage:focal-1.0.0
MAINTAINER The bitshares decentralized organisation

ENV LANG=en_US.UTF-8
Expand Down
16 changes: 12 additions & 4 deletions libraries/app/api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ namespace graphene { namespace app {
const auto& idx = hist_idx.indices().get<by_pool_op_type_time>();
auto itr = start.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *operation_type, *start ) )
: idx.lower_bound( boost::make_tuple( pool_id, *operation_type ) );
auto itr_stop = stop.valid() ? idx.upper_bound( boost::make_tuple( pool_id, *operation_type, *stop ) )
auto itr_stop = stop.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *operation_type, *stop ) )
: idx.upper_bound( boost::make_tuple( pool_id, *operation_type ) );
while( itr != itr_stop && result.size() < limit )
{
Expand All @@ -599,7 +599,7 @@ namespace graphene { namespace app {
const auto& idx = hist_idx.indices().get<by_pool_time>();
auto itr = start.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *start ) )
: idx.lower_bound( pool_id );
auto itr_stop = stop.valid() ? idx.upper_bound( boost::make_tuple( pool_id, *stop ) )
auto itr_stop = stop.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *stop ) )
: idx.upper_bound( pool_id );
while( itr != itr_stop && result.size() < limit )
{
Expand Down Expand Up @@ -645,7 +645,11 @@ namespace graphene { namespace app {
const auto& idx_t = hist_idx.indices().get<by_pool_op_type_time>();
auto itr = start.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *operation_type, *start ) )
: idx.lower_bound( boost::make_tuple( pool_id, *operation_type ) );
auto itr_temp = stop.valid() ? idx_t.upper_bound( boost::make_tuple( pool_id, *operation_type, *stop ) )
if( itr == idx.end() || itr->pool != pool_id || itr->op_type != *operation_type ) // empty result
return result;
if( stop.valid() && itr->time <= *stop ) // empty result
return result;
auto itr_temp = stop.valid() ? idx_t.lower_bound( boost::make_tuple( pool_id, *operation_type, *stop ) )
: idx_t.upper_bound( boost::make_tuple( pool_id, *operation_type ) );
auto itr_stop = ( itr_temp == idx_t.end() ? idx.end() : idx.iterator_to( *itr_temp ) );
while( itr != itr_stop && result.size() < limit )
Expand All @@ -660,7 +664,11 @@ namespace graphene { namespace app {
const auto& idx_t = hist_idx.indices().get<by_pool_time>();
auto itr = start.valid() ? idx.lower_bound( boost::make_tuple( pool_id, *start ) )
: idx.lower_bound( pool_id );
auto itr_temp = stop.valid() ? idx_t.upper_bound( boost::make_tuple( pool_id, *stop ) )
if( itr == idx.end() || itr->pool != pool_id ) // empty result
return result;
if( stop.valid() && itr->time <= *stop ) // empty result
return result;
auto itr_temp = stop.valid() ? idx_t.lower_bound( boost::make_tuple( pool_id, *stop ) )
: idx_t.upper_bound( pool_id );
auto itr_stop = ( itr_temp == idx_t.end() ? idx.end() : idx.iterator_to( *itr_temp ) );
while( itr != itr_stop && result.size() < limit )
Expand Down
Loading