From aecc962f781757ce1afe17ac22e9358e5ec3dff4 Mon Sep 17 00:00:00 2001 From: Francois de la Rouviere Date: Thu, 14 Jan 2021 11:53:52 +0000 Subject: [PATCH 1/2] Revert "Dont fetch/process deposits until the CCTS has cleared its suspended transfers (#367)" This reverts commit 334b4f0d687904a834628c77b79b03dd4272dd96. --- .../TargetChain/MaturedBlocksSyncManager.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Stratis.Features.FederatedPeg/TargetChain/MaturedBlocksSyncManager.cs b/src/Stratis.Features.FederatedPeg/TargetChain/MaturedBlocksSyncManager.cs index 7190974989..e8464daf48 100644 --- a/src/Stratis.Features.FederatedPeg/TargetChain/MaturedBlocksSyncManager.cs +++ b/src/Stratis.Features.FederatedPeg/TargetChain/MaturedBlocksSyncManager.cs @@ -76,12 +76,6 @@ public async Task StartAsync() /// true if delay between next time we should ask for blocks is required; false otherwise. protected async Task SyncDepositsAsync() { - if (this.crossChainTransferStore.HasSuspended()) - { - this.logger.LogInformation("Deposits will not be fetched until the cross chain transfer store has cleared it's suspended transfers."); - return true; - } - SerializableResult> model = await this.federationGatewayClient.GetMaturedBlockDepositsAsync(this.crossChainTransferStore.NextMatureDepositHeight, this.nodeLifetime.ApplicationStopping).ConfigureAwait(false); if (model == null) From 5a04f69d2b3dea2303be69ede98fa0d48a2b3afa Mon Sep 17 00:00:00 2001 From: Francois de la Rouviere Date: Fri, 12 Feb 2021 13:02:35 +0000 Subject: [PATCH 2/2] Update Nuget --- .../Stratis.Bitcoin.Features.Consensus.csproj | 2 +- src/Stratis.Bitcoin/Stratis.Bitcoin.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e82e1a167e..a29e5cfbd1 100644 --- a/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj +++ b/src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj b/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj index 5753665c1e..95608aa12c 100644 --- a/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj +++ b/src/Stratis.Bitcoin/Stratis.Bitcoin.csproj @@ -44,7 +44,7 @@ - +