Skip to content

Commit

Permalink
Merge 'release' branch into update-testnet-seed
Browse files Browse the repository at this point in the history
  • Loading branch information
abitmore committed Feb 8, 2024
2 parents f8bbd6a + dae97b2 commit 4983e3b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.win.yml
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
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
Submodule fc updated 1 files
+1 −1 vendor/editline
4 changes: 2 additions & 2 deletions libraries/wallet/wallet.cpp
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
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

0 comments on commit 4983e3b

Please sign in to comment.