From 9e86c91a68f823e88592275e46c0169a28177791 Mon Sep 17 00:00:00 2001 From: quantumagi Date: Thu, 26 Aug 2021 17:01:04 +1000 Subject: [PATCH 1/4] CirrusMain checkpoint 2_827_550 (#680) --- src/Stratis.Sidechains.Networks/CirrusMain.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Stratis.Sidechains.Networks/CirrusMain.cs b/src/Stratis.Sidechains.Networks/CirrusMain.cs index 813ca8bb01..1305f7c9e7 100644 --- a/src/Stratis.Sidechains.Networks/CirrusMain.cs +++ b/src/Stratis.Sidechains.Networks/CirrusMain.cs @@ -263,6 +263,8 @@ public CirrusMain() { 1_750_000, new CheckpointInfo(new uint256("0x58c96a878efeeffea1b1924b61eed627687900e01588ffaa2f4a161973f01abf")) }, { 1_850_000, new CheckpointInfo(new uint256("0x6e2590bd9a8eaab25b236c0c9ac314abec70b18aa053b96c9257f2356dec8314")) }, { 2_150_000, new CheckpointInfo(new uint256("0x4c65f29b5098479cab275afd77d302ebe5ed8d8ef33e02ae54bf185865763f18")) }, + { 2_500_000, new CheckpointInfo(new uint256("0x2853be7b7224840d3d4b60427ea832e9bd67d8fc6bfcd4956b8c6b2414cf8fc2")) }, + { 2_827_550, new CheckpointInfo(new uint256("0xcf0ebdd99ec04ef260d22befe70ef7b948e50b5fcc18d9d37376d49e872372a0")) } }; this.DNSSeeds = new List From b560e204e683a30c0474abbb0a6af8789e9c773e Mon Sep 17 00:00:00 2001 From: Francois de la Rouviere Date: Thu, 26 Aug 2021 10:39:27 +0100 Subject: [PATCH 2/4] Merge Release/1.0.9.4 to master (#675) * Better collateral address checking (#670) * Bump Version to 1.0.9.3 * Add collateral address check to GetModifiedFederation (#671) * Remove logging from federation build logic * Update all versions to 1.0.9.3 * Add null check in IdleMemberKicker (#673) * Add null check in IdleMemberKicker * Update IdleFederationMembersKicker.cs * Bump version * Update all project versions to 1.0.9.4 * Bump SC versions --- src/FederationSetup/FederationSetup.csproj | 2 +- src/FodyNlogAdapter/FodyNlogAdapter.csproj | 2 +- src/NBitcoin/NBitcoin.csproj | 2 +- src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj | 2 +- .../Stratis.Bitcoin.Features.Api.csproj | 2 +- .../Stratis.Bitcoin.Features.BlockStore.csproj | 2 +- .../Stratis.Bitcoin.Features.ColdStaking.csproj | 2 +- .../Stratis.Bitcoin.Features.Consensus.csproj | 2 +- .../Stratis.Bitcoin.Features.Dns.csproj | 2 +- .../Stratis.Bitcoin.Features.Interop.csproj | 2 +- .../Stratis.Bitcoin.Features.LightWallet.csproj | 2 +- .../Stratis.Bitcoin.Features.MemoryPool.csproj | 2 +- .../Stratis.Bitcoin.Features.Miner.csproj | 2 +- .../Stratis.Bitcoin.Features.Notifications.csproj | 2 +- ...coin.Features.PoA.IntegrationTests.Common.csproj | 2 +- .../FederationManager.cs | 13 +++++++------ .../Stratis.Bitcoin.Features.PoA.csproj | 2 +- .../Voting/JoinFederationRequestService.cs | 2 +- .../Voting/VotingManager.cs | 4 ++-- .../Stratis.Bitcoin.Features.RPC.csproj | 2 +- .../Stratis.Bitcoin.Features.SignalR.csproj | 2 +- .../Stratis.Bitcoin.Features.SmartContracts.csproj | 2 +- .../Stratis.Bitcoin.Features.Wallet.csproj | 2 +- .../Stratis.Bitcoin.Features.WatchOnlyWallet.csproj | 2 +- .../Stratis.Bitcoin.IntegrationTests.Common.csproj | 2 +- .../Stratis.Bitcoin.Networks.csproj | 6 +++--- .../Stratis.Bitcoin.Tests.Common.csproj | 2 +- src/Stratis.Bitcoin/Properties/AssemblyInfo.cs | 4 ++-- src/Stratis.Bitcoin/Stratis.Bitcoin.csproj | 2 +- src/Stratis.CirrusD/Stratis.CirrusD.csproj | 2 +- src/Stratis.CirrusDnsD/Stratis.CirrusDnsD.csproj | 2 +- .../Stratis.CirrusMinerD.csproj | 2 +- src/Stratis.CirrusPegD/Stratis.CirrusPegD.csproj | 2 +- .../Stratis.Features.Collateral.csproj | 2 +- .../Stratis.Features.Diagnostic.csproj | 2 +- .../Stratis.Features.FederatedPeg.csproj | 2 +- .../Stratis.Features.SQLiteWalletRepository.csproj | 2 +- .../Stratis.Sidechains.Networks.csproj | 2 +- .../Stratis.SmartContracts.Core.csproj | 2 +- .../Stratis.SmartContracts.Networks.csproj | 2 +- src/Stratis.StraxD/Stratis.StraxD.csproj | 2 +- src/Stratis.StraxDnsD/Stratis.StraxDnsD.csproj | 2 +- 42 files changed, 52 insertions(+), 51 deletions(-) diff --git a/src/FederationSetup/FederationSetup.csproj b/src/FederationSetup/FederationSetup.csproj index f791a5725b..8a99449676 100644 --- a/src/FederationSetup/FederationSetup.csproj +++ b/src/FederationSetup/FederationSetup.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. diff --git a/src/FodyNlogAdapter/FodyNlogAdapter.csproj b/src/FodyNlogAdapter/FodyNlogAdapter.csproj index e50dc34b42..c170873a76 100644 --- a/src/FodyNlogAdapter/FodyNlogAdapter.csproj +++ b/src/FodyNlogAdapter/FodyNlogAdapter.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 FodyNlogAdapter - 1.0.7.0 + 1.0.9.4 False Stratis Group Ltd. Stratis.Utils.FodyNlogAdapter diff --git a/src/NBitcoin/NBitcoin.csproj b/src/NBitcoin/NBitcoin.csproj index 360631cae1..c4bf23121a 100644 --- a/src/NBitcoin/NBitcoin.csproj +++ b/src/NBitcoin/NBitcoin.csproj @@ -7,7 +7,7 @@ - 4.0.0.81 + 4.0.0.82 diff --git a/src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj b/src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj index 9ba09316bd..0a98506414 100644 --- a/src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj +++ b/src/Stratis.Bitcoin.Cli/Stratis.Bitcoin.Cli.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Api/Stratis.Bitcoin.Features.Api.csproj b/src/Stratis.Bitcoin.Features.Api/Stratis.Bitcoin.Features.Api.csproj index f55ffab7f4..4298c8014f 100644 --- a/src/Stratis.Bitcoin.Features.Api/Stratis.Bitcoin.Features.Api.csproj +++ b/src/Stratis.Bitcoin.Features.Api/Stratis.Bitcoin.Features.Api.csproj @@ -6,7 +6,7 @@ Stratis.Bitcoin.Features.Api Library Stratis.Features.Api - 1.0.9.0 + 1.0.9.4 False library diff --git a/src/Stratis.Bitcoin.Features.BlockStore/Stratis.Bitcoin.Features.BlockStore.csproj b/src/Stratis.Bitcoin.Features.BlockStore/Stratis.Bitcoin.Features.BlockStore.csproj index 7d390aaee7..24b4fbb6d0 100644 --- a/src/Stratis.Bitcoin.Features.BlockStore/Stratis.Bitcoin.Features.BlockStore.csproj +++ b/src/Stratis.Bitcoin.Features.BlockStore/Stratis.Bitcoin.Features.BlockStore.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.ColdStaking/Stratis.Bitcoin.Features.ColdStaking.csproj b/src/Stratis.Bitcoin.Features.ColdStaking/Stratis.Bitcoin.Features.ColdStaking.csproj index 6211506257..d3fda23724 100644 --- a/src/Stratis.Bitcoin.Features.ColdStaking/Stratis.Bitcoin.Features.ColdStaking.csproj +++ b/src/Stratis.Bitcoin.Features.ColdStaking/Stratis.Bitcoin.Features.ColdStaking.csproj @@ -7,7 +7,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj b/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj index 4855707279..add8119808 100644 --- a/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj +++ b/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Dns/Stratis.Bitcoin.Features.Dns.csproj b/src/Stratis.Bitcoin.Features.Dns/Stratis.Bitcoin.Features.Dns.csproj index fd7dd4ba85..e9375679cd 100644 --- a/src/Stratis.Bitcoin.Features.Dns/Stratis.Bitcoin.Features.Dns.csproj +++ b/src/Stratis.Bitcoin.Features.Dns/Stratis.Bitcoin.Features.Dns.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Interop/Stratis.Bitcoin.Features.Interop.csproj b/src/Stratis.Bitcoin.Features.Interop/Stratis.Bitcoin.Features.Interop.csproj index eafcd307fd..4ef4ac7ca1 100644 --- a/src/Stratis.Bitcoin.Features.Interop/Stratis.Bitcoin.Features.Interop.csproj +++ b/src/Stratis.Bitcoin.Features.Interop/Stratis.Bitcoin.Features.Interop.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 1.0.9.0 + 1.0.9.4 Stratis Group Ltd. Stratis.Features.Interop Stratis.Features.Interop diff --git a/src/Stratis.Bitcoin.Features.LightWallet/Stratis.Bitcoin.Features.LightWallet.csproj b/src/Stratis.Bitcoin.Features.LightWallet/Stratis.Bitcoin.Features.LightWallet.csproj index fbb223252f..d2fd1a4780 100644 --- a/src/Stratis.Bitcoin.Features.LightWallet/Stratis.Bitcoin.Features.LightWallet.csproj +++ b/src/Stratis.Bitcoin.Features.LightWallet/Stratis.Bitcoin.Features.LightWallet.csproj @@ -7,7 +7,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.MemoryPool/Stratis.Bitcoin.Features.MemoryPool.csproj b/src/Stratis.Bitcoin.Features.MemoryPool/Stratis.Bitcoin.Features.MemoryPool.csproj index a6f014b9b8..1a63662b19 100644 --- a/src/Stratis.Bitcoin.Features.MemoryPool/Stratis.Bitcoin.Features.MemoryPool.csproj +++ b/src/Stratis.Bitcoin.Features.MemoryPool/Stratis.Bitcoin.Features.MemoryPool.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False library Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Miner/Stratis.Bitcoin.Features.Miner.csproj b/src/Stratis.Bitcoin.Features.Miner/Stratis.Bitcoin.Features.Miner.csproj index 6910530703..9cf61ff269 100644 --- a/src/Stratis.Bitcoin.Features.Miner/Stratis.Bitcoin.Features.Miner.csproj +++ b/src/Stratis.Bitcoin.Features.Miner/Stratis.Bitcoin.Features.Miner.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.Notifications/Stratis.Bitcoin.Features.Notifications.csproj b/src/Stratis.Bitcoin.Features.Notifications/Stratis.Bitcoin.Features.Notifications.csproj index 0d7c6d5814..8798669ae1 100644 --- a/src/Stratis.Bitcoin.Features.Notifications/Stratis.Bitcoin.Features.Notifications.csproj +++ b/src/Stratis.Bitcoin.Features.Notifications/Stratis.Bitcoin.Features.Notifications.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common.csproj b/src/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common.csproj index 23c484f5c9..fe9320f91b 100644 --- a/src/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common.csproj +++ b/src/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common.csproj @@ -13,7 +13,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False diff --git a/src/Stratis.Bitcoin.Features.PoA/FederationManager.cs b/src/Stratis.Bitcoin.Features.PoA/FederationManager.cs index d24a5373b0..15ceff2295 100644 --- a/src/Stratis.Bitcoin.Features.PoA/FederationManager.cs +++ b/src/Stratis.Bitcoin.Features.PoA/FederationManager.cs @@ -291,9 +291,12 @@ private void AddFederationMemberLocked(IFederationMember federationMember) { if (federationMember is CollateralFederationMember collateralFederationMember) { - if (this.federationMembers.IsCollateralAddressRegistered(this.logger, collateralFederationMember.CollateralMainchainAddress)) + if (this.federationMembers.IsCollateralAddressRegistered(collateralFederationMember.CollateralMainchainAddress)) + { + this.logger.Warn($"Federation member with address '{collateralFederationMember.CollateralMainchainAddress}' already exists."); return; - + } + if (this.federationMembers.Contains(federationMember)) { this.logger.Trace("(-)[ALREADY_EXISTS]"); @@ -379,15 +382,13 @@ public static class FederationExtensions /// Checks to see if a particular collateral address is already present in the current set of /// federation members. /// + /// The list of federation members to check against. /// The collateral address to verify. /// true if present, false otherwise. - public static bool IsCollateralAddressRegistered(this List federationMembers, ILogger logger, string collateralAddress) + public static bool IsCollateralAddressRegistered(this List federationMembers, string collateralAddress) { if (federationMembers.Cast().Any(x => x.CollateralMainchainAddress == collateralAddress)) - { - logger.Warn($"Federation member with address '{collateralAddress}' already exists."); return true; - } return false; } diff --git a/src/Stratis.Bitcoin.Features.PoA/Stratis.Bitcoin.Features.PoA.csproj b/src/Stratis.Bitcoin.Features.PoA/Stratis.Bitcoin.Features.PoA.csproj index c7ae1b8ef9..c1f1506f2b 100644 --- a/src/Stratis.Bitcoin.Features.PoA/Stratis.Bitcoin.Features.PoA.csproj +++ b/src/Stratis.Bitcoin.Features.PoA/Stratis.Bitcoin.Features.PoA.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.PoA/Voting/JoinFederationRequestService.cs b/src/Stratis.Bitcoin.Features.PoA/Voting/JoinFederationRequestService.cs index 9a21fd329e..f638d6e3eb 100644 --- a/src/Stratis.Bitcoin.Features.PoA/Voting/JoinFederationRequestService.cs +++ b/src/Stratis.Bitcoin.Features.PoA/Voting/JoinFederationRequestService.cs @@ -49,7 +49,7 @@ public JoinFederationRequestService(ICounterChainSettings counterChainSettings, public async Task JoinFederationAsync(JoinFederationRequestModel request, CancellationToken cancellationToken) { // First ensure that this collateral address isnt already present in the federation. - if (this.federationManager.GetFederationMembers().IsCollateralAddressRegistered(this.logger, request.CollateralAddress)) + if (this.federationManager.GetFederationMembers().IsCollateralAddressRegistered(request.CollateralAddress)) throw new Exception($"The provided collateral address '{request.CollateralAddress}' is already present in the federation."); // Get the address pub key hash. diff --git a/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManager.cs b/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManager.cs index a8e4dc9612..c13f40eb65 100644 --- a/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManager.cs +++ b/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManager.cs @@ -342,7 +342,7 @@ public List GetFederationFromExecutedPolls() if (poll.VotingData.Key == VoteKey.AddFederationMember) { - if (federationMember is CollateralFederationMember collateralFederationMember && !federationMembers.IsCollateralAddressRegistered(this.logger, collateralFederationMember.CollateralMainchainAddress)) + if (federationMember is CollateralFederationMember collateralFederationMember && !federationMembers.IsCollateralAddressRegistered(collateralFederationMember.CollateralMainchainAddress)) federationMembers.Add(federationMember); } else if (poll.VotingData.Key == VoteKey.KickFederationMember) @@ -375,7 +375,7 @@ public List GetModifiedFederation(ChainedHeader chainedHeader // Addition/removal. if (poll.VotingData.Key == VoteKey.AddFederationMember) { - if (federationMember is CollateralFederationMember collateralFederationMember && !modifiedFederation.IsCollateralAddressRegistered(this.logger, collateralFederationMember.CollateralMainchainAddress)) + if (federationMember is CollateralFederationMember collateralFederationMember && !modifiedFederation.IsCollateralAddressRegistered(collateralFederationMember.CollateralMainchainAddress)) modifiedFederation.Add(federationMember); } else if (poll.VotingData.Key == VoteKey.KickFederationMember) diff --git a/src/Stratis.Bitcoin.Features.RPC/Stratis.Bitcoin.Features.RPC.csproj b/src/Stratis.Bitcoin.Features.RPC/Stratis.Bitcoin.Features.RPC.csproj index 39a5af5470..cca62d77b4 100644 --- a/src/Stratis.Bitcoin.Features.RPC/Stratis.Bitcoin.Features.RPC.csproj +++ b/src/Stratis.Bitcoin.Features.RPC/Stratis.Bitcoin.Features.RPC.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.SignalR/Stratis.Bitcoin.Features.SignalR.csproj b/src/Stratis.Bitcoin.Features.SignalR/Stratis.Bitcoin.Features.SignalR.csproj index ca4179f18f..6ae3104a4a 100644 --- a/src/Stratis.Bitcoin.Features.SignalR/Stratis.Bitcoin.Features.SignalR.csproj +++ b/src/Stratis.Bitcoin.Features.SignalR/Stratis.Bitcoin.Features.SignalR.csproj @@ -1,7 +1,7 @@  netcoreapp3.1 - 1.0.9.0 + 1.0.9.4 Stratis.Features.SignalR Stratis.Features.SignalR Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.SmartContracts/Stratis.Bitcoin.Features.SmartContracts.csproj b/src/Stratis.Bitcoin.Features.SmartContracts/Stratis.Bitcoin.Features.SmartContracts.csproj index 5df6fc35f1..1f5434f3c1 100644 --- a/src/Stratis.Bitcoin.Features.SmartContracts/Stratis.Bitcoin.Features.SmartContracts.csproj +++ b/src/Stratis.Bitcoin.Features.SmartContracts/Stratis.Bitcoin.Features.SmartContracts.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 1.0.9.0 + 1.0.9.4 Stratis Group Ltd. Stratis.Features.SmartContracts Stratis.Features.SmartContracts diff --git a/src/Stratis.Bitcoin.Features.Wallet/Stratis.Bitcoin.Features.Wallet.csproj b/src/Stratis.Bitcoin.Features.Wallet/Stratis.Bitcoin.Features.Wallet.csproj index 8ed6295963..b692f5ccb0 100644 --- a/src/Stratis.Bitcoin.Features.Wallet/Stratis.Bitcoin.Features.Wallet.csproj +++ b/src/Stratis.Bitcoin.Features.Wallet/Stratis.Bitcoin.Features.Wallet.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Features.WatchOnlyWallet/Stratis.Bitcoin.Features.WatchOnlyWallet.csproj b/src/Stratis.Bitcoin.Features.WatchOnlyWallet/Stratis.Bitcoin.Features.WatchOnlyWallet.csproj index 5fba3ca6fd..3aa77791f8 100644 --- a/src/Stratis.Bitcoin.Features.WatchOnlyWallet/Stratis.Bitcoin.Features.WatchOnlyWallet.csproj +++ b/src/Stratis.Bitcoin.Features.WatchOnlyWallet/Stratis.Bitcoin.Features.WatchOnlyWallet.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.IntegrationTests.Common/Stratis.Bitcoin.IntegrationTests.Common.csproj b/src/Stratis.Bitcoin.IntegrationTests.Common/Stratis.Bitcoin.IntegrationTests.Common.csproj index 23bdded8d1..6ab2b824c4 100644 --- a/src/Stratis.Bitcoin.IntegrationTests.Common/Stratis.Bitcoin.IntegrationTests.Common.csproj +++ b/src/Stratis.Bitcoin.IntegrationTests.Common/Stratis.Bitcoin.IntegrationTests.Common.csproj @@ -13,7 +13,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False diff --git a/src/Stratis.Bitcoin.Networks/Stratis.Bitcoin.Networks.csproj b/src/Stratis.Bitcoin.Networks/Stratis.Bitcoin.Networks.csproj index 4aa33c68f8..d997a6b287 100644 --- a/src/Stratis.Bitcoin.Networks/Stratis.Bitcoin.Networks.csproj +++ b/src/Stratis.Bitcoin.Networks/Stratis.Bitcoin.Networks.csproj @@ -14,9 +14,9 @@ false false false - 1.0.7.0 - 1.0.7.0 - 1.0.9.0 + 1.0.9.4 + 1.0.9.4 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Bitcoin.Tests.Common/Stratis.Bitcoin.Tests.Common.csproj b/src/Stratis.Bitcoin.Tests.Common/Stratis.Bitcoin.Tests.Common.csproj index 5171db905b..b68c03a998 100644 --- a/src/Stratis.Bitcoin.Tests.Common/Stratis.Bitcoin.Tests.Common.csproj +++ b/src/Stratis.Bitcoin.Tests.Common/Stratis.Bitcoin.Tests.Common.csproj @@ -13,7 +13,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False diff --git a/src/Stratis.Bitcoin/Properties/AssemblyInfo.cs b/src/Stratis.Bitcoin/Properties/AssemblyInfo.cs index 8f16ed57d3..29221d9419 100644 --- a/src/Stratis.Bitcoin/Properties/AssemblyInfo.cs +++ b/src/Stratis.Bitcoin/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.9.2")] -[assembly: AssemblyFileVersion("1.0.9.2")] +[assembly: AssemblyVersion("1.0.9.4")] +[assembly: AssemblyFileVersion("1.0.9.4")] [assembly: InternalsVisibleTo("Stratis.Bitcoin.Tests")] \ No newline at end of file diff --git a/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj b/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj index 868ec35e0d..959ba38c65 100644 --- a/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj +++ b/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.2 + 1.0.9.4 False ..\Stratis.ruleset Stratis Group Ltd. diff --git a/src/Stratis.CirrusD/Stratis.CirrusD.csproj b/src/Stratis.CirrusD/Stratis.CirrusD.csproj index 3f635ff87c..d2a861dd90 100644 --- a/src/Stratis.CirrusD/Stratis.CirrusD.csproj +++ b/src/Stratis.CirrusD/Stratis.CirrusD.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. Stratis Group Ltd. diff --git a/src/Stratis.CirrusDnsD/Stratis.CirrusDnsD.csproj b/src/Stratis.CirrusDnsD/Stratis.CirrusDnsD.csproj index dc3e303e15..3ac3f4b76c 100644 --- a/src/Stratis.CirrusDnsD/Stratis.CirrusDnsD.csproj +++ b/src/Stratis.CirrusDnsD/Stratis.CirrusDnsD.csproj @@ -17,7 +17,7 @@ latest Stratis Group Ltd. - 1.0.7.0 + 1.0.9.4 diff --git a/src/Stratis.CirrusMinerD/Stratis.CirrusMinerD.csproj b/src/Stratis.CirrusMinerD/Stratis.CirrusMinerD.csproj index 2ebf1f5fba..e3aba576fb 100644 --- a/src/Stratis.CirrusMinerD/Stratis.CirrusMinerD.csproj +++ b/src/Stratis.CirrusMinerD/Stratis.CirrusMinerD.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. Stratis Group Ltd. diff --git a/src/Stratis.CirrusPegD/Stratis.CirrusPegD.csproj b/src/Stratis.CirrusPegD/Stratis.CirrusPegD.csproj index c22f630cf0..c2f65685d1 100644 --- a/src/Stratis.CirrusPegD/Stratis.CirrusPegD.csproj +++ b/src/Stratis.CirrusPegD/Stratis.CirrusPegD.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. diff --git a/src/Stratis.Features.Collateral/Stratis.Features.Collateral.csproj b/src/Stratis.Features.Collateral/Stratis.Features.Collateral.csproj index 7fbfe851c0..cccf336b86 100644 --- a/src/Stratis.Features.Collateral/Stratis.Features.Collateral.csproj +++ b/src/Stratis.Features.Collateral/Stratis.Features.Collateral.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 4.0.1.0 + 4.0.3.0 Stratis Group Ltd. diff --git a/src/Stratis.Features.Diagnostic/Stratis.Features.Diagnostic.csproj b/src/Stratis.Features.Diagnostic/Stratis.Features.Diagnostic.csproj index 712e7fda46..17500a3c5e 100644 --- a/src/Stratis.Features.Diagnostic/Stratis.Features.Diagnostic.csproj +++ b/src/Stratis.Features.Diagnostic/Stratis.Features.Diagnostic.csproj @@ -4,7 +4,7 @@ netcoreapp3.1 ..\None.ruleset true - 1.0.9.0 + 1.0.9.4 Stratis Group Ltd. diff --git a/src/Stratis.Features.FederatedPeg/Stratis.Features.FederatedPeg.csproj b/src/Stratis.Features.FederatedPeg/Stratis.Features.FederatedPeg.csproj index 0533d830c7..b90904fa2d 100644 --- a/src/Stratis.Features.FederatedPeg/Stratis.Features.FederatedPeg.csproj +++ b/src/Stratis.Features.FederatedPeg/Stratis.Features.FederatedPeg.csproj @@ -12,7 +12,7 @@ Full ..\None.ruleset Stratis Group Ltd. - 4.0.1.0 + 4.0.3.0 diff --git a/src/Stratis.Features.SQLiteWalletRepository/Stratis.Features.SQLiteWalletRepository.csproj b/src/Stratis.Features.SQLiteWalletRepository/Stratis.Features.SQLiteWalletRepository.csproj index f4bd0541e8..b601030dcb 100644 --- a/src/Stratis.Features.SQLiteWalletRepository/Stratis.Features.SQLiteWalletRepository.csproj +++ b/src/Stratis.Features.SQLiteWalletRepository/Stratis.Features.SQLiteWalletRepository.csproj @@ -14,7 +14,7 @@ false false false - 1.0.9.0 + 1.0.9.4 False Stratis Group Ltd. diff --git a/src/Stratis.Sidechains.Networks/Stratis.Sidechains.Networks.csproj b/src/Stratis.Sidechains.Networks/Stratis.Sidechains.Networks.csproj index 7e5174018a..f9b17507f8 100644 --- a/src/Stratis.Sidechains.Networks/Stratis.Sidechains.Networks.csproj +++ b/src/Stratis.Sidechains.Networks/Stratis.Sidechains.Networks.csproj @@ -5,7 +5,7 @@ Full ..\None.ruleset - 1.0.9.0 + 1.0.9.4 Stratis Group Ltd. Stratis.Sidechains.Networks diff --git a/src/Stratis.SmartContracts.Core/Stratis.SmartContracts.Core.csproj b/src/Stratis.SmartContracts.Core/Stratis.SmartContracts.Core.csproj index c29d7cef28..0f9b5ea440 100644 --- a/src/Stratis.SmartContracts.Core/Stratis.SmartContracts.Core.csproj +++ b/src/Stratis.SmartContracts.Core/Stratis.SmartContracts.Core.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 - 2.0.1.0 + 2.0.3.0 Stratis Group Ltd. Stratis Group Ltd. diff --git a/src/Stratis.SmartContracts.Networks/Stratis.SmartContracts.Networks.csproj b/src/Stratis.SmartContracts.Networks/Stratis.SmartContracts.Networks.csproj index 3ec5aaaf66..fcdff29339 100644 --- a/src/Stratis.SmartContracts.Networks/Stratis.SmartContracts.Networks.csproj +++ b/src/Stratis.SmartContracts.Networks/Stratis.SmartContracts.Networks.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 - 2.0.1.0 + 2.0.3.0 Stratis Group Ltd. diff --git a/src/Stratis.StraxD/Stratis.StraxD.csproj b/src/Stratis.StraxD/Stratis.StraxD.csproj index 73f9d1e1ec..0dad1d8c76 100644 --- a/src/Stratis.StraxD/Stratis.StraxD.csproj +++ b/src/Stratis.StraxD/Stratis.StraxD.csproj @@ -16,7 +16,7 @@ latest - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. diff --git a/src/Stratis.StraxDnsD/Stratis.StraxDnsD.csproj b/src/Stratis.StraxDnsD/Stratis.StraxDnsD.csproj index 65be90c391..b7c838e980 100644 --- a/src/Stratis.StraxDnsD/Stratis.StraxDnsD.csproj +++ b/src/Stratis.StraxDnsD/Stratis.StraxDnsD.csproj @@ -16,7 +16,7 @@ latest - 1.0.7.0 + 1.0.9.4 Stratis Group Ltd. From eeb4aaecd692fe9fe16e1e220095d03821532564 Mon Sep 17 00:00:00 2001 From: Francois de la Rouviere Date: Thu, 26 Aug 2021 14:58:58 +0100 Subject: [PATCH 3/4] Merge Disable signature rule in IBD #579 from release/1.1.0.0 (#684) * Update PoAHeaderSignatureRule.cs * Fix Build --- .../PoAHeaderSignatureRule.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Stratis.Bitcoin.Features.PoA/BasePoAFeatureConsensusRules/PoAHeaderSignatureRule.cs b/src/Stratis.Bitcoin.Features.PoA/BasePoAFeatureConsensusRules/PoAHeaderSignatureRule.cs index 463120c42d..426b478839 100644 --- a/src/Stratis.Bitcoin.Features.PoA/BasePoAFeatureConsensusRules/PoAHeaderSignatureRule.cs +++ b/src/Stratis.Bitcoin.Features.PoA/BasePoAFeatureConsensusRules/PoAHeaderSignatureRule.cs @@ -1,10 +1,13 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using NBitcoin; using Stratis.Bitcoin.Base; using Stratis.Bitcoin.Consensus; using Stratis.Bitcoin.Consensus.Rules; +using Stratis.Bitcoin.Utilities; namespace Stratis.Bitcoin.Features.PoA.BasePoAFeatureConsensusRules { @@ -26,6 +29,8 @@ public class PoAHeaderSignatureRule : FullValidationConsensusRule private Network network; + private HashHeightPair lastCheckPoint; + /// public override void Initialize() { @@ -41,10 +46,17 @@ public override void Initialize() this.network = this.Parent.Network; this.maxReorg = this.network.Consensus.MaxReorgLength; + + KeyValuePair lastCheckPoint = engine.Network.Checkpoints.LastOrDefault(); + this.lastCheckPoint = (lastCheckPoint.Value != null) ? new HashHeightPair(lastCheckPoint.Value.Hash, lastCheckPoint.Key) : null; } public override async Task RunAsync(RuleContext context) { + // Only start validating at the last checkpoint block. + if (context.ValidationContext.ChainedHeaderToValidate.Height < (this.lastCheckPoint?.Height ?? 0)) + return; + ChainedHeader chainedHeader = context.ValidationContext.ChainedHeaderToValidate; var header = chainedHeader.Header as PoABlockHeader; @@ -72,7 +84,7 @@ public override async Task RunAsync(RuleContext context) } // Look at the last round of blocks to find the previous time that the miner mined. - var roundTime = this.slotsManager.GetRoundLength(federation.Count); + TimeSpan roundTime = this.slotsManager.GetRoundLength(federation.Count); int blockCounter = 0; for (ChainedHeader prevHeader = chainedHeader.Previous; prevHeader.Previous != null; prevHeader = prevHeader.Previous) From 8127fe284a33449a61db6ae65e55db8a9a52f2bc Mon Sep 17 00:00:00 2001 From: Francois de la Rouviere Date: Wed, 1 Sep 2021 11:30:41 +0100 Subject: [PATCH 4/4] Improve error messaging in test case EnsureVersionsBumped... (#685) (#690) Co-authored-by: quantumagi --- .../PackagesAndVersions/PackagesAndVersionsTests.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Stratis.Bitcoin.Tests/PackagesAndVersions/PackagesAndVersionsTests.cs b/src/Stratis.Bitcoin.Tests/PackagesAndVersions/PackagesAndVersionsTests.cs index e4c1c3862e..6caa5b18ce 100644 --- a/src/Stratis.Bitcoin.Tests/PackagesAndVersions/PackagesAndVersionsTests.cs +++ b/src/Stratis.Bitcoin.Tests/PackagesAndVersions/PackagesAndVersionsTests.cs @@ -4,8 +4,10 @@ using System.IO.Compression; using System.Linq; using System.Net; +using System.Text; using System.Xml; using Microsoft.Build.Construction; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Stratis.Bitcoin.Tests.PackagesAndVersions @@ -36,6 +38,8 @@ public void EnsureVersionsBumpedWhenChangingPublishedPackages() var referencedVersions = projectFiles.ToDictionary(p => p.Key, p => p.Value.SelectSingleNode("Project/PropertyGroup/Version")?.InnerText); var projectsToCheck = new List(projectsByPath.Keys); + var debugLog = new StringBuilder(); + while (projectsToCheck.Count > 0) { string projectFolder = projectsToCheck.First(); @@ -135,6 +139,8 @@ public void EnsureVersionsBumpedWhenChangingPublishedPackages() if (cmpVersion != referencedVersions[includeFullPath]) { + string msg = $"Comparing the local project '{project.ProjectName}' version {version} with its published package, '{targetName}', the published package references version '{cmpVersion}' of '{name3}' while the local project references version '{referencedVersions[includeFullPath]}'."; + debugLog.AppendLine(msg); versionsMatch = false; break; } @@ -148,7 +154,7 @@ public void EnsureVersionsBumpedWhenChangingPublishedPackages() referencedVersions[projectFolder] = "mismatch"; } - Assert.Empty(modifiedPackages); + Assert.True(modifiedPackages.Count == 0, $"{debugLog.ToString()} Affected packages: {string.Join(", ", modifiedPackages)}"); } static bool DirectoryEquals(string directory1, string directory2)