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 master branch #2813

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Merge release branch into master branch #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
77ef234
Update sonar-project.properties for develop branch
abitmore Oct 4, 2023
c5f71fc
Merge pull request #2789 from bitshares/release_to_develop
abitmore Oct 5, 2023
7343107
Merge pull request #2795 from bitshares/release
abitmore Dec 5, 2023
04cd941
Remove dead seed nodes
abitmore Feb 6, 2024
13cd4d2
Update zlib version from 1.3 to 1.3.1
abitmore Feb 6, 2024
5b40d04
Bump FC, fix macOS build
abitmore Feb 6, 2024
d3b3858
Merge pull request #2807 from bitshares/update-seeds
abitmore Feb 6, 2024
07bc5ff
fixed a typo in code
dotSlash-Adwitiya Jan 24, 2024
fe40983
Merge pull request #2805 from dotSlash-Adwitiya/patch-1
abitmore Feb 7, 2024
9ed758b
Update sonar.branch.target for release branch
abitmore Feb 7, 2024
dae97b2
Merge pull request #2808 from bitshares/develop-to-release
abitmore Feb 8, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
BOOST_DOTTED_VERSION: 1.69.0
CURL_VERSION: 8.4.0
OPENSSL_VERSION: 1.1.1w
ZLIB_VERSION: 1.3
ZLIB_VERSION: 1.3.1
jobs:
prepare-mingw64-libs:
name: Build required 3rd-party libraries
Expand Down
2 changes: 0 additions & 2 deletions libraries/egenesis/seed-nodes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@
"seed1.xbts.io:1776", // xbts.io (Germany)
"seed2.xbts.io:1776", // xbts.io (Germany)
"seed4.xbts.io:1776", // xbts.io (Germany)
"seed1.bitshares.im:1776", // clone (USA)
"seed2.bitshares.im:1776", // clone (Japan)
"seeds.btsnodes.com:1776", // Community
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 1 files
+1 −1 vendor/editline
4 changes: 2 additions & 2 deletions libraries/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,8 +1872,8 @@ blind_receipt wallet_api::receive_blind_transfer( const string& confirmation_rec
result.memo = opt_memo;

// confirm the amount matches the commitment (verify the blinding factor)
auto commtiment_test = fc::ecc::blind( memo.blinding_factor, memo.amount.amount.value );
FC_ASSERT( fc::ecc::verify_sum( {commtiment_test}, {memo.commitment}, 0 ) );
auto commitment_test = fc::ecc::blind( memo.blinding_factor, memo.amount.amount.value );
FC_ASSERT( fc::ecc::verify_sum( {commitment_test}, {memo.commitment}, 0 ) );

blind_balance bal;
bal.amount = memo.amount;
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sonar.organization=bitshares-on-github
sonar.projectKey=bitshares_bitshares-core
sonar.projectName=BitShares-Core
sonar.projectDescription=BitShares Blockchain node and command-line wallet
sonar.projectVersion=7.0.x
sonar.projectVersion=7.1.x

sonar.host.url=https://sonarcloud.io

Expand Down
Loading