From 77ef234e91d498ff4f4c58335194b0ea4f497e87 Mon Sep 17 00:00:00 2001
From: abitmore <abitmore@users.noreply.github.com>
Date: Wed, 4 Oct 2023 13:52:58 +0000
Subject: [PATCH 1/6] Update sonar-project.properties for develop branch
---
sonar-project.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sonar-project.properties b/sonar-project.properties
index 77e8a510b..d2b5cb448 100644
--- 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
@@ -29,4 +29,4 @@ sonar.coverageReportPaths=coverage.xml
# Decide which tree the current build belongs to in SonarCloud.
# Managed by the `set_sonar_branch*` script(s) when building with CI.
-sonar.branch.target=master
+sonar.branch.target=develop
From 04cd941799e0b3d4860aecff7b19ebcc19601291 Mon Sep 17 00:00:00 2001
From: Abit <abitmore@users.noreply.github.com>
Date: Tue, 6 Feb 2024 12:49:01 +0100
Subject: [PATCH 2/6] Remove dead seed nodes
---
libraries/egenesis/seed-nodes.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/libraries/egenesis/seed-nodes.txt b/libraries/egenesis/seed-nodes.txt
index e8f953708..1ac4176af 100644
--- 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
From 13cd4d297beeae6c279ec92b504a41254d47716e Mon Sep 17 00:00:00 2001
From: Abit <abitmore@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:42:33 +0100
Subject: [PATCH 3/6] Update zlib version from 1.3 to 1.3.1
---
.github/workflows/build-and-test.win.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml
index 1b44f6d57..ed5bef19d 100644
--- 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
From 5b40d040094e30d926eac0f777da713354ba6090 Mon Sep 17 00:00:00 2001
From: abitmore <abitmore@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:13:42 +0000
Subject: [PATCH 4/6] Bump FC, fix macOS build
---
libraries/fc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libraries/fc b/libraries/fc
index 3ea07ea3e..fe9f7e142 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 3ea07ea3e201bcfbf6665c300a50e0f9e2a8b2d3
+Subproject commit fe9f7e1420c9e503f01d7110b965c8e0f4429fd4
From 07bc5ff224c495f66ca3378cd3d6084c3b065567 Mon Sep 17 00:00:00 2001
From: Adwitiya Mourya <95630928+dotSlash-Adwitiya@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:53:04 +0530
Subject: [PATCH 5/6] fixed a typo in code
---
libraries/wallet/wallet.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index 616ee54b6..fad21a091 100644
--- 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;
From 9ed758bb9c50e9fdb1267b3eb7c01d9a36500a15 Mon Sep 17 00:00:00 2001
From: abitmore <abitmore@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:46:40 +0000
Subject: [PATCH 6/6] Update sonar.branch.target for release branch
---
sonar-project.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sonar-project.properties b/sonar-project.properties
index d2b5cb448..918a41f2f 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -29,4 +29,4 @@ sonar.coverageReportPaths=coverage.xml
# Decide which tree the current build belongs to in SonarCloud.
# Managed by the `set_sonar_branch*` script(s) when building with CI.
-sonar.branch.target=develop
+sonar.branch.target=master