Merge 'release' branch into update-testnet-seed

bitshares · Feb 8, 2024 · 4983e3b · 4983e3b
2 parents f8bbd6a + dae97b2
commit 4983e3b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml
@@ -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

diff --git a/libraries/egenesis/seed-nodes.txt b/libraries/egenesis/seed-nodes.txt
@@ -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
diff --git a/libraries/fc b/libraries/fc
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -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;

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -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